Merge pull request #131 from Mindinventory/develop

v1.4.3(31) Edge-to-edge support for android 15

Author: sanjay-mi

app/build.gradle

@@ -9,11 +9,11 @@ plugins {
 
 android {
     namespace 'com.lassi.app'
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.lassi.app"
         minSdk 21
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/lassi/app/MainActivity.kt

@@ -26,6 +26,11 @@ import com.lassi.presentation.common.decoration.GridSpacingItemDecoration
 import com.lassi.presentation.cropper.CropImageView
 import java.io.File
 import java.util.Locale
+import androidx.core.net.toUri
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 
 class MainActivity : AppCompatActivity(), View.OnClickListener {
     private var _binding: ActivityMainBinding? = null
@@ -35,9 +40,28 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        // this thing ensures that the padding removed for the edge-to-edge support is not overridden again
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        // this thing adds the black color to the text of status bar.
+        WindowInsetsControllerCompat(window, window.decorView)
+            .isAppearanceLightStatusBars = true
+
         _binding = ActivityMainBinding.inflate(layoutInflater)
         binding.also {
             setContentView(it.root)
+            // Apply system bar padding to root layout
+            ViewCompat.setOnApplyWindowInsetsListener(it.root) { view, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                view.setPadding(
+                    view.paddingLeft,
+                    systemBars.top,  // top padding for status bar
+                    view.paddingRight,
+                    systemBars.bottom // bottom padding for nav bar
+                )
+                insets
+            }
             it.btnImagePicker.setOnClickListener(this)
             it.btnVideoPicker.setOnClickListener(this)
             it.btnAudioPicker.setOnClickListener(this)
@@ -337,9 +361,8 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                     try {
                         val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
                         intent.addCategory("android.intent.category.DEFAULT")
-                        intent.data = Uri.parse(
-                            String.format("package:%s", applicationContext?.packageName)
-                        )
+                        intent.data =
+                            String.format("package:%s", applicationContext?.packageName).toUri()
                         mPermissionSettingResult.launch(intent)
                     } catch (e: Exception) {
                         val intent = Intent()

lassi/build.gradle

@@ -10,12 +10,12 @@ group='com.github.Mindinventory'
 
 android {
     namespace 'com.lassi'
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         minSdk 21
-        targetSdk 34
-        versionCode 30
-        versionName "1.4.2"
+        targetSdk 35
+        versionCode 31
+        versionName "1.4.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true

lassi/src/main/java/com/lassi/presentation/cropper/BitmapUtils.kt

@@ -250,7 +250,7 @@ internal object BitmapUtils {
         )
         if (result == bitmap) {
             // corner case when all bitmap is selected, no worth optimizing for it
-            result = bitmap.copy(bitmap.config, false)
+            result = bitmap.copy(bitmap.config ?: Bitmap.Config.ARGB_8888, false)
         }
         // rotating by 0, 90, 180 or 270 degrees doesn't require extra cropping
         if (degreesRotated % 90 != 0) {
@@ -614,7 +614,7 @@ internal object BitmapUtils {
                     )
                 }
             } catch (e: OutOfMemoryError) {
-                result.recycle()
+                result?.recycle()
                 throw e
             }
             BitmapSampled(result, sampleSize)

lassi/src/main/java/com/lassi/presentation/cropper/CropImageView.kt

@@ -27,6 +27,9 @@ import android.widget.ProgressBar
 import androidx.annotation.RequiresApi
 import androidx.core.util.component1
 import androidx.core.util.component2
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.exifinterface.media.ExifInterface
 import com.lassi.R
 import com.lassi.presentation.cropper.CropOverlayView
@@ -1885,6 +1888,24 @@ class CropImageView @JvmOverloads constructor(
     mProgressBar = v.findViewById(R.id.CropProgressBar)
     mProgressBar.indeterminateTintList = ColorStateList.valueOf(options.progressBarColor)
     setProgressBarVisibility()
+
+    // Gives the text of the status bar dark color
+    (context as? Activity)?.let { activity ->
+      WindowInsetsControllerCompat(activity.window, activity.window.decorView)
+        .isAppearanceLightStatusBars = true
+    }
+    // giving the padding according to the edge-to-edge support.
+    ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
+      val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+      v.setPadding(
+        v.paddingLeft,
+        systemBars.top,
+        v.paddingRight,
+        systemBars.bottom
+      )
+      insets
+    }
   }
 
   override fun onCropWindowChanged(inProgress: Boolean) {

lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt

@@ -14,6 +14,10 @@ import android.webkit.MimeTypeMap
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.lassi.R
@@ -140,6 +144,26 @@ class LassiMediaPickerActivity :
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         setThemeAttributes()
         initiateFragment()
+
+        // Gives the text of the status bar dark color
+        WindowInsetsControllerCompat(window, window.decorView)
+            .isAppearanceLightStatusBars = true
+
+        // this thing ensures that the padding removed for the edge-to-edge support is not overridden again
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        // giving the padding according to the edge-to-edge support.
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.root_layout_media_picker)) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.setBackgroundColor(config.statusBarColor)
+            view.setPadding(
+                view.paddingLeft,
+                systemBars.top,
+                view.paddingRight,
+                systemBars.bottom
+            )
+            insets
+        }
     }
 
     private fun setToolbarTitle(selectedMedias: ArrayList<MiMedia>) {

lassi/src/main/res/layout/activity_media_picker.xml

@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/root_layout_media_picker"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">

lassi/src/main/res/layout/crop_image_activity.xml

@@ -4,4 +4,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="false"
     />

lassi/src/main/res/layout/fragment_media_picker.xml

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="false">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvMedia"