Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Commit 8faf54a

Browse files
committed
Updated all menu items for AppCompat
1 parent 70a80de commit 8faf54a

17 files changed

+94
-77
lines changed

res/menu-land/admob_fragment_menu.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
34

45
<item
56
android:id="@+id/itemAdmobsmenuRefresh"
67
android:icon="@drawable/icon_refresh"
7-
android:showAsAction="ifRoom"
8+
app:showAsAction="ifRoom"
89
android:title="@string/refresh">
910
</item>
1011
<item
1112
android:id="@+id/itemChartsmenuToggle"
1213
android:icon="@drawable/icon_data"
13-
android:showAsAction="ifRoom"
14+
app:showAsAction="ifRoom"
1415
android:title="@string/refresh">
1516
</item>
1617
<item
1718
android:id="@+id/itemAdmobsmenuTimeframe"
1819
android:icon="@drawable/icon_calendar"
19-
android:showAsAction="ifRoom|withText"
20+
app:showAsAction="ifRoom|withText"
2021
android:title="@string/time_frame">
2122
<menu>
2223
<group android:checkableBehavior="single" >
@@ -40,7 +41,7 @@
4041
</item>
4142
<item
4243
android:id="@+id/itemAdmobsmenuRemove"
43-
android:showAsAction="never"
44+
app:showAsAction="never"
4445
android:title="@string/remove_admob">
4546
</item>
4647

res/menu-land/charts_menu.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
34

45
<item
56
android:id="@+id/itemChartsmenuRefresh"
67
android:icon="@drawable/icon_refresh"
7-
android:showAsAction="ifRoom"
8+
app:showAsAction="ifRoom"
89
android:title="@string/refresh">
910
</item>
1011
<item
1112
android:id="@+id/itemChartsmenuToggle"
1213
android:icon="@drawable/icon_data"
13-
android:showAsAction="ifRoom"
14+
app:showAsAction="ifRoom"
1415
android:title="@string/refresh">
1516
</item>
1617
<item
1718
android:id="@+id/itemChartsmenuTimeframe"
18-
android:showAsAction="ifRoom|withText"
19+
app:showAsAction="ifRoom|withText"
1920
android:title="@string/time_frame"
2021
android:icon="@drawable/icon_calendar">
2122
<menu>

res/menu-land/main_menu.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:ignore="AlwaysShowAction" >
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
tools:ignore="AlwaysShowAction">
56

67
<!-- Landscape menu for phones. Only show refresh and stats mode to ensure lots of space
78
for the account chooser and to avoid having only one of import/export -->
89

910
<item
1011
android:id="@+id/itemMainmenuImport"
1112
android:icon="@drawable/icon_import"
12-
android:showAsAction="never"
13+
app:showAsAction="never"
1314
android:title="@string/import_">
1415
</item>
1516
<item
1617
android:id="@+id/itemMainmenuExport"
1718
android:icon="@drawable/icon_export"
18-
android:showAsAction="never"
19+
app:showAsAction="never"
1920
android:title="@string/export_">
2021
</item>
2122
<item
2223
android:id="@+id/itemMainmenuStatsMode"
2324
android:icon="@drawable/icon_plusminus"
24-
android:showAsAction="always|withText"
25+
app:showAsAction="always|withText"
2526
android:title="@string/daily">
2627
</item>
2728
<item
2829
android:id="@+id/itemMainmenuRefresh"
2930
android:icon="@drawable/icon_refresh"
30-
android:showAsAction="always"
31+
app:showAsAction="always"
3132
android:title="@string/refresh">
3233
</item>
3334
<item
3435
android:id="@+id/itemMainmenuAbout"
3536
android:icon="@drawable/icon_about"
36-
android:showAsAction="never"
37+
app:showAsAction="never"
3738
android:title="@string/about_title">
3839
</item>
3940
<item
4041
android:id="@+id/itemMainmenuAccounts"
41-
android:showAsAction="never"
42+
app:showAsAction="never"
4243
android:title="@string/manage_accounts">
4344
</item>
4445
<item
4546
android:id="@+id/itemMainmenuPreferences"
46-
android:showAsAction="never"
47+
app:showAsAction="never"
4748
android:title="@string/preferences">
4849
</item>
4950

res/menu-large-land/charts_menu.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
34

45
<item
56
android:id="@+id/itemChartsmenuRefresh"
67
android:icon="@drawable/icon_refresh"
7-
android:showAsAction="ifRoom"
8+
app:showAsAction="ifRoom"
89
android:title="@string/refresh">
910
</item>
1011
<item
1112
android:id="@+id/itemChartsmenuTimeframe"
12-
android:showAsAction="ifRoom|withText"
13+
app:showAsAction="ifRoom|withText"
1314
android:title="@string/time_frame"
1415
android:icon="@drawable/icon_calendar">
1516
<menu>

res/menu-large-land/main_menu.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:ignore="AlwaysShowAction" >
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
tools:ignore="AlwaysShowAction">
56

67
<!-- Same as the normal menu -->
78

89
<item
910
android:id="@+id/itemMainmenuImport"
1011
android:icon="@drawable/icon_import"
11-
android:showAsAction="ifRoom|withText"
12+
app:showAsAction="ifRoom|withText"
1213
android:title="@string/import_">
1314
</item>
1415
<item
1516
android:id="@+id/itemMainmenuExport"
1617
android:icon="@drawable/icon_export"
17-
android:showAsAction="ifRoom|withText"
18+
app:showAsAction="ifRoom|withText"
1819
android:title="@string/export_">
1920
</item>
2021
<item
2122
android:id="@+id/itemMainmenuStatsMode"
2223
android:icon="@drawable/icon_plusminus"
23-
android:showAsAction="always|withText"
24+
app:showAsAction="always|withText"
2425
android:title="@string/daily">
2526
</item>
2627
<item
2728
android:id="@+id/itemMainmenuRefresh"
2829
android:icon="@drawable/icon_refresh"
29-
android:showAsAction="always"
30+
app:showAsAction="always"
3031
android:title="@string/refresh">
3132
</item>
3233
<item
3334
android:id="@+id/itemMainmenuAbout"
3435
android:icon="@drawable/icon_about"
35-
android:showAsAction="never"
36+
app:showAsAction="never"
3637
android:title="@string/about_title">
3738
</item>
3839
<item
3940
android:id="@+id/itemMainmenuAccounts"
40-
android:showAsAction="never"
41+
app:showAsAction="never"
4142
android:title="@string/manage_accounts">
4243
</item>
4344
<item
4445
android:id="@+id/itemMainmenuPreferences"
45-
android:showAsAction="never"
46+
app:showAsAction="never"
4647
android:title="@string/preferences">
4748
</item>
4849

res/menu-w480dp-port/charts_menu.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
34

45
<item
56
android:id="@+id/itemChartsmenuRefresh"
67
android:icon="@drawable/icon_refresh"
7-
android:showAsAction="ifRoom"
8+
app:showAsAction="ifRoom"
89
android:title="@string/refresh">
910
</item>
1011
<item
1112
android:id="@+id/itemChartsmenuTimeframe"
12-
android:showAsAction="ifRoom|withText"
13+
app:showAsAction="ifRoom|withText"
1314
android:title="@string/time_frame"
1415
android:icon="@drawable/icon_calendar">
1516
<menu>

res/menu-w480dp-port/main_menu.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:ignore="AlwaysShowAction" >
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
tools:ignore="AlwaysShowAction">
56

67
<!-- Portait mode at the point where the split action bar is turned off.
78
Only show refresh and stats mode to ensure lots of space
@@ -10,41 +11,41 @@
1011
<item
1112
android:id="@+id/itemMainmenuImport"
1213
android:icon="@drawable/icon_import"
13-
android:showAsAction="never"
14+
app:showAsAction="never"
1415
android:title="@string/import_">
1516
</item>
1617
<item
1718
android:id="@+id/itemMainmenuExport"
1819
android:icon="@drawable/icon_export"
19-
android:showAsAction="never"
20+
app:showAsAction="never"
2021
android:title="@string/export_">
2122
</item>
2223
<item
2324
android:id="@+id/itemMainmenuStatsMode"
2425
android:icon="@drawable/icon_plusminus"
25-
android:showAsAction="always|withText"
26+
app:showAsAction="always|withText"
2627
android:title="@string/daily">
2728
</item>
2829
<item
2930
android:id="@+id/itemMainmenuRefresh"
3031
android:icon="@drawable/icon_refresh"
31-
android:showAsAction="always"
32+
app:showAsAction="always"
3233
android:title="@string/refresh">
3334
</item>
3435
<item
3536
android:id="@+id/itemMainmenuAbout"
3637
android:icon="@drawable/icon_about"
37-
android:showAsAction="never"
38+
app:showAsAction="never"
3839
android:title="@string/about_title">
3940
</item>
4041
<item
4142
android:id="@+id/itemMainmenuAccounts"
42-
android:showAsAction="never"
43+
app:showAsAction="never"
4344
android:title="@string/manage_accounts">
4445
</item>
4546
<item
4647
android:id="@+id/itemMainmenuPreferences"
47-
android:showAsAction="never"
48+
app:showAsAction="never"
4849
android:title="@string/preferences">
4950
</item>
5051

res/menu-w700dp-port/charts_menu.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
34

45
<item
56
android:id="@+id/itemChartsmenuRefresh"
67
android:icon="@drawable/icon_refresh"
7-
android:showAsAction="ifRoom"
8+
app:showAsAction="ifRoom"
89
android:title="@string/refresh">
910
</item>
1011
<item
1112
android:id="@+id/itemChartsmenuTimeframe"
12-
android:showAsAction="ifRoom|withText"
13+
app:showAsAction="ifRoom|withText"
1314
android:title="@string/time_frame"
1415
android:icon="@drawable/icon_calendar">
1516
<menu>

res/menu-w700dp-port/main_menu.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:ignore="AlwaysShowAction" >
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
tools:ignore="AlwaysShowAction">
56

67
<!-- Large tablets, lots of space even in portait-->
78

89
<item
910
android:id="@+id/itemMainmenuImport"
1011
android:icon="@drawable/icon_import"
11-
android:showAsAction="ifRoom|withText"
12+
app:showAsAction="ifRoom|withText"
1213
android:title="@string/import_">
1314
</item>
1415
<item
1516
android:id="@+id/itemMainmenuExport"
1617
android:icon="@drawable/icon_export"
17-
android:showAsAction="ifRoom|withText"
18+
app:showAsAction="ifRoom|withText"
1819
android:title="@string/export_">
1920
</item>
2021
<item
2122
android:id="@+id/itemMainmenuStatsMode"
2223
android:icon="@drawable/icon_plusminus"
23-
android:showAsAction="always|withText"
24+
app:showAsAction="always|withText"
2425
android:title="@string/daily">
2526
</item>
2627
<item
2728
android:id="@+id/itemMainmenuRefresh"
2829
android:icon="@drawable/icon_refresh"
29-
android:showAsAction="always"
30+
app:showAsAction="always"
3031
android:title="@string/refresh">
3132
</item>
3233
<item
3334
android:id="@+id/itemMainmenuAbout"
3435
android:icon="@drawable/icon_about"
35-
android:showAsAction="never"
36+
app:showAsAction="never"
3637
android:title="@string/about_title">
3738
</item>
3839
<item
3940
android:id="@+id/itemMainmenuAccounts"
40-
android:showAsAction="never"
41+
app:showAsAction="never"
4142
android:title="@string/manage_accounts">
4243
</item>
4344
<item
4445
android:id="@+id/itemMainmenuPreferences"
45-
android:showAsAction="never"
46+
app:showAsAction="never"
4647
android:title="@string/preferences">
4748
</item>
4849

res/menu/admob_fragment_menu.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
34

45
<item
56
android:id="@+id/itemAdmobsmenuRefresh"
67
android:icon="@drawable/icon_refresh"
7-
android:showAsAction="ifRoom"
8+
app:showAsAction="ifRoom"
89
android:title="@string/refresh">
910
</item>
1011
<item
1112
android:id="@+id/itemAdmobsmenuTimeframe"
1213
android:icon="@drawable/icon_calendar"
13-
android:showAsAction="ifRoom|withText"
14+
app:showAsAction="ifRoom|withText"
1415
android:title="@string/time_frame">
1516
<menu>
1617
<group android:checkableBehavior="single" >
@@ -34,7 +35,7 @@
3435
</item>
3536
<item
3637
android:id="@+id/itemAdmobsmenuRemove"
37-
android:showAsAction="never"
38+
app:showAsAction="never"
3839
android:title="@string/remove_admob">
3940
</item>
4041

0 commit comments

Comments
 (0)