Move stuff to AndroidUtils

Author: w2sv

app/build.gradle

@@ -16,8 +16,8 @@ android {
         minSdk libs.versions.minSdk.get().toInteger()
         targetSdk libs.versions.compileSdk.get().toInteger()
 
-        versionCode 3
-        versionName '1.0.2'
+        versionCode 4
+        versionName '1.1.0'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
@@ -50,6 +50,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
     buildFeatures {
         compose true
     }

app/src/main/kotlin/com/w2sv/wifiwidget/activities/HomeActivity.kt

@@ -23,14 +23,14 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.SavedStateHandle
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.w2sv.androidutils.SelfManagingLocalBroadcastReceiver
+import com.w2sv.androidutils.extensions.getIntExtraOrNull
+import com.w2sv.androidutils.extensions.locationServicesEnabled
 import com.w2sv.androidutils.extensions.showToast
 import com.w2sv.wifiwidget.preferences.GlobalFlags
 import com.w2sv.wifiwidget.preferences.WidgetProperties
 import com.w2sv.wifiwidget.ui.WifiWidgetTheme
 import com.w2sv.wifiwidget.ui.home.HomeScreen
-import com.w2sv.wifiwidget.utils.getIntExtraOrNull
 import com.w2sv.wifiwidget.utils.getMutableStateMap
-import com.w2sv.wifiwidget.utils.locationServicesEnabled
 import com.w2sv.wifiwidget.widget.WifiWidgetProvider
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -140,7 +140,7 @@ class HomeActivity : AppActivity() {
             lapRequestLauncher,
             WifiWidgetOptionsChangedReceiver(
                 LocalBroadcastManager.getInstance(this)
-            ) { intent ->
+            ) { _, intent ->
                 intent?.getIntExtraOrNull(WifiWidgetProvider.EXTRA_WIDGET_ID, -1)?.let { widgetId ->
                     viewModel.onWidgetOptionsUpdated(widgetId, this)
                 }
@@ -179,15 +179,12 @@ class HomeActivity : AppActivity() {
 
     class WifiWidgetOptionsChangedReceiver(
         broadcastManager: LocalBroadcastManager,
-        private val callback: (Intent?) -> Unit
-    ) : SelfManagingLocalBroadcastReceiver(
+        callback: (Context?, Intent?) -> Unit
+    ) : SelfManagingLocalBroadcastReceiver.Impl(
         broadcastManager,
-        IntentFilter(WifiWidgetProvider.ACTION_WIDGET_OPTIONS_CHANGED)
-    ) {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            callback(intent)
-        }
-    }
+        IntentFilter(WifiWidgetProvider.ACTION_WIDGET_OPTIONS_CHANGED),
+        callback
+    )
 
     val lapRequestLauncher by lazy {
         LocationAccessPermissionHandler(this) { permissionGrantedMap ->
@@ -197,7 +194,6 @@ class HomeActivity : AppActivity() {
                     syncWidgetPropertyStates()
                 }
             }
-
             requestWidgetPin()
         }
     }

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

@@ -1,18 +1,16 @@
 package com.w2sv.wifiwidget.ui
 
-import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.toFontFamily
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
@@ -57,44 +55,4 @@ fun JostText(
     )
 }
 
-@Composable
-fun JostText(
-    text: AnnotatedString,
-    modifier: Modifier = Modifier,
-    color: Color = Color.Unspecified,
-    fontSize: TextUnit = TextUnit.Unspecified,
-    fontStyle: FontStyle? = null,
-    fontWeight: FontWeight? = null,
-    letterSpacing: TextUnit = TextUnit.Unspecified,
-    textDecoration: TextDecoration? = null,
-    textAlign: TextAlign? = null,
-    lineHeight: TextUnit = TextUnit.Unspecified,
-    overflow: TextOverflow = TextOverflow.Clip,
-    softWrap: Boolean = true,
-    maxLines: Int = Int.MAX_VALUE,
-    inlineContent: Map<String, InlineTextContent> = mapOf(),
-    onTextLayout: (TextLayoutResult) -> Unit = {},
-    style: TextStyle = LocalTextStyle.current
-) {
-    Text(
-        text,
-        modifier,
-        color,
-        fontSize,
-        fontStyle,
-        fontWeight,
-        jost,
-        letterSpacing,
-        textDecoration,
-        textAlign,
-        lineHeight,
-        overflow,
-        softWrap,
-        maxLines,
-        inlineContent,
-        onTextLayout,
-        style
-    )
-}
-
-private val jost = FontFamily(Font(R.font.jost))
+private val jost = Font(R.font.jost).toFontFamily()

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

@@ -50,7 +50,7 @@ internal fun HomeScreen() {
 }
 
 @Composable
-private fun CopyrightText(modifier: Modifier) {
+private fun CopyrightText(modifier: Modifier = Modifier) {
     JostText(
         text = "© 2022 - ${Calendar.getInstance().get(Calendar.YEAR)} | W2SV",
         color = MaterialTheme.colorScheme.secondary,

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

@@ -4,6 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import androidx.activity.compose.BackHandler
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -23,18 +24,18 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.app.ShareCompat
 import com.w2sv.androidutils.extensions.goToWebpage
+import com.w2sv.androidutils.extensions.playStoreLink
 import com.w2sv.androidutils.extensions.showToast
 import com.w2sv.wifiwidget.BuildConfig
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.ui.JostText
 import com.w2sv.wifiwidget.ui.WifiWidgetTheme
-import com.w2sv.wifiwidget.utils.playStoreLink
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Preview
 @Composable
-private fun NavigationDrawerPreview() {
+private fun NavigationDrawerPrev() {
     WifiWidgetTheme {
         NavigationDrawer {
         }
@@ -49,6 +50,12 @@ fun NavigationDrawer(content: @Composable (DrawerState) -> Unit) {
     val drawerState = rememberDrawerState(DrawerValue.Closed)
     val properties = NavigationDrawerItemProperties.get(LocalContext.current)
 
+    BackHandler(drawerState.isOpen) {
+        scope.launch {
+            drawerState.close()
+        }
+    }
+
     ModalNavigationDrawer(
         drawerContent = {
             ModalDrawerSheet(drawerContainerColor = MaterialTheme.colorScheme.secondary) {

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

@@ -11,12 +11,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.w2sv.androidutils.extensions.getNestedStringArray
 import com.w2sv.androidutils.extensions.goToWebpage
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.ui.DialogButton
 import com.w2sv.wifiwidget.ui.JostText
 import com.w2sv.wifiwidget.ui.WifiWidgetTheme
-import com.w2sv.wifiwidget.utils.getNestedStringArray
 
 @Composable
 fun PropertyInfoDialog(

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

@@ -2,13 +2,5 @@ package com.w2sv.wifiwidget.utils
 
 import android.content.Intent
 
-fun Intent.getIntExtraOrNull(name: String, defaultValue: Int): Int? =
-    getIntExtra(name, defaultValue).run {
-        if (equals(defaultValue))
-            null
-        else
-            this
-    }
-
 fun Intent.setMakeUniqueActivityFlags(): Intent =
     setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)

app/src/main/kotlin/com/w2sv/wifiwidget/utils/Intent.kt

@@ -9,12 +9,12 @@ import android.view.View
 import android.widget.RemoteViews
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
+import com.w2sv.androidutils.extensions.crossVisualize
 import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.activities.HomeActivity
 import com.w2sv.wifiwidget.preferences.WidgetProperties
 import com.w2sv.wifiwidget.utils.setMakeUniqueActivityFlags
 import com.w2sv.wifiwidget.widget.utils.asFormattedIpAddress
-import com.w2sv.wifiwidget.widget.extensions.crossVisualize
 import com.w2sv.wifiwidget.widget.utils.isWifiConnected
 import com.w2sv.wifiwidget.widget.utils.netmask
 import dagger.hilt.EntryPoint
@@ -171,8 +171,11 @@ internal class ConnectionDependentWidgetLayoutSetter @Inject constructor() {
 
     private fun RemoteViews.setLayout(connectionAvailable: Boolean){
         when(connectionAvailable){
-            false -> crossVisualize(R.id.no_connection_available_layout, R.id.wifi_properties_layout)
-            true -> crossVisualize(R.id.wifi_properties_layout, R.id.no_connection_available_layout)
+            false -> crossVisualize(
+                R.id.wifi_properties_layout,
+                R.id.no_connection_available_layout
+            )
+            true -> crossVisualize(R.id.no_connection_available_layout, R.id.wifi_properties_layout)
         }
     }
 }