Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

purge confusing, unused duplicate string/icon assignment in bottom nav

Browse Source 
fdroid/fdroidclient#1785
This commit is contained in:
Hans-Christoph Steiner 2019-05-20 12:59:04 +02:00
parent c652718a4a
commit 23fc17ba5f
3 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/basic/res/menu/main_activity_screens.xml
View File

@ -1,19 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MenuTitle">
<!-- android:title and android:icon are set dynamically in MainActivity -->
<item
android:title="@string/main_menu__latest_apps"
android:icon="@drawable/ic_latest"
app:showAsAction="ifRoom|withText"
android:id="@+id/whats_new" />
android:id="@+id/whats_new"/>
<item
android:title="@string/main_menu__updates"
android:icon="@drawable/ic_updates"
app:showAsAction="ifRoom|withText"
android:id="@+id/updates" />
android:id="@+id/updates"/>
<item
android:title="@string/menu_settings"
android:icon="@drawable/ic_settings"
app:showAsAction="ifRoom|withText"
android:id="@+id/settings" />
android:id="@+id/settings"/>
</menu>

25
app/src/full/res/menu/main_activity_screens.xml
View File

@ -1,29 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MenuTitle">
<!-- android:title and android:icon are set dynamically in MainActivity -->
<item
android:title="@string/main_menu__latest_apps"
android:icon="@drawable/ic_latest"
app:showAsAction="ifRoom|withText"
android:id="@+id/whats_new" />
android:id="@+id/whats_new"/>
<item
android:title="@string/main_menu__categories"
android:icon="@drawable/ic_categories"
app:showAsAction="ifRoom|withText"
android:id="@+id/categories" />
android:id="@+id/categories"/>
<item
android:title="@string/main_menu__swap_nearby"
android:icon="@drawable/ic_nearby"
app:showAsAction="ifRoom|withText"
android:id="@+id/nearby" />
android:id="@+id/nearby"/>
<item
android:title="@string/main_menu__updates"
android:icon="@drawable/ic_updates"
app:showAsAction="ifRoom|withText"
android:id="@+id/updates" />
android:id="@+id/updates"/>
<item
android:title="@string/menu_settings"
android:icon="@drawable/ic_settings"
app:showAsAction="ifRoom|withText"
android:id="@+id/settings" />
android:id="@+id/settings"/>
</menu>

2
app/src/main/res/layout/activity_main.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
android:orientation="vertical"
android:layout_width="match_parent"
@ -8,7 +7,6 @@
<com.ashokvarma.bottomnavigation.BottomNavigationBar
android:id="@+id/bottom_navigation"
app:menu="@menu/main_activity_screens"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />