From fdda5bd20e36769b7fa1934d3885bf107d98d151 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 8 Jan 2023 23:25:45 +0100
Subject: [PATCH] updating commons and min OS version to 6

---
 app/build.gradle                              |  8 ++--
 app/src/main/AndroidManifest.xml              | 42 ++++++-------------
 .../pro/activities/PhotoVideoActivity.kt      |  2 +-
 .../pro/activities/VideoPlayerActivity.kt     |  2 +-
 .../pro/activities/ViewPagerActivity.kt       |  2 +-
 .../directory_item_grid_rounded_corners.xml   |  2 +-
 .../res/layout/directory_item_grid_square.xml |  2 +-
 .../main/res/layout/directory_item_list.xml   |  2 +-
 app/src/main/res/menu/cab_directories.xml     |  9 ++--
 app/src/main/res/menu/cab_media.xml           |  5 ++-
 app/src/main/res/menu/menu_main.xml           | 10 ++---
 build.gradle                                  |  2 +-
 12 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 229b5ee6e..121c8efb0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdk 33
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.simplemobiletools.gallery.pro"
-        minSdk 21
-        targetSdk 33
+        minSdkVersion 23
+        targetSdkVersion 33
         versionCode 380
         versionName "6.25.5"
         setProperty("archivesBaseName", "gallery-$versionCode")
@@ -78,7 +78,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:ecdc896381'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:8d0cd51dd8'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 287ebbede..6f98f6812 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,17 +57,10 @@
 
         <activity
             android:name=".activities.MainActivity"
+            android:configChanges="orientation"
             android:exported="true"
             android:resizeableActivity="true">
 
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:resource="@xml/searchable" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.PICK" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -93,34 +86,17 @@
 
         <activity
             android:name=".activities.MediaActivity"
+            android:configChanges="orientation"
             android:exported="false"
-            android:parentActivityName=".activities.MainActivity">
-
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:resource="@xml/searchable" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-        </activity>
+            android:parentActivityName=".activities.MainActivity" />
 
         <activity
             android:name=".activities.SearchActivity"
+            android:configChanges="orientation"
             android:exported="false"
             android:label="@string/search"
             android:parentActivityName=".activities.MainActivity"
-            android:resizeableActivity="true">
-
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:resource="@xml/searchable" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-        </activity>
+            android:resizeableActivity="true" />
 
         <activity
             android:name=".activities.ViewPagerActivity"
@@ -142,18 +118,21 @@
 
         <activity
             android:name="com.simplemobiletools.commons.activities.AboutActivity"
+            android:configChanges="orientation"
             android:exported="false"
             android:label="@string/about"
             android:parentActivityName=".activities.MainActivity" />
 
         <activity
             android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
+            android:configChanges="orientation"
             android:exported="false"
             android:label="@string/customize_colors"
             android:parentActivityName=".activities.SettingsActivity" />
 
         <activity
             android:name=".activities.SettingsActivity"
+            android:configChanges="orientation"
             android:exported="true"
             android:label="@string/settings"
             android:parentActivityName=".activities.MainActivity">
@@ -191,18 +170,21 @@
 
         <activity
             android:name=".activities.IncludedFoldersActivity"
+            android:configChanges="orientation"
             android:exported="false"
             android:label="@string/include_folders"
             android:parentActivityName=".activities.SettingsActivity" />
 
         <activity
             android:name=".activities.ExcludedFoldersActivity"
+            android:configChanges="orientation"
             android:exported="false"
             android:label="@string/excluded_folders"
             android:parentActivityName=".activities.SettingsActivity" />
 
         <activity
             android:name=".activities.HiddenFoldersActivity"
+            android:configChanges="orientation"
             android:exported="false"
             android:label="@string/hidden_folders"
             android:parentActivityName=".activities.SettingsActivity" />
@@ -237,6 +219,7 @@
 
         <activity
             android:name=".activities.EditActivity"
+            android:configChanges="orientation"
             android:exported="true"
             android:label="@string/editor">
 
@@ -264,6 +247,7 @@
 
         <activity
             android:name=".activities.SetWallpaperActivity"
+            android:configChanges="orientation"
             android:exported="true"
             android:label="@string/simple_wallpaper">
             <intent-filter>
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt
index 9ec7f2065..698459fc1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt
@@ -37,7 +37,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         showTransparentTop = true
-        showTransparentNavigation = true
+        //showTransparentNavigation = true
 
         super.onCreate(savedInstanceState)
         setContentView(R.layout.fragment_holder)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt
index 66d82dddb..d7adac061 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/VideoPlayerActivity.kt
@@ -60,7 +60,7 @@ open class VideoPlayerActivity : SimpleActivity(), SeekBar.OnSeekBarChangeListen
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         showTransparentTop = true
-        showTransparentNavigation = true
+        //showTransparentNavigation = true
 
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_video_player)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
index 04680c25c..e6a39c196 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
@@ -90,7 +90,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
     override fun onCreate(savedInstanceState: Bundle?) {
         showTransparentTop = true
-        showTransparentNavigation = true
+        //showTransparentNavigation = true
 
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_medium)
diff --git a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
index cc98eb2f0..936f0c6e4 100644
--- a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
+++ b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
@@ -74,7 +74,7 @@
         android:background="@drawable/circle_black_background"
         android:contentDescription="@string/pin"
         android:padding="@dimen/small_margin"
-        android:src="@drawable/ic_pin"
+        android:src="@drawable/ic_pin_filled_vector"
         android:visibility="gone" />
 
     <TextView
diff --git a/app/src/main/res/layout/directory_item_grid_square.xml b/app/src/main/res/layout/directory_item_grid_square.xml
index 37ebc9311..2d48c8c4d 100644
--- a/app/src/main/res/layout/directory_item_grid_square.xml
+++ b/app/src/main/res/layout/directory_item_grid_square.xml
@@ -52,7 +52,7 @@
         android:background="@drawable/circle_black_background"
         android:contentDescription="@string/pin"
         android:padding="@dimen/small_margin"
-        android:src="@drawable/ic_pin"
+        android:src="@drawable/ic_pin_filled_vector"
         android:visibility="gone" />
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/directory_item_list.xml b/app/src/main/res/layout/directory_item_list.xml
index d038b95bb..105c39116 100644
--- a/app/src/main/res/layout/directory_item_list.xml
+++ b/app/src/main/res/layout/directory_item_list.xml
@@ -108,7 +108,7 @@
             android:layout_height="@dimen/sd_card_icon_size"
             android:contentDescription="@string/pin"
             android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_pin"
+            android:src="@drawable/ic_pin_filled_vector"
             android:visibility="gone" />
 
         <ImageView
diff --git a/app/src/main/res/menu/cab_directories.xml b/app/src/main/res/menu/cab_directories.xml
index 08d7fcf58..1efcb6ee0 100644
--- a/app/src/main/res/menu/cab_directories.xml
+++ b/app/src/main/res/menu/cab_directories.xml
@@ -2,25 +2,28 @@
 <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_delete"
         android:icon="@drawable/ic_delete_vector"
+        android:showAsAction="always"
         android:title="@string/delete"
         app:showAsAction="always" />
     <item
         android:id="@+id/cab_properties"
         android:icon="@drawable/ic_info_vector"
+        android:showAsAction="always"
         android:title="@string/properties"
         app:showAsAction="always" />
     <item
         android:id="@+id/cab_pin"
-        android:icon="@drawable/ic_pin"
+        android:icon="@drawable/ic_pin_filled_vector"
+        android:showAsAction="always"
         android:title="@string/pin_to_the_top"
         app:showAsAction="always" />
     <item
         android:id="@+id/cab_unpin"
-        android:icon="@drawable/ic_unpin"
+        android:icon="@drawable/ic_pin_vector"
         android:title="@string/unpin_folder"
         app:showAsAction="ifRoom" />
     <item
diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml
index ee34b51e9..f861bac02 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -2,20 +2,23 @@
 <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_confirm_selection"
         android:icon="@drawable/ic_check_vector"
+        android:showAsAction="always"
         android:title="@string/confirm_selection"
         app:showAsAction="always" />
     <item
         android:id="@+id/cab_delete"
         android:icon="@drawable/ic_delete_vector"
+        android:showAsAction="always"
         android:title="@string/delete"
         app:showAsAction="always" />
     <item
         android:id="@+id/cab_share"
         android:icon="@drawable/ic_share_vector"
+        android:showAsAction="always"
         android:title="@string/share"
         app:showAsAction="always" />
     <item
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 5af41f989..efc1c2be1 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -74,11 +74,6 @@
         android:showAsAction="never"
         android:title="@string/reduce_column_count"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/more_apps_from_us"
-        android:showAsAction="never"
-        android:title="@string/more_apps_from_us"
-        app:showAsAction="never" />
     <item
         android:id="@+id/settings"
         android:icon="@drawable/ic_settings_cog_vector"
@@ -89,4 +84,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>
diff --git a/build.gradle b/build.gradle
index 67445911f..16bd6caaa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     // needed only if we are including commons locally from our pc, not via Jitpack
     /*ext {
         propCompileSdkVersion = 33
-        propMinSdkVersion = 21
+        propMinSdkVersion = 23
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
         propVersionName = '5.34.26'