From 2007d8f56a8d918f6a71407828f715f986d0d92d Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 9 Jun 2021 13:42:42 -0700 Subject: [PATCH] Invert the items in the navigation menu when using a bottom appbar. https://redmine.stoutner.com/issues/728 --- .../layout/main_framelayout_bottom_appbar.xml | 2 +- .../layout/main_framelayout_top_appbar.xml | 2 +- .../webview_navigation_menu_bottom_appbar.xml | 117 ++++++++++++++++++ ...=> webview_navigation_menu_top_appbar.xml} | 19 +-- 4 files changed, 124 insertions(+), 16 deletions(-) create mode 100644 app/src/main/res/menu/webview_navigation_menu_bottom_appbar.xml rename app/src/main/res/menu/{webview_navigation_menu.xml => webview_navigation_menu_top_appbar.xml} (93%) diff --git a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml index 2f295dfb..98e16b67 100644 --- a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml +++ b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml @@ -207,7 +207,7 @@ android:layout_height="match_parent" android:layout_width="wrap_content" android:layout_gravity="start" - app:menu="@menu/webview_navigation_menu" + app:menu="@menu/webview_navigation_menu_bottom_appbar" app:itemIconTint="?attr/navigationIconTintColor" /> diff --git a/app/src/main/res/layout/main_framelayout_top_appbar.xml b/app/src/main/res/layout/main_framelayout_top_appbar.xml index fd9d426e..5d0da8de 100644 --- a/app/src/main/res/layout/main_framelayout_top_appbar.xml +++ b/app/src/main/res/layout/main_framelayout_top_appbar.xml @@ -203,7 +203,7 @@ android:layout_height="match_parent" android:layout_width="wrap_content" android:layout_gravity="start" - app:menu="@menu/webview_navigation_menu" + app:menu="@menu/webview_navigation_menu_top_appbar" app:itemIconTint="?attr/navigationIconTintColor" /> diff --git a/app/src/main/res/menu/webview_navigation_menu_bottom_appbar.xml b/app/src/main/res/menu/webview_navigation_menu_bottom_appbar.xml new file mode 100644 index 00000000..32c3a029 --- /dev/null +++ b/app/src/main/res/menu/webview_navigation_menu_bottom_appbar.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/webview_navigation_menu.xml b/app/src/main/res/menu/webview_navigation_menu_top_appbar.xml similarity index 93% rename from app/src/main/res/menu/webview_navigation_menu.xml rename to app/src/main/res/menu/webview_navigation_menu_top_appbar.xml index cc939f24..cfb10c79 100644 --- a/app/src/main/res/menu/webview_navigation_menu.xml +++ b/app/src/main/res/menu/webview_navigation_menu_top_appbar.xml @@ -18,8 +18,7 @@ You should have received a copy of the GNU General Public License along with Privacy Browser. If not, see . --> - + - - + - - + - - + - - +