From ad13fb39b2f1a7f51b3ce083e678696417bdca28 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 14 Jan 2023 16:57:47 +0100
Subject: [PATCH] updating commons

---
 app/build.gradle                                     |  2 +-
 .../applauncher/activities/MainActivity.kt           |  2 +-
 .../applauncher/activities/SettingsActivity.kt       |  2 +-
 .../applauncher/adapters/LaunchersAdapter.kt         |  2 +-
 app/src/main/res/menu/cab.xml                        | 12 ++++++++----
 app/src/main/res/menu/menu.xml                       | 10 +++++-----
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3966ad0..01d7e2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:6323be1fd7'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:3aade6f350'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
index 9e41be8..4bb333b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
@@ -42,7 +42,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
         setupOptionsMenu()
         refreshMenuItems()
 
-        updateMaterialActivityViews(main_coordinator, launchers_grid)
+        updateMaterialActivityViews(main_coordinator, launchers_grid, useTransparentNavigation = true, useTopSearchMenu = false)
         setupMaterialScrollListener(launchers_grid, main_toolbar)
 
         setupEmptyView()
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
index 9c3b3fe..e748dfa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
@@ -17,7 +17,7 @@ class SettingsActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
 
-        updateMaterialActivityViews(settings_coordinator, settings_holder)
+        updateMaterialActivityViews(settings_coordinator, settings_holder, useTransparentNavigation = true, useTopSearchMenu = false)
         setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar)
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
index 55d6c6e..43cfb91 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
@@ -179,7 +179,7 @@ class LaunchersAdapter(
         positions.sortDescending()
         removeSelectedItems(positions)
         if (launchers.isEmpty()) {
-            listener?.refreshItems()
+            listener.refreshItems()
         }
     }
 
diff --git a/app/src/main/res/menu/cab.xml b/app/src/main/res/menu/cab.xml
index 258cb8e..88aec48 100644
--- a/app/src/main/res/menu/cab.xml
+++ b/app/src/main/res/menu/cab.xml
@@ -1,22 +1,26 @@
 <?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:tools="http://schemas.android.com/tools"
-    tools:ignore="AppCompatResource">
+    tools:ignore="AppCompatResource,AlwaysShowAction">
     <item
         android:id="@+id/cab_change_order"
         android:icon="@drawable/ic_drag_handle_vector"
         android:showAsAction="always"
-        android:title="@string/change_order" />
+        android:title="@string/change_order"
+        app:showAsAction="always" />
     <item
         android:id="@+id/cab_edit"
         android:icon="@drawable/ic_rename_vector"
         android:showAsAction="always"
-        android:title="@string/rename" />
+        android:title="@string/rename"
+        app:showAsAction="always" />
     <item
         android:id="@+id/cab_remove"
         android:icon="@drawable/ic_minus_circle_vector"
         android:showAsAction="always"
-        android:title="@string/remove" />
+        android:title="@string/remove"
+        app:showAsAction="always" />
     <item
         android:id="@+id/cab_select_all"
         android:icon="@drawable/ic_select_all_vector"
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index 05f6401..3950d92 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -17,11 +17,6 @@
         android:id="@+id/column_count"
         android:icon="@drawable/ic_column_count_vector"
         android:title="@string/column_count"
-        app:showAsAction="always" />
-    <item
-        android:id="@+id/more_apps_from_us"
-        android:icon="@drawable/ic_google_play_vector"
-        android:title="@string/more_apps_from_us"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/settings"
@@ -33,4 +28,9 @@
         android:icon="@drawable/ic_info_vector"
         android:title="@string/about"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/more_apps_from_us"
+        android:icon="@drawable/ic_google_play_vector"
+        android:title="@string/more_apps_from_us"
+        app:showAsAction="ifRoom" />
 </menu>