diff options
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/drawable-mdpi/settings_arrow_black.png | bin | 0 -> 543 bytes | |||
| -rw-r--r-- | main/res/drawable-mdpi/settings_arrow_white.png | bin | 0 -> 550 bytes | |||
| -rw-r--r-- | main/res/values-de/strings.xml | 3 | ||||
| -rw-r--r-- | main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | main/res/values/preference_keys.xml | 1 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | main/res/values/themes.xml | 2 | ||||
| -rw-r--r-- | main/res/xml/preferences.xml | 43 |
8 files changed, 33 insertions, 22 deletions
diff --git a/main/res/drawable-mdpi/settings_arrow_black.png b/main/res/drawable-mdpi/settings_arrow_black.png Binary files differnew file mode 100644 index 0000000..486f456 --- /dev/null +++ b/main/res/drawable-mdpi/settings_arrow_black.png diff --git a/main/res/drawable-mdpi/settings_arrow_white.png b/main/res/drawable-mdpi/settings_arrow_white.png Binary files differnew file mode 100644 index 0000000..4d36438 --- /dev/null +++ b/main/res/drawable-mdpi/settings_arrow_white.png diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index cc74154..9e7b886 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -370,7 +370,8 @@ <string name="settings_title_map_content">Karteninhalt</string> <string name="settings_title_gpx">GPX</string> <string name="settings_title_basicmembers">Basic Member</string> - <string name="settings_title_miscellaneous">Mehr Einstellungen</string> + <string name="settings_title_navigation">Navigation</string> + <string name="settings_title_system">System</string> <string name="settings_category_browser">Browser</string> <string name="settings_category_logging_other">Andere Log-Optionen</string> diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index 8c699b7..c823abb 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -34,6 +34,7 @@ <attr name="settings_details" format="integer" /> <attr name="settings_eye" format="integer" /> <attr name="settings_map" format="integer" /> + <attr name="settings_arrow" format="integer" /> <attr name="settings_nut" format="integer" /> <attr name="settings_pen" format="integer" /> <attr name="settings_sdcard" format="integer" /> diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml index b1a7b01..10aceb5 100644 --- a/main/res/values/preference_keys.xml +++ b/main/res/values/preference_keys.xml @@ -3,6 +3,7 @@ <!-- preferences used in settings --> <string name="pref_fakekey_main_screen">fakekey_main_screen</string> <string name="pref_fakekey_services_screen">fakekey_services_screen</string> + <string name="pref_fakekey_basicmembers_screen">fakekey_basicmembers_screen</string> <string name="pref_connectorGCActive">connectorGCActive</string> <string name="pref_username">username</string> <string name="pref_password">password</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index a8e4351..d3385a9 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -372,8 +372,9 @@ <string name="settings_title_map_content">Map Content</string> <string name="settings_title_gpx">GPX</string> <string name="settings_title_basicmembers">Basic Members</string> - <string name="settings_title_miscellaneous">More Settings</string> - + <string name="settings_title_navigation">Navigation</string> + <string name="settings_title_system">System</string> + <string name="settings_category_browser">Browser</string> <string name="settings_category_logging_other">Other Logging Options</string> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index 4813a21..d5f53bd 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -158,6 +158,7 @@ <item name="settings_details">@drawable/settings_details_white</item> <item name="settings_eye">@drawable/settings_eye_white</item> <item name="settings_map">@drawable/settings_map_white</item> + <item name="settings_arrow">@drawable/settings_arrow_white</item> <item name="settings_nut">@drawable/settings_nut_white</item> <item name="settings_pen">@drawable/settings_pen_white</item> <item name="settings_sdcard">@drawable/settings_sdcard_white</item> @@ -168,6 +169,7 @@ <item name="settings_details">@drawable/settings_details_black</item> <item name="settings_eye">@drawable/settings_eye_black</item> <item name="settings_map">@drawable/settings_map_black</item> + <item name="settings_arrow">@drawable/settings_arrow_black</item> <item name="settings_nut">@drawable/settings_nut_black</item> <item name="settings_pen">@drawable/settings_pen_black</item> <item name="settings_sdcard">@drawable/settings_sdcard_black</item> diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml index b4a5366..6a7c638 100644 --- a/main/res/xml/preferences.xml +++ b/main/res/xml/preferences.xml @@ -36,6 +36,21 @@ <cgeo.geocaching.settings.CheckGcCredentialsPreference android:title="@string/init_login" android:dependency="@string/pref_connectorGCActive" /> + <PreferenceScreen + android:title="@string/settings_title_basicmembers" + android:key="@string/pref_fakekey_basicmembers_screen" + android:dependency="@string/pref_connectorGCActive" > + <CheckBoxPreference + android:key="@string/pref_showcaptcha" + android:title="@string/init_captcha" + android:summary="@string/init_summary_captcha" + android:defaultValue="false" /> + <CheckBoxPreference + android:key="@string/pref_loaddirectionimg" + android:title="@string/init_loaddirectionimg" + android:summary="@string/init_summary_loaddirectionimg" + android:defaultValue="true" /> + </PreferenceScreen> <cgeo.geocaching.settings.InfoPreference android:title="@string/settings_info_facebook_login_title" android:text="@string/settings_info_facebook_login" @@ -144,7 +159,7 @@ android:title="@string/init_units" android:summary="@string/init_summary_units" android:defaultValue="false" /> - + </PreferenceScreen> <PreferenceScreen @@ -313,8 +328,8 @@ </PreferenceScreen> <PreferenceScreen - android:title="@string/settings_title_miscellaneous" - android:icon="?attr/settings_nut" > + android:title="@string/settings_title_navigation" + android:icon="?attr/settings_arrow" > <PreferenceCategory android:title="@string/init_default_navigation_tool" > @@ -341,6 +356,12 @@ </PreferenceCategory> + </PreferenceScreen> + + <PreferenceScreen + android:title="@string/settings_title_system" + android:icon="?attr/settings_nut" > + <PreferenceCategory android:title="@string/settings_title_gpx" > @@ -352,22 +373,6 @@ android:title="@string/init_gpx_importdir" /> </PreferenceCategory> - - <PreferenceCategory - android:title="@string/settings_title_basicmembers" > - - <CheckBoxPreference - android:key="@string/pref_showcaptcha" - android:title="@string/init_captcha" - android:summary="@string/init_summary_captcha" - android:defaultValue="false" /> - <CheckBoxPreference - android:key="@string/pref_loaddirectionimg" - android:title="@string/init_loaddirectionimg" - android:summary="@string/init_summary_loaddirectionimg" - android:defaultValue="true" /> - - </PreferenceCategory> <PreferenceCategory android:title="@string/init_backup" > |
