Merge pull request #460 from mjaakko/fix_deprecations

Fix deprecations
mjaakko · Jan 28, 2025 · 9b135cc · 9b135cc
2 parents c402bdf + ee57f2e
commit 9b135cc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/xyz/malkki/neostumbler/extensions/telephonyManagerExtensions.kt b/app/src/main/java/xyz/malkki/neostumbler/extensions/telephonyManagerExtensions.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION") //PhoneStateListener is deprecated on Android 12+ś
+
 package xyz.malkki.neostumbler.extensions
 
 import android.Manifest
@@ -24,7 +26,6 @@ fun TelephonyManager.getServiceStateFlow(): Flow<ServiceState> {
     }
 }
 
-@Suppress("DEPRECATION")
 private fun TelephonyManager.getServiceStateFlowLegacy(): Flow<ServiceState> = callbackFlow {
     var listener: PhoneStateListener? = null
 

diff --git a/.../java/xyz/malkki/neostumbler/ui/composables/settings/geosubmit/SuggestedServicesDialog.kt b/.../java/xyz/malkki/neostumbler/ui/composables/settings/geosubmit/SuggestedServicesDialog.kt
@@ -17,6 +17,7 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.ExposedDropdownMenuDefaults
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MenuAnchorType
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -111,7 +112,7 @@ fun SuggestedServicesDialog(onServiceSelected: (SuggestedService?) -> Unit) {
                                 onValueChange = {},
                                 readOnly = true,
                                 trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded.value) },
-                                modifier = Modifier.menuAnchor()
+                                modifier = Modifier.menuAnchor(type = MenuAnchorType.PrimaryNotEditable)
                             )
 
                             ExposedDropdownMenu(

diff --git a/app/src/main/java/xyz/malkki/neostumbler/ui/theme/Theme.kt b/app/src/main/java/xyz/malkki/neostumbler/ui/theme/Theme.kt
@@ -60,7 +60,12 @@ fun NeoStumblerTheme(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                @Suppress("DEPRECATION")
+                window.statusBarColor = colorScheme.primary.toArgb()
+            }
+
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
         }
     }