From 23fc17ba5feb692d13fa96eea3a88be7b4497402 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 20 May 2019 12:59:04 +0200
Subject: [PATCH] purge confusing, unused duplicate string/icon assignment in
bottom nav
fdroid/fdroidclient#1785
---
.../basic/res/menu/main_activity_screens.xml | 23 ++++++------
.../full/res/menu/main_activity_screens.xml | 35 ++++++++-----------
app/src/main/res/layout/activity_main.xml | 2 --
3 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/app/src/basic/res/menu/main_activity_screens.xml b/app/src/basic/res/menu/main_activity_screens.xml
index aa90a0cd5..7bc7eb79a 100644
--- a/app/src/basic/res/menu/main_activity_screens.xml
+++ b/app/src/basic/res/menu/main_activity_screens.xml
@@ -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" />
+ app:showAsAction="ifRoom|withText"
+ 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" />
+ app:showAsAction="ifRoom|withText"
+ android:id="@+id/updates"/>
<item
- android:title="@string/menu_settings"
- android:icon="@drawable/ic_settings"
- app:showAsAction="ifRoom|withText"
- android:id="@+id/settings" />
+ app:showAsAction="ifRoom|withText"
+ android:id="@+id/settings"/>
</menu>
\ No newline at end of file
diff --git a/app/src/full/res/menu/main_activity_screens.xml b/app/src/full/res/menu/main_activity_screens.xml
index c7c174d7e..31537fa5f 100644
--- a/app/src/full/res/menu/main_activity_screens.xml
+++ b/app/src/full/res/menu/main_activity_screens.xml
@@ -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" />
+ app:showAsAction="ifRoom|withText"
+ 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" />
+ app:showAsAction="ifRoom|withText"
+ 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" />
+ app:showAsAction="ifRoom|withText"
+ android:id="@+id/nearby"/>
<item
- android:title="@string/main_menu__updates"
- android:icon="@drawable/ic_updates"
- app:showAsAction="ifRoom|withText"
- android:id="@+id/updates" />
+ app:showAsAction="ifRoom|withText"
+ android:id="@+id/updates"/>
<item
- android:title="@string/menu_settings"
- android:icon="@drawable/ic_settings"
- app:showAsAction="ifRoom|withText"
- android:id="@+id/settings" />
+ app:showAsAction="ifRoom|withText"
+ android:id="@+id/settings"/>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 85aacae88..fa6ba7076 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -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" />