fix: incorrect screen metrics (#34)

Hamza417 · Apr 14, 2024 · 3763a07 · 3763a07
1 parent e663031
commit 3763a07
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/app/src/main/java/app/simple/peri/preferences/MainPreferences.kt b/app/src/main/java/app/simple/peri/preferences/MainPreferences.kt
@@ -7,7 +7,6 @@ object MainPreferences {
     private const val STORAGE_URI = "storageUri"
     private const val NOMEDIA_DIALOG = "nomediaDialog"
     private const val BLUR = "blur"
-    private const val IS_BIOMETRIC = "is_biometric"
     private const val REMEMBER_SCROLL_POSITION = "remember_scroll_position"
     private const val SCROLL_POSITION = "scrollPosition"
     private const val CROP_WALLPAPER = "crop_wallpaper"
@@ -16,6 +15,7 @@ object MainPreferences {
     private const val WALLPAPER_SET_FOR = "auto_wallpaper_set_for"
     private const val REDUCE_MOTION = "reduce_motion"
 
+    const val IS_BIOMETRIC = "is_biometric"
     const val SORT = "sort"
     const val ORDER = "order"
     const val NAME = "is_name"

diff --git a/app/src/main/java/app/simple/peri/ui/MainScreen.kt b/app/src/main/java/app/simple/peri/ui/MainScreen.kt
@@ -46,6 +46,7 @@ import app.simple.peri.utils.ConditionUtils.isNotNull
 import app.simple.peri.utils.FileUtils.toUri
 import app.simple.peri.utils.PermissionUtils.isBatteryOptimizationDisabled
 import app.simple.peri.utils.PermissionUtils.requestIgnoreBatteryOptimizations
+import app.simple.peri.utils.ScreenUtils
 import app.simple.peri.utils.ScreenUtils.isLandscape
 import app.simple.peri.utils.WallpaperSort
 import app.simple.peri.viewmodels.WallpaperViewModel
@@ -87,8 +88,11 @@ class MainScreen : Fragment(), SharedPreferences.OnSharedPreferenceChangeListene
         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, /* forward = */ false)
         binding?.fab?.transitionName = requireArguments().getString(BundleConstants.FAB_TRANSITION)
 
-        displayWidth = requireContext().resources.displayMetrics.widthPixels
-        displayHeight = requireContext().resources.displayMetrics.heightPixels
+        with(ScreenUtils.getScreenSize(requireContext())) {
+            displayWidth = width
+            displayHeight = height
+        }
+
         fixNavigationBarOverlap()
         itemTouchHelper = ItemTouchHelper(simpleItemTouchCallback)
 

diff --git a/app/src/main/java/app/simple/peri/ui/Preferences.kt b/app/src/main/java/app/simple/peri/ui/Preferences.kt
@@ -31,6 +31,7 @@ import app.simple.peri.utils.FileUtils.listCompleteFiles
 import app.simple.peri.utils.FileUtils.toSize
 import app.simple.peri.utils.PermissionUtils.isBatteryOptimizationDisabled
 import app.simple.peri.utils.PermissionUtils.requestIgnoreBatteryOptimizations
+import app.simple.peri.utils.ScreenUtils
 import app.simple.peri.utils.ViewUtils.firstChild
 import app.simple.peri.utils.ViewUtils.setPaddingBottom
 import app.simple.peri.utils.ViewUtils.setPaddingTop
@@ -189,8 +190,9 @@ class Preferences : PreferenceFragmentCompat(), SharedPreferences.OnSharedPrefer
                     it.length()
                 }
 
-                val displayWidth = requireContext().resources.displayMetrics.widthPixels
-                val displayHeight = requireContext().resources.displayMetrics.heightPixels
+                val displayWidth = ScreenUtils.getScreenSize(requireContext()).width
+                val displayHeight = ScreenUtils.getScreenSize(requireContext()).height
+                Log.d("Preferences", "Display width: $displayWidth, Display height: $displayHeight")
                 val wallpaperDatabase = WallpaperDatabase.getInstance(requireContext())?.wallpaperDao()
 
                 val normalWallpapers = wallpaperDatabase?.getWallpapersByWidthAndHeight(displayWidth, displayHeight)?.size
@@ -232,7 +234,7 @@ class Preferences : PreferenceFragmentCompat(), SharedPreferences.OnSharedPrefer
 
     override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {
         when (p1) {
-            "is_biometric" -> {
+            MainPreferences.IS_BIOMETRIC -> {
                 if (p0?.getBoolean(p1, false) == true) {
                     val promptInfo = BiometricPrompt.PromptInfo.Builder()
                         .setTitle(getString(R.string.app_name))