Restructure

Author: w2sv

app/src/main/kotlin/com/w2sv/wifiwidget/extensions/Context.kt

@@ -5,7 +5,7 @@ import com.w2sv.common.extensions.getDeflowedMap
 import com.w2sv.common.extensions.getValueSynchronously
 import com.w2sv.common.datastore.DataStoreProperty
 import com.w2sv.common.datastore.DataStoreRepository
-import com.w2sv.wifiwidget.extensions.getMutableStateMap
+import com.w2sv.common.extensions.getMutableStateMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/kotlin/com/w2sv/wifiwidget/extensions/Map.kt

@@ -35,9 +35,9 @@ import androidx.core.app.ShareCompat
 import com.w2sv.androidutils.extensions.launchDelayed
 import com.w2sv.androidutils.extensions.playStoreUrl
 import com.w2sv.androidutils.extensions.showToast
+import com.w2sv.common.extensions.openUrlWithActivityNotFoundHandling
 import com.w2sv.wifiwidget.BuildConfig
 import com.w2sv.wifiwidget.R
-import com.w2sv.wifiwidget.extensions.openUrlWithActivityNotFoundHandling
 import com.w2sv.wifiwidget.ui.shared.JostText
 import com.w2sv.wifiwidget.ui.shared.WifiWidgetTheme
 import kotlinx.coroutines.launch

app/src/main/kotlin/com/w2sv/wifiwidget/ui/NonAppliedState.kt

@@ -9,8 +9,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.w2sv.common.WifiProperty
+import com.w2sv.common.extensions.openUrlWithActivityNotFoundHandling
 import com.w2sv.wifiwidget.R
-import com.w2sv.wifiwidget.extensions.openUrlWithActivityNotFoundHandling
 import com.w2sv.wifiwidget.ui.shared.DialogButton
 import com.w2sv.wifiwidget.ui.shared.InfoDialog
 import com.w2sv.wifiwidget.ui.shared.JostText

app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/NavigationDrawer.kt

@@ -1,8 +1,20 @@
 package com.w2sv.common.extensions
 
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.pm.PackageManager
+import android.widget.Toast
 import androidx.core.content.ContextCompat
+import com.w2sv.androidutils.extensions.openUrl
+import com.w2sv.androidutils.extensions.showToast
 
 fun Context.hasPermission(permission: String): Boolean =
-    ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
+    ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
+
+fun Context.openUrlWithActivityNotFoundHandling(url: String) {
+    try {
+        openUrl(url)
+    } catch (e: ActivityNotFoundException) {
+        showToast("Couldn't find any browser to open the URL with", Toast.LENGTH_LONG)
+    }
+}

app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/widgetconfiguration/configcolumn/PropertyInfoDialog.kt

@@ -1,5 +1,7 @@
 package com.w2sv.common.extensions
 
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.snapshots.SnapshotStateMap
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
@@ -9,4 +11,8 @@ fun <K, V> Map<K, Flow<V>>.getDeflowedMap(): Map<K, V> =
         mapValues {
             it.value.first()
         }
-    }
+    }
+
+fun <K, V> Map<K, V>.getMutableStateMap(): SnapshotStateMap<K, V> =
+    mutableStateMapOf<K, V>()
+        .apply { putAll(this@getMutableStateMap) }