diff options
| author | goblin911 <goblinliu@gmail.com> | 2013-08-25 21:16:45 +0800 |
|---|---|---|
| committer | goblin911 <goblinliu@gmail.com> | 2013-08-25 21:16:45 +0800 |
| commit | 2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch) | |
| tree | a85f2b32d6e6da9d7329ab975fea3bd79e1b94b6 /client/res/values | |
| parent | e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff) | |
| parent | 263967cbb477983ae8680b431c1d93f102971c30 (diff) | |
Merge branch 'master' of https://github.com/Determinant/piztor
Conflicts:
client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
client/Piztor/gen/com/macaroon/piztor/R.java
client/Piztor/res/values/strings.xml
client/bin/classes/com/macaroon/piztor/ActStatus.class
client/bin/classes/com/macaroon/piztor/EmptyStatus.class
client/bin/classes/com/macaroon/piztor/Setting.class
client/src/com/macaroon/piztor/AppMgr.java
client/src/com/macaroon/piztor/Setting.java
Diffstat (limited to 'client/res/values')
| -rw-r--r-- | client/res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | client/res/values/strings.xml | 21 | ||||
| -rw-r--r-- | client/res/values/styles.xml | 20 |
3 files changed, 48 insertions, 0 deletions
diff --git a/client/res/values/dimens.xml b/client/res/values/dimens.xml new file mode 100644 index 0000000..55c1e59 --- /dev/null +++ b/client/res/values/dimens.xml @@ -0,0 +1,7 @@ +<resources> + + <!-- Default screen margins, per the Android Design guidelines. --> + <dimen name="activity_horizontal_margin">16dp</dimen> + <dimen name="activity_vertical_margin">16dp</dimen> + +</resources> diff --git a/client/res/values/strings.xml b/client/res/values/strings.xml new file mode 100644 index 0000000..5a5ccc4 --- /dev/null +++ b/client/res/values/strings.xml @@ -0,0 +1,21 @@ +<resources> + + <string name="app_name">piztor</string> + <string name="action_settings">Settings</string> + <string name="hello_world">Hello world!</string> + <string name="settings">Settings</string> + <string name="search">Search</string> + <string name="fetch">Fetch</string> + <string name="checkin">Checkin</string> + <string name="focus">Focus</string> + <string name="show_sex">Show sex: </string> + <string name="male">Male</string> + <string name="female">Female</string> + <string name="show_team">Show team: </string> + <string name="all">All</string> + <string name="mine">Mine</string> + <string name="title_activity_login">Login</string> + <string name="title_activity_main">Main</string> + <string name="title_activity_setting">Setting</string> + +</resources> diff --git a/client/res/values/styles.xml b/client/res/values/styles.xml new file mode 100644 index 0000000..6ce89c7 --- /dev/null +++ b/client/res/values/styles.xml @@ -0,0 +1,20 @@ +<resources> + + <!-- + Base application theme, dependent on API level. This theme is replaced + by AppBaseTheme from res/values-vXX/styles.xml on newer devices. + --> + <style name="AppBaseTheme" parent="android:Theme.Light"> + <!-- + Theme customizations available in newer API levels can go in + res/values-vXX/styles.xml, while customizations related to + backward-compatibility can go here. + --> + </style> + + <!-- Application theme. --> + <style name="AppTheme" parent="AppBaseTheme"> + <!-- All customizations that are NOT specific to a particular API-level can go here. --> + </style> + +</resources> |