diff options
Diffstat (limited to 'main/res')
56 files changed, 317 insertions, 244 deletions
diff --git a/main/res/drawable/ic_menu_myposition.xml b/main/res/drawable/ic_menu_myposition.xml new file mode 100644 index 0000000..62d5546 --- /dev/null +++ b/main/res/drawable/ic_menu_myposition.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/actionbar_mylocation_on" android:state_checked="true"/> + <item android:drawable="@drawable/actionbar_mylocation_off" android:state_checked="false" /> +</selector>
\ No newline at end of file diff --git a/main/res/layout-land/compass_activity.xml b/main/res/layout-land/compass_activity.xml index 00e12bf..580bf76 100644 --- a/main/res/layout-land/compass_activity.xml +++ b/main/res/layout-land/compass_activity.xml @@ -5,8 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout-v11/actionbar_maps.xml b/main/res/layout-v11/actionbar_maps.xml new file mode 100644 index 0000000..3e72717 --- /dev/null +++ b/main/res/layout-v11/actionbar_maps.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> + + <!-- Empty layout, on 11+ we have a real action bar --> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="match_parent"> + +</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar.xml b/main/res/layout/actionbar.xml deleted file mode 100644 index 098120c..0000000 --- a/main/res/layout/actionbar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - -</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_compass.xml b/main/res/layout/actionbar_button_compass.xml deleted file mode 100644 index 932444b..0000000 --- a/main/res/layout/actionbar_button_compass.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View style="@style/action_bar_separator" /> - - <ImageView - android:id="@+id/defaultNavigation" - style="@style/action_bar_action" - android:longClickable="true" - android:onClick="goDefaultNavigation" - android:src="@drawable/actionbar_compass_dark" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_map.xml b/main/res/layout/actionbar_button_map.xml deleted file mode 100644 index 9b2138a..0000000 --- a/main/res/layout/actionbar_button_map.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goMap" - android:src="@drawable/actionbar_map" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_myposition.xml b/main/res/layout/actionbar_button_myposition.xml deleted file mode 100644 index 1e91419..0000000 --- a/main/res/layout/actionbar_button_myposition.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View style="@style/action_bar_separator" /> - - <ImageSwitcher - android:id="@+id/my_position" - style="@style/action_bar_action" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_search.xml b/main/res/layout/actionbar_button_search.xml deleted file mode 100644 index 2aa1a50..0000000 --- a/main/res/layout/actionbar_button_search.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goSearch" - android:src="@drawable/actionbar_search" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_maps.xml b/main/res/layout/actionbar_maps.xml new file mode 100644 index 0000000..61e3acc --- /dev/null +++ b/main/res/layout/actionbar_maps.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/action_bar"> + + <!-- Add the up chevron to the icon --> + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/abc_ic_ab_back_holo_dark"/> + <ImageView + style="@style/action_bar_action" + android:layout_marginLeft="-13dp" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView + android:id="@+id/actionbar_title" + style="@style/action_bar_title" /> + + <ProgressBar + android:id="@+id/actionbar_progress" + style="@style/action_bar_progress" + android:visibility="gone" /> + + <View style="@style/action_bar_separator" /> + + <FrameLayout style="@style/action_bar_action"> + + <CheckBox + android:id="@+id/my_position" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:button="@drawable/ic_menu_myposition" + android:checked="false" /> + </FrameLayout> + + <!-- No overflow (...) button here since this menu is only shown on Gingerbread, which never + features an overflow menu --> +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/actionbar_popup.xml b/main/res/layout/actionbar_popup.xml new file mode 100644 index 0000000..0cab165 --- /dev/null +++ b/main/res/layout/actionbar_popup.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/action_bar"> + + <TextView + android:id="@+id/actionbar_title" + style="@style/action_bar_title" /> + + <ProgressBar + android:id="@+id/actionbar_progress" + style="@style/action_bar_progress" + android:visibility="gone" /> + + <View style="@style/action_bar_separator" /> + + + <ImageView + android:id="@+id/defaultNavigation" + style="@style/action_bar_action" + android:longClickable="true" + android:src="@drawable/actionbar_compass_dark" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + android:id="@+id/overflowActionBar" + style="@style/action_bar_action" + android:longClickable="true" + android:src="@drawable/abc_ic_menu_moreoverflow_normal_holo_dark" /> + + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/actionbar_progress.xml b/main/res/layout/actionbar_progress.xml deleted file mode 100644 index 54b5875..0000000 --- a/main/res/layout/actionbar_progress.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/actionbar_progress" - style="@style/action_bar_progress" - android:visibility="gone" /> diff --git a/main/res/layout/actionbar_title.xml b/main/res/layout/actionbar_title.xml deleted file mode 100644 index 4fa5348..0000000 --- a/main/res/layout/actionbar_title.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> - - <View style="@style/action_bar_separator" /> - - <TextView - android:id="@+id/actionbar_title" - style="@style/action_bar_title" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_title_no_home.xml b/main/res/layout/actionbar_title_no_home.xml deleted file mode 100644 index 6295bdc..0000000 --- a/main/res/layout/actionbar_title_no_home.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <TextView - android:id="@+id/actionbar_title" - style="@style/action_bar_title" /> - -</merge>
\ No newline at end of file diff --git a/main/res/layout/addresslist_activity.xml b/main/res/layout/addresslist_activity.xml index c48c28f..e5c6491 100644 --- a/main/res/layout/addresslist_activity.xml +++ b/main/res/layout/addresslist_activity.xml @@ -4,7 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar" /> + <include layout="@layout/actionbar_maps" /> <ListView android:id="@android:id/list" diff --git a/main/res/layout/authorization_activity.xml b/main/res/layout/authorization_activity.xml index 28c1987..766db6e 100644 --- a/main/res/layout/authorization_activity.xml +++ b/main/res/layout/authorization_activity.xml @@ -5,8 +5,6 @@ android:orientation="vertical" android:visibility="visible" > - <include layout="@layout/actionbar" /> - <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout/cachedetail_activity.xml b/main/res/layout/cachedetail_activity.xml index 3afe5f6..aa88355 100644 --- a/main/res/layout/cachedetail_activity.xml +++ b/main/res/layout/cachedetail_activity.xml @@ -6,13 +6,6 @@ android:background="?background_color"
android:orientation="vertical" >
- <LinearLayout style="@style/action_bar" >
-
- <include layout="@layout/actionbar_title" />
-
- <include layout="@layout/actionbar_button_compass" />
- </LinearLayout>
-
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="fill_parent"
diff --git a/main/res/layout/cachelist_spinneritem.xml b/main/res/layout/cachelist_spinneritem.xml new file mode 100644 index 0000000..c8a589f --- /dev/null +++ b/main/res/layout/cachelist_spinneritem.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="?attr/dropdownListPreferredItemHeight" + android:minHeight="?attr/dropdownListPreferredItemHeight" + style="?attr/spinnerDropDownItemStyle" + android:layout_gravity="left|center_vertical" + > + + + <TextView + android:id="@android:id/text1" + android:textAppearance="?android:attr/textAppearanceMedium" + tools:text="This is the title" + android:singleLine="true" + android:ellipsize="marquee" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceSmall" + tools:text="This is the subtitle" + android:id="@android:id/text2" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/cacheslist_activity.xml b/main/res/layout/cacheslist_activity.xml index c267f60..a12adad 100644 --- a/main/res/layout/cacheslist_activity.xml +++ b/main/res/layout/cacheslist_activity.xml @@ -4,15 +4,6 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - - <include layout="@layout/actionbar_button_map" /> - </LinearLayout> - <include layout="@layout/filter_bar" /> <RelativeLayout diff --git a/main/res/layout/cacheslist_item.xml b/main/res/layout/cacheslist_item.xml index 744ca30..b43310e 100644 --- a/main/res/layout/cacheslist_item.xml +++ b/main/res/layout/cacheslist_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:cc="http://schemas.android.com/apk/res/cgeo.geocaching" + xmlns:cgeo="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/one_cache" android:layout_width="fill_parent" @@ -111,7 +111,7 @@ android:minHeight="28px" android:minWidth="28px" android:visibility="gone" - cc:skin="?compass" + cgeo:skin="?compass" tools:ignore="PxUsage" /> <ImageView diff --git a/main/res/layout/compass_activity.xml b/main/res/layout/compass_activity.xml index f0ab5ef..a9c67cf 100644 --- a/main/res/layout/compass_activity.xml +++ b/main/res/layout/compass_activity.xml @@ -5,8 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout/editwaypoint_activity.xml b/main/res/layout/editwaypoint_activity.xml index cd0b46c..a08a3c8 100644 --- a/main/res/layout/editwaypoint_activity.xml +++ b/main/res/layout/editwaypoint_activity.xml @@ -5,8 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml index 948c265..368f3ae 100644 --- a/main/res/layout/gpx.xml +++ b/main/res/layout/gpx.xml @@ -4,8 +4,6 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <Button android:id="@+id/select_dir" style="@style/button_full" diff --git a/main/res/layout/images_activity.xml b/main/res/layout/images_activity.xml index ccd8499..861fa7e 100644 --- a/main/res/layout/images_activity.xml +++ b/main/res/layout/images_activity.xml @@ -5,8 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <include layout="@layout/cachedetail_images_page" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/imageselect_activity.xml b/main/res/layout/imageselect_activity.xml index fd8eaea..aac7e47 100644 --- a/main/res/layout/imageselect_activity.xml +++ b/main/res/layout/imageselect_activity.xml @@ -5,13 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - </LinearLayout> - <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout/logcache_activity.xml b/main/res/layout/logcache_activity.xml index 4bbb441..cc34633 100644 --- a/main/res/layout/logcache_activity.xml +++ b/main/res/layout/logcache_activity.xml @@ -5,13 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - </LinearLayout> - <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout/logtrackable_activity.xml b/main/res/layout/logtrackable_activity.xml index 7791409..ef345a1 100644 --- a/main/res/layout/logtrackable_activity.xml +++ b/main/res/layout/logtrackable_activity.xml @@ -5,13 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - </LinearLayout> - <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout/main_activity.xml b/main/res/layout/main_activity.xml index 9e124a1..29a445f 100644 --- a/main/res/layout/main_activity.xml +++ b/main/res/layout/main_activity.xml @@ -5,17 +5,6 @@ android:layout_height="fill_parent" android:layout_gravity="center" > - <LinearLayout style="@style/action_bar" > - - <ImageView - style="@style/action_bar_icon_cgeo" - android:onClick="showAbout" /> - - <TextView style="@style/action_bar_title" /> - - <include layout="@layout/actionbar_button_search" /> - </LinearLayout> - <fragment android:id="@+id/status" android:name="cgeo.geocaching.StatusFragment" diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml index 5e4d82d..471c2b8 100644 --- a/main/res/layout/map_google.xml +++ b/main/res/layout/map_google.xml @@ -4,14 +4,9 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - <include layout="@layout/actionbar_title" /> - <include layout="@layout/actionbar_progress" /> - - <include layout="@layout/actionbar_button_myposition" /> - </LinearLayout> + <include layout="@layout/actionbar_maps" /> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml index f05ddb0..c44a3ee 100644 --- a/main/res/layout/map_mapsforge.xml +++ b/main/res/layout/map_mapsforge.xml @@ -4,14 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - - <include layout="@layout/actionbar_button_myposition" /> - </LinearLayout> + <include layout="@layout/actionbar_maps" /> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml index ff2b9af..daa5f74 100644 --- a/main/res/layout/map_mapsforge_old.xml +++ b/main/res/layout/map_mapsforge_old.xml @@ -4,14 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title" /> - - <include layout="@layout/actionbar_progress" /> - - <include layout="@layout/actionbar_button_myposition" /> - </LinearLayout> + <include layout="@layout/actionbar_maps" /> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/navigateanypoint_activity.xml b/main/res/layout/navigateanypoint_activity.xml index baa568c..22a29af 100644 --- a/main/res/layout/navigateanypoint_activity.xml +++ b/main/res/layout/navigateanypoint_activity.xml @@ -5,8 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <ListView android:id="@+id/historyList" android:layout_width="match_parent" diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml index 584eb58..de94d18 100644 --- a/main/res/layout/popup.xml +++ b/main/res/layout/popup.xml @@ -1,21 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="?background_color_transparent" - android:orientation="vertical" > - - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title_no_home" /> - - <include layout="@layout/actionbar_button_compass" /> - </LinearLayout> + android:orientation="vertical" + tools:context=".CachePopup"> + <include layout="@layout/actionbar_popup" /> <ScrollView android:id="@+id/details_list_box" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:orientation="vertical" android:padding="4dip" > @@ -50,6 +46,7 @@ <TextView android:id="@+id/offline_text" + tools:text="@string/cache_offline_not_ready" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentLeft="true" diff --git a/main/res/layout/search_activity.xml b/main/res/layout/search_activity.xml index 28256f1..f7a1a70 100644 --- a/main/res/layout/search_activity.xml +++ b/main/res/layout/search_activity.xml @@ -6,8 +6,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout/staticmaps_activity.xml b/main/res/layout/staticmaps_activity.xml index 2ffa70d..1d7c1f5 100644 --- a/main/res/layout/staticmaps_activity.xml +++ b/main/res/layout/staticmaps_activity.xml @@ -4,8 +4,6 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/main/res/layout/usefulapps_activity.xml b/main/res/layout/usefulapps_activity.xml index 84bcf39..fa2112e 100644 --- a/main/res/layout/usefulapps_activity.xml +++ b/main/res/layout/usefulapps_activity.xml @@ -5,8 +5,6 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar" /> - <ListView android:id="@+id/apps_list" android:layout_width="fill_parent" diff --git a/main/res/layout/viewpager_activity.xml b/main/res/layout/viewpager_activity.xml index 14120e0..aa88355 100644 --- a/main/res/layout/viewpager_activity.xml +++ b/main/res/layout/viewpager_activity.xml @@ -6,8 +6,6 @@ android:background="?background_color"
android:orientation="vertical" >
- <include layout="@layout/actionbar" />
-
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="fill_parent"
diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml index c8b257c..287fc3a 100644 --- a/main/res/layout/waypoint_popup.xml +++ b/main/res/layout/waypoint_popup.xml @@ -5,12 +5,7 @@ android:background="?background_color_transparent" android:orientation="vertical" > - <LinearLayout style="@style/action_bar" > - - <include layout="@layout/actionbar_title_no_home" /> - - <include layout="@layout/actionbar_button_compass" /> - </LinearLayout> + <include layout="@layout/actionbar_popup" /> <ScrollView android:id="@+id/details_list_box" diff --git a/main/res/menu/abstract_logging_activity.xml b/main/res/menu/abstract_logging_activity.xml index b926dd1..a7841a5 100644 --- a/main/res/menu/abstract_logging_activity.xml +++ b/main/res/menu/abstract_logging_activity.xml @@ -1,21 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_signature" android:icon="@drawable/ic_menu_edit" - android:title="@string/init_signature"> + android:title="@string/init_signature" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_templates" android:icon="@drawable/ic_menu_add" - android:title="@string/log_add"> + android:title="@string/log_add" + cgeo:showAsAction="ifRoom|withText"> <menu /> <!-- filled dynamically --> </item> <item android:id="@+id/menu_smilies" android:icon="@drawable/ic_menu_emoticons" - android:title="@string/log_smilies"> + android:title="@string/log_smilies" + cgeo:showAsAction="ifRoom|withText"> <menu /> <!-- filled dynamically --> </item> diff --git a/main/res/menu/cache_list_context.xml b/main/res/menu/cache_list_context.xml index 2767a2e..8d52654 100644 --- a/main/res/menu/cache_list_context.xml +++ b/main/res/menu/cache_list_context.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_default_navigation" @@ -9,40 +10,49 @@ <item android:id="@+id/menu_navigate" android:icon="@drawable/ic_menu_mapmode" - android:title="@string/cache_menu_navigate"> + android:title="@string/cache_menu_navigate" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_cache_details" - android:title="@string/cache_menu_details"> + android:title="@string/cache_menu_details" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_log_visit_offline" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_visit_offline"> </item> <item android:id="@+id/menu_log_visit" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_visit"> </item> <item android:id="@+id/menu_drop_cache" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_offline_drop"> </item> <item android:id="@+id/menu_move_to_list" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_move_list"> </item> <item android:id="@+id/menu_export" + cgeo:showAsAction="ifRoom|withText" android:title="@string/export"> </item> <item android:id="@+id/menu_refresh" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_refresh"> </item> <item android:id="@+id/menu_store_cache" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_offline_store"> </item> diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml index 418d2de..d743c71 100644 --- a/main/res/menu/cache_list_options.xml +++ b/main/res/menu/cache_list_options.xml @@ -1,14 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/menu_show_on_map" + android:icon="@drawable/actionbar_map" + cgeo:showAsAction="ifRoom" + android:title="@string/caches_on_map"> + </item> + <item android:id="@+id/menu_filter" android:icon="@drawable/ic_menu_filter" + cgeo:showAsAction="ifRoom|withText" android:title="@string/caches_filter"> </item> <item android:id="@+id/menu_sort" android:icon="@drawable/ic_menu_sort_alphabetically" + cgeo:showAsAction="ifRoom|withText" android:title="@string/caches_sort"> </item> <item diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml index d2951f4..2bd0c44 100644 --- a/main/res/menu/cache_options.xml +++ b/main/res/menu/cache_options.xml @@ -1,45 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_default_navigation" android:icon="@drawable/ic_menu_compass" + cgeo:showAsAction="ifRoom" android:title="@string/cache_menu_navigate"> <!-- will be replaced --> </item> <item android:id="@+id/menu_navigate" android:icon="@drawable/ic_menu_mapmode" + cgeo:showAsAction="ifRoom" android:title="@string/cache_menu_navigate"> </item> <item + android:id="@+id/menu_share" + android:icon="@drawable/ic_menu_share" + cgeo:showAsAction="ifRoom" + cgeo:actionProviderClass="android.support.v7.widget.ShareActionProvider" + android:title="@string/cache_menu_share"> + </item> + <item android:id="@+id/menu_calendar" android:icon="@drawable/ic_menu_agenda" + cgeo:showAsAction="ifRoom" android:title="@string/cache_menu_event"> </item> <item android:id="@+id/menu_log_visit_offline" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom" android:title="@string/cache_menu_visit_offline"> </item> <item android:id="@+id/menu_log_visit" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom" android:title="@string/cache_menu_visit"> </item> <item android:id="@+id/menu_caches_around" android:icon="@drawable/ic_menu_rotate" + cgeo:showAsAction="ifRoom" android:title="@string/cache_menu_around"> </item> <item android:id="@+id/menu_show_in_browser" android:icon="@drawable/ic_menu_info_details" + cgeo:showAsAction="ifRoom" android:title="@string/cache_menu_browser"> </item> - <item - android:id="@+id/menu_share" - android:icon="@drawable/ic_menu_share" - android:title="@string/cache_menu_share"> - </item> + </menu>
\ No newline at end of file diff --git a/main/res/menu/compass_activity_options.xml b/main/res/menu/compass_activity_options.xml index 01c7d36..bfdbf48 100644 --- a/main/res/menu/compass_activity_options.xml +++ b/main/res/menu/compass_activity_options.xml @@ -1,36 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_switch_compass_gps" android:icon="@drawable/ic_menu_compass" + cgeo:showAsAction="ifRoom|withText" android:title="@string/use_gps"> <!-- will be replaced in code --> </item> <item android:id="@+id/menu_map" android:icon="@drawable/ic_menu_mapmode" + cgeo:showAsAction="ifRoom|withText" android:title="@string/caches_on_map"> </item> <item android:id="@+id/menu_edit_destination" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/destination_set"> </item> <item android:id="@+id/menu_select_destination" android:icon="@drawable/ic_menu_myplaces" + cgeo:showAsAction="ifRoom|withText" android:title="@string/destination_select"> <menu /> <!-- filled dynamically --> </item> <item android:id="@+id/menu_tts_start" android:icon="@drawable/ic_menu_start_conversation" + cgeo:showAsAction="ifRoom|withText" android:title="@string/tts_start"> </item> <item android:id="@+id/menu_tts_stop" android:icon="@drawable/ic_menu_start_conversation" android:title="@string/tts_stop" + cgeo:showAsAction="ifRoom|withText" android:visible="false"> </item> diff --git a/main/res/menu/details_context.xml b/main/res/menu/details_context.xml index 3125459..53f326a 100644 --- a/main/res/menu/details_context.xml +++ b/main/res/menu/details_context.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_copy" diff --git a/main/res/menu/images_list_context.xml b/main/res/menu/images_list_context.xml index 75d0ca0..0726267 100644 --- a/main/res/menu/images_list_context.xml +++ b/main/res/menu/images_list_context.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/image_open_file" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_image_open_file"> </item> <item android:id="@+id/image_open_browser" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_image_open_browser"> </item> diff --git a/main/res/menu/logging_ui.xml b/main/res/menu/logging_ui.xml index a8622c5..5baacfc 100644 --- a/main/res/menu/logging_ui.xml +++ b/main/res/menu/logging_ui.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_log_visit_offline" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_visit_offline"> </item> <item android:id="@+id/menu_log_visit" android:icon="@drawable/ic_menu_edit" + cgeo:showAsAction="ifRoom|withText" android:title="@string/cache_menu_visit"> </item> diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml index fc949dc..bf9124f 100644 --- a/main/res/menu/main_activity_options.xml +++ b/main/res/menu/main_activity_options.xml @@ -1,34 +1,49 @@ <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+
+ <!-- TODO: use ic_action_search -->
+ <item
+ style="@style/action_bar_action"
+ android:id="@+id/menu_gosearch"
+ cgeo:showAsAction="always"
+ cgeo:actionViewClass="android.support.v7.widget.SearchView"
+ android:icon="@drawable/actionbar_search" />
<item
android:id="@+id/menu_settings"
android:icon="@drawable/ic_menu_preferences"
+ cgeo:showAsAction="ifRoom"
android:title="@string/menu_settings">
</item>
<item
android:id="@+id/menu_history"
android:icon="@drawable/ic_menu_recent_history"
+ cgeo:showAsAction="ifRoom"
android:title="@string/menu_history">
</item>
<item
android:id="@+id/menu_pocket_queries"
android:icon="@drawable/ic_menu_account_list"
+ cgeo:showAsAction="ifRoom"
android:title="@string/menu_pocket_queries">
</item>
<item
android:id="@+id/menu_helpers"
android:icon="@drawable/ic_menu_shopping"
+ cgeo:showAsAction="ifRoom|"
android:title="@string/menu_helpers">
</item>
<item
android:id="@+id/menu_scan"
android:icon="@drawable/ic_menu_barcode"
+ cgeo:showAsAction="ifRoom"
android:title="@string/menu_scan_geo">
</item>
<item
android:id="@+id/menu_about"
android:icon="@drawable/ic_menu_info_details"
+ cgeo:showAsAction="ifRoom"
android:title="@string/menu_about">
</item>
</menu>
\ No newline at end of file diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml index d81a49b..3dfc5ae 100644 --- a/main/res/menu/map_activity.xml +++ b/main/res/menu/map_activity.xml @@ -1,9 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> + + <item android:id="@+id/menu_toggle_mypos" + android:title="@string/menu_centerposition" + android:icon="@drawable/ic_menu_myposition" + cgeo:showAsAction="always" + android:showAsAction="always" + + /> <item android:id="@+id/menu_select_mapview" android:icon="@drawable/ic_menu_mapmode" + cgeo:showAsAction="ifRoom|withText" android:title="@string/map_view_map"> <menu> <group @@ -15,37 +25,44 @@ <item android:id="@+id/menu_map_live" android:icon="@drawable/ic_menu_refresh" + cgeo:showAsAction="ifRoom|withText" android:title="@string/map_live_disable"> </item> <item android:id="@+id/menu_store_caches" android:enabled="false" android:icon="@drawable/ic_menu_set_as" + cgeo:showAsAction="ifRoom|withText" android:title="@string/caches_store_offline"> </item> <item android:id="@+id/submenu_modes" android:icon="@drawable/ic_menu_mark" + cgeo:showAsAction="ifRoom|withText" android:title="@string/map_modes"> <menu> <item android:id="@+id/menu_trail_mode" android:icon="@drawable/ic_menu_trail" + cgeo:showAsAction="ifRoom|withText" android:title="@string/map_trail_hide"> </item> <item android:id="@+id/menu_circle_mode" android:icon="@drawable/ic_menu_circle" + cgeo:showAsAction="ifRoom|withText" android:title="@string/map_circles_hide"> </item> <item android:id="@+id/menu_mycaches_mode" android:icon="@android:drawable/ic_menu_myplaces" + cgeo:showAsAction="ifRoom|withText" android:title="@string/map_mycaches_hide"> </item> <item android:id="@+id/menu_theme_mode" android:icon="@drawable/ic_menu_preferences" + cgeo:showAsAction="ifRoom|withText" android:title="@string/map_theme_select"> </item> </menu> diff --git a/main/res/menu/navigate_any_point_activity_options.xml b/main/res/menu/navigate_any_point_activity_options.xml index 4f199e2..a17405b 100644 --- a/main/res/menu/navigate_any_point_activity_options.xml +++ b/main/res/menu/navigate_any_point_activity_options.xml @@ -1,25 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_navigate" android:icon="@drawable/ic_menu_mapmode" - android:title="@string/cache_menu_navigate"> + android:title="@string/cache_menu_navigate" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_default_navigation" android:icon="@drawable/ic_menu_compass" - android:title="@string/cache_menu_navigate"> <!-- will be replaced in code --> + android:title="@string/cache_menu_navigate" + cgeo:showAsAction="ifRoom"> <!-- will be replaced in code --> </item> <item android:id="@+id/menu_caches_around" android:icon="@drawable/ic_menu_rotate" - android:title="@string/cache_menu_around"> + android:title="@string/cache_menu_around" + cgeo:showAsAction="ifRoom"> </item> <item android:id="@+id/menu_clear_history" android:icon="@drawable/ic_menu_delete" - android:title="@string/search_clear_history"> + android:title="@string/search_clear_history" + cgeo:showAsAction="ifRoom"> </item> </menu>
\ No newline at end of file diff --git a/main/res/menu/search_activity_options.xml b/main/res/menu/search_activity_options.xml index fcd7401..c4ee62b 100644 --- a/main/res/menu/search_activity_options.xml +++ b/main/res/menu/search_activity_options.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_search_own_caches" android:icon="@drawable/ic_menu_myplaces" - android:title="@string/search_own_caches"> + android:title="@string/search_own_caches" + cgeo:showAsAction="ifRoom|withText" + > </item> </menu>
\ No newline at end of file diff --git a/main/res/menu/static_maps_activity_options.xml b/main/res/menu/static_maps_activity_options.xml index 7850c92..8621153 100644 --- a/main/res/menu/static_maps_activity_options.xml +++ b/main/res/menu/static_maps_activity_options.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_refresh" android:icon="@drawable/ic_menu_refresh" + cgeo:showAsAction="ifRoom" android:title="@string/cache_offline_refresh"> </item> diff --git a/main/res/menu/trackable_activity.xml b/main/res/menu/trackable_activity.xml index ddf45f6..60eaa9e 100644 --- a/main/res/menu/trackable_activity.xml +++ b/main/res/menu/trackable_activity.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_log_touch" android:icon="@drawable/ic_menu_agenda" + cgeo:showAsAction="ifRoom|withText" android:title="@string/trackable_log_touch"> </item> <item android:id="@+id/menu_browser_trackable" android:icon="@drawable/ic_menu_info_details" + cgeo:showAsAction="ifRoom|withText" android:title="@string/trackable_browser_open"> </item> diff --git a/main/res/menu/waypoint_options.xml b/main/res/menu/waypoint_options.xml index f03cca6..5aaeac2 100644 --- a/main/res/menu/waypoint_options.xml +++ b/main/res/menu/waypoint_options.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_waypoint_reset_cache_coords" diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index ab1db9f..be33f09 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -42,7 +42,6 @@ <!-- attributes for custom made preferences --> - <attr name="title" format="string" /> <attr name="text" format="string" /> <attr name="url" format="string" /> <attr name="urlButton" format="string" /> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index a9d92d0..0a8d3fd 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -247,6 +247,8 @@ <string name="loc_trying">Trying to Locate</string> <string name="loc_no_addr">Unknown address</string> <string name="loc_gps_disabled">GPS disabled</string> + <string name="menu_centerposition">Center on my position</string> + <!-- standard menu --> <string name="menu_about">About c:geo</string> @@ -1286,4 +1288,5 @@ <!-- shortcuts --> <string name="cgeo_shortcut">c:geo shortcut</string> <string name="create_shortcut">Create shortcut</string> + </resources> diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index c566122..ffcb6aa 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -70,7 +70,7 @@ <item name="android:padding">2dip</item> <item name="android:scaleType">center</item> <item name="android:focusable">true</item> - <item name="android:src">@drawable/actionbar_home</item> + <item name="android:src">@drawable/actionbar_cgeo</item> <item name="android:background">@drawable/actionbar_button</item> </style> @@ -102,6 +102,10 @@ <item name="android:text">c:geo</item> </style> + <style name="actionbar_myposition"> + <item name="android:button">@drawable/ic_menu_myposition</item> + </style> + <!-- button: full width --> <style name="button_full" parent="button"> <item name="android:layout_width">fill_parent</item> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index ed64ef5..c5bdae1 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -1,15 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="cgeo_main" parent="android:style/Theme.Wallpaper.NoTitleBar"> + + <style name="cgeo_main" parent="@style/Theme.AppCompat"> + + <!-- copy the style elements of the Wallpaper theme since AppCombat has no Wallpaper theme --> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowShowWallpaper">true</item> + <!-- system elements --> <item name="android:windowContentOverlay">@null</item> + + </style> + + <style name="cgeo" parent="@style/Theme.AppCompat"> + + + <item name="android:buttonStyle">@style/button</item> + <item name="android:editTextStyle">@style/edittext</item> + <item name="android:windowContentOverlay">@null</item> + + <!-- own values: colors --> + <item name="just_color">@color/just_black</item> + <item name="text_color_link">@color/link</item> + <item name="button_color_enabled">@color/button_enabled</item> + <item name="button_color_disabled">@color/button_disabled</item> </style> - <style name="cgeo" parent="android:style/Theme.NoTitleBar"> - <!-- system elements --> + <!-- Identical to cgeo aside from different parent style --> + <style name="cgeo_light" parent="@style/Theme.AppCompat.Light.DarkActionBar"> + + <item name="android:buttonStyle">@style/button</item> <item name="android:editTextStyle">@style/edittext</item> <item name="android:windowContentOverlay">@null</item> @@ -21,6 +45,8 @@ <item name="button_color_disabled">@color/button_disabled</item> </style> + + <style name="dark" parent="cgeo"> <!-- own values: colors --> @@ -50,7 +76,7 @@ <item name="compass">0</item> </style> - <style name="light" parent="cgeo"> + <style name="light" parent="cgeo_light"> <!-- own values: colors --> <item name="android:windowBackground">@color/just_white</item> @@ -80,16 +106,35 @@ <item name="compass">1</item> </style> - <style name="cgeo_popup" parent="android:style/Theme.Dialog"> + + <style name="Theme.AppCompat.Translucent.Light" parent="Theme.AppCompat.Light.DarkActionBar"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowAnimationStyle">@android:style/Animation</item> + </style> + + <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowAnimationStyle">@android:style/Animation</item> + </style> + + <style name="cgeo_popup" parent="Theme.AppCompat.Translucent.Light"> <!-- system elements --> <item name="android:buttonStyle">@style/button</item> <item name="android:editTextStyle">@style/edittext</item> <item name="android:windowNoTitle">true</item> - </style> + </style> <!-- TODO: Popup probably doesn't need all these fields set. Should delete unnecessary ones. --> - <style name="popup_dark" parent="cgeo_popup"> + <style name="popup_dark" parent="Theme.AppCompat.Translucent"> + <!-- system elements --> + <item name="android:buttonStyle">@style/button</item> + <item name="android:editTextStyle">@style/edittext</item> + <item name="android:windowNoTitle">true</item> <!-- own values: colors --> <item name="just_color">@color/just_black</item> @@ -153,7 +198,7 @@ <item name="compass">1</item> </style> - <style name="settings" parent="android:Theme"> + <style name="settings" parent="@style/Theme.AppCompat"> <item name="settings_cloud">@drawable/settings_cloud_white</item> <item name="settings_details">@drawable/settings_details_white</item> <item name="settings_eye">@drawable/settings_eye_white</item> @@ -165,7 +210,7 @@ <item name="settings_info_icon">@drawable/settings_info_icon_white</item> </style> - <style name="settings.light" parent="android:Theme.Light"> + <style name="settings.light" parent="@style/Theme.AppCompat.Light"> <item name="settings_cloud">@drawable/settings_cloud_black</item> <item name="settings_details">@drawable/settings_details_black</item> <item name="settings_eye">@drawable/settings_eye_black</item> |