From 9228c156c871b0175d708499752341af13b028e5 Mon Sep 17 00:00:00 2001
From: androidacy-user <opensource@androidacy.com>
Date: Fri, 3 Feb 2023 21:21:38 -0500
Subject: [PATCH] begin switch to md3 style bottom nav

Signed-off-by: androidacy-user <opensource@androidacy.com>
---
 .../drawable/baseline_cloud_download_24.xml   |  5 +++
 app/src/main/res/layout/activity_main.xml     | 32 +++++++++++++++----
 app/src/main/res/menu/bottom_nav_menu.xml     | 19 +++++++++++
 app/src/main/res/values/strings.xml           |  9 ++++--
 4 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_cloud_download_24.xml
 create mode 100644 app/src/main/res/menu/bottom_nav_menu.xml

diff --git a/app/src/main/res/drawable/baseline_cloud_download_24.xml b/app/src/main/res/drawable/baseline_cloud_download_24.xml
new file mode 100644
index 0000000..b7d6432
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_cloud_download_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"
+    android:height="24dp" android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@android:color/white" android:pathData="M19.4,10C18.7,6.6 15.6,4 12,4 9.1,4 6.6,5.6 5.4,8 2.3,8.4 0,10.9 0,14c0,3.3 2.7,6 6,6h13c2.8,0 5,-2.2 5,-5 0,-2.6 -2.1,-4.8 -4.7,-5zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 660d5a7..64c50ed 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,7 +25,13 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/module_list"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
+                app:edgeToEdge="true" />
+            <!-- online modules -->
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/online_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 app:edgeToEdge="true" />
         </FrameLayout>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -64,10 +70,8 @@
         android:id="@+id/search_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginRight="12dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginHorizontal="12dp"
+        android:layout_marginVertical="8dp"
         android:gravity="right"
         android:filterTouchesWhenObscured="true"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -83,8 +87,7 @@
             android:id="@+id/down_arrow"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:background="@color/transparent"
             android:visibility="gone" />
         <com.google.android.material.card.MaterialCardView
@@ -103,9 +106,24 @@
             <androidx.appcompat.widget.SearchView
                 android:id="@+id/search_bar"
                 android:layout_width="match_parent"
+                app:useDrawerArrowDrawable="true"
                 android:layout_height="wrap_content"
                 android:background="@null" />
         </com.google.android.material.card.MaterialCardView>
     </LinearLayout>
+    <!-- bottom md3 navigation bar -->
+    <!-- used for local and remote module list -->
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_nav"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:background="?attr/backgroundColor"
+        android:visibility="visible"
+        app:compatShadowEnabled="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:menu="@menu/bottom_nav_menu" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
new file mode 100644
index 0000000..2313199
--- /dev/null
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -0,0 +1,19 @@
+<?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">
+    <!-- two options: "Installed" and "Online" -->
+    <item
+        android:id="@+id/installed"
+        android:icon="@drawable/ic_baseline_extension_24"
+        android:title="@string/installed"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/online"
+        android:icon="@drawable/baseline_monetization_on_24"
+        android:title="@string/online"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/settings"
+        android:icon="@drawable/ic_baseline_settings_24"
+        android:title="@string/action_settings"
+        app:showAsAction="ifRoom" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc460cf..3295e0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -351,8 +351,13 @@
     <string name="notification_update_summary">The following modules can be updated:</string>
     <string name="notification_update_module_template">%1$s to version %2$s</string>
     <string name="notification_channel_background_update">Checking for updates...</string>
-    <string name="notification_channel_background_update_description">FoxMMM is checking for updates in the background.</string><string name="notification_channel_category_background_update">Background update status</string>
+    <string name="notification_channel_background_update_description">FoxMMM is checking for updates in the background.</string>
+    <string name="notification_channel_category_background_update">Background update status</string>
     <string name="notification_channel_category_background_update_description">Shows a notification while checking for updates so the system doesn\'t kill it</string>
     <string name="notification_update_wifi_desc">Only check on WiFi</string>
-    <string name="notification_update_wifi_pref">Require wi-fi or an unmetered network for update checks. Recommended to leave on if you have limited mobile data.</string><string name="background_update_check_excludes_no_modules">No modules installed on device</string><string name="auto_updates_notifs">Notifies when module updates are found</string><string name="notification_group_updates">Updates</string><string name="low_quality_module_desc">This module has metadata that is either invalid or considered a marker for a low-quality module. Uninstallation is recommended.</string>
+    <string name="notification_update_wifi_pref">Require wi-fi or an unmetered network for update checks. Recommended to leave on if you have limited mobile data.</string>
+    <string name="background_update_check_excludes_no_modules">No modules installed on device</string>
+    <string name="auto_updates_notifs">Notifies when module updates are found</string>
+    <string name="notification_group_updates">Updates</string>
+    <string name="low_quality_module_desc">This module has metadata that is either invalid or considered a marker for a low-quality module. Uninstallation is recommended.</string><string name="online">Online</string>
 </resources>