tslocum
/
meditationassistant
1
2
Fork 0
Code Issues 27 Pull Requests Releases Activity

Resolve menu icon display issue

merge-requests/7/head
Trevor Slocum 2019-12-16 16:52:57 -08:00
parent ce3d1038e1
commit 5e06606b7a
5 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MeditationAssistant/src/main/res/menu/about.xml
View File

@ -1,18 +1,17 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".AboutActivity">
<item
android:id="@+id/action_rate"
android:icon="?attr/actionIconNotImportant"
android:title="@string/rate"
app:showAsAction="always" />
android:showAsAction="always"
android:title="@string/rate"/>
<item
android:id="@+id/action_share_app"
android:icon="?attr/actionIconShare"
android:title="@string/share"
app:showAsAction="always" />
android:showAsAction="always"
android:title="@string/share"/>
</menu>

7
MeditationAssistant/src/main/res/menu/main.xml
View File

@ -1,11 +1,10 @@
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/action_settings"
android:icon="?attr/actionIconSettings"
android:orderInCategory="100"
android:title="@string/settings"
app:showAsAction="always" />
android:showAsAction="always"
android:title="@string/settings"/>
</menu>

31
MeditationAssistant/src/main/res/menu/medinet.xml
View File

@ -1,46 +1,45 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MediNETActivity">
<item
android:id="@+id/refreshMediNET"
android:icon="?attr/actionIconRefresh"
android:showAsAction="always"
android:title="@string/refresh"
tools:ignore="AlwaysShowAction"
app:showAsAction="always" />
tools:ignore="AlwaysShowAction"/>
<item
android:id="@+id/menuMediNET"
android:icon="?attr/actionIconSortBySize"
android:showAsAction="always"
android:title="@string/page"
tools:ignore="AlwaysShowAction"
app:showAsAction="always">
tools:ignore="AlwaysShowAction">
<menu>
<item
android:id="@+id/menuMediNETCommunity"
android:icon="?attr/actionIconWebsite"
android:title="@string/community"
app:showAsAction="never" />
android:showAsAction="never"
android:title="@string/community"/>
<item
android:id="@+id/menuMediNETSessions"
android:icon="?attr/actionIconViewAsList"
android:title="@string/sessions"
app:showAsAction="never" />
android:showAsAction="never"
android:title="@string/sessions"/>
<item
android:id="@+id/menuMediNETAccount"
android:icon="?attr/actionIconPerson"
android:title="@string/account"
app:showAsAction="never" />
android:showAsAction="never"
android:title="@string/account"/>
<item
android:id="@+id/menuMediNETGroups"
android:icon="?attr/actionIconGroup"
android:title="@string/groups"
app:showAsAction="never" />
android:showAsAction="never"
android:title="@string/groups"/>
<item
android:id="@+id/menuMediNETForum"
android:icon="?attr/actionIconChat"
android:title="@string/forum"
app:showAsAction="never" />
android:showAsAction="never"
android:title="@string/forum"/>
</menu>
</item>

7
MeditationAssistant/src/main/res/menu/progress.xml
View File

@ -1,10 +1,9 @@
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/addSession"
android:icon="?attr/actionIconNew"
android:title="@string/addSession"
app:showAsAction="always" />
android:showAsAction="always"
android:title="@string/addSession" />
</menu>

11
MeditationAssistant/src/main/res/menu/settings.xml
View File

@ -1,18 +1,17 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:tools="http://schemas.android.com/tools">
<item
android:id="@+id/action_about"
android:icon="?attr/actionIconInfo"
android:showAsAction="always"
android:title="@string/about"
tools:ignore="AlwaysShowAction"
app:showAsAction="always" />
tools:ignore="AlwaysShowAction"/>
<item
android:id="@+id/action_accountsettings"
android:icon="?attr/actionIconPerson"
android:showAsAction="always"
android:title="@string/account"
tools:ignore="AlwaysShowAction"
app:showAsAction="always" />
tools:ignore="AlwaysShowAction"/>
</menu>