Add Makefile routines & polish

Author: w2sv

Makefile

@@ -9,6 +9,16 @@ clean:
 	@echo "Clean"
 	@./gradlew clean
 
+lint:
+	@./gradlew lint
+
+check:
+	@./gradlew check
+
+# ==============
+# Building
+# ==============
+
 build-aab:
 	@echo "Build AAB"
 	@./gradlew :app:bundleRelease --console verbose

app/src/main/kotlin/com/w2sv/wifiwidget/ui/components/Dialogs.kt

@@ -25,10 +25,10 @@ import com.w2sv.wifiwidget.R
 import com.w2sv.wifiwidget.ui.utils.conditional
 
 @Composable
-fun CustomDialog(
+fun AppDialog(
     onDismissRequest: () -> Unit,
+    header: DialogHeader,
     modifier: Modifier = Modifier,
-    headerProperties: DialogHeaderProperties? = null,
     scrollState: ScrollState? = null,
     content: @Composable ColumnScope.() -> Unit,
 ) {
@@ -44,23 +44,21 @@ fun CustomDialog(
                     .padding(vertical = 24.dp, horizontal = 28.dp)
                     .conditional(scrollState != null, { verticalScroll(scrollState!!) }),
             ) {
-                headerProperties?.let {
-                    DialogHeader(properties = it)
-                }
+                DialogHeader(properties = header)
                 content()
             }
         }
     }
 }
 
 @Immutable
-data class DialogHeaderProperties(
+data class DialogHeader(
     val title: String,
     val icon: (@Composable () -> Unit)? = null,
 )
 
 @Composable
-fun DialogHeader(properties: DialogHeaderProperties, modifier: Modifier = Modifier) {
+private fun DialogHeader(properties: DialogHeader, modifier: Modifier = Modifier) {
     Column(
         modifier = modifier,
         horizontalAlignment = Alignment.CenterHorizontally
@@ -78,7 +76,7 @@ fun DialogHeader(properties: DialogHeaderProperties, modifier: Modifier = Modifi
 }
 
 @Composable
-fun DialogButtonRow(
+fun DialogBottomButtonRow(
     onCancel: () -> Unit,
     onApply: () -> Unit,
     modifier: Modifier = Modifier,

app/src/main/kotlin/com/w2sv/wifiwidget/ui/components/drawer/NavigationDrawerSheet.kt

@@ -24,8 +24,8 @@ import com.w2sv.wifiwidget.BuildConfig
 import com.w2sv.wifiwidget.R
 
 @Composable
-internal fun NavigationDrawerSheet(content: @Composable () -> Unit) {
-    ModalDrawerSheet {
+fun NavigationDrawerSheet(modifier: Modifier = Modifier, content: @Composable () -> Unit) {
+    ModalDrawerSheet(modifier = modifier) {
         Column(
             modifier = Modifier
                 .padding(vertical = 32.dp, horizontal = 24.dp)

app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/components/widget/configurationdialog/WidgetConfigurationDialog.kt

@@ -14,9 +14,9 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.w2sv.common.R
-import com.w2sv.wifiwidget.ui.components.CustomDialog
-import com.w2sv.wifiwidget.ui.components.DialogButtonRow
-import com.w2sv.wifiwidget.ui.components.DialogHeaderProperties
+import com.w2sv.wifiwidget.ui.components.AppDialog
+import com.w2sv.wifiwidget.ui.components.DialogBottomButtonRow
+import com.w2sv.wifiwidget.ui.components.DialogHeader
 import com.w2sv.wifiwidget.ui.screens.home.components.locationaccesspermission.states.LocationAccessState
 import com.w2sv.wifiwidget.ui.screens.home.components.widget.configurationdialog.components.PropertyInfoDialog
 import com.w2sv.wifiwidget.ui.utils.conditional
@@ -40,8 +40,8 @@ fun WidgetConfigurationDialog(
         closeDialog()
     }
 
-    CustomDialog(
-        headerProperties = DialogHeaderProperties(
+    AppDialog(
+        header = DialogHeader(
             title = stringResource(id = R.string.configure_widget),
             icon = {
                 Icon(
@@ -71,7 +71,7 @@ fun WidgetConfigurationDialog(
                 data = it,
                 onDismissRequest = { widgetVM.setPropertyInfoDialogData(null) })
         }
-        DialogButtonRow(
+        DialogBottomButtonRow(
             onCancel = {
                 onDismissRequest()
             },

app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/components/widget/configurationdialog/components/colors/ColorPickerDialog.kt

@@ -16,9 +16,9 @@ import androidx.compose.ui.unit.dp
 import com.smarttoolfactory.colorpicker.model.ColorModel
 import com.smarttoolfactory.colorpicker.picker.HSVColorPickerCircularWithSliders
 import com.smarttoolfactory.colorpicker.widget.ColorComponentsDisplay
-import com.w2sv.wifiwidget.ui.components.CustomDialog
-import com.w2sv.wifiwidget.ui.components.DialogButtonRow
-import com.w2sv.wifiwidget.ui.components.DialogHeaderProperties
+import com.w2sv.wifiwidget.ui.components.AppDialog
+import com.w2sv.wifiwidget.ui.components.DialogBottomButtonRow
+import com.w2sv.wifiwidget.ui.components.DialogHeader
 import com.w2sv.wifiwidget.ui.theme.AppTheme
 
 @Composable
@@ -35,8 +35,8 @@ fun ColorPickerDialog(
         )
     }
 
-    CustomDialog(
-        headerProperties = DialogHeaderProperties(title = label),
+    AppDialog(
+        header = DialogHeader(title = label),
         onDismissRequest = onDismissRequest,
         modifier = modifier,
         scrollState = rememberScrollState(),
@@ -51,7 +51,7 @@ fun ColorPickerDialog(
             textColor = MaterialTheme.colorScheme.onSurface,
             modifier = Modifier.width(220.dp),
         )
-        DialogButtonRow(
+        DialogBottomButtonRow(
             onCancel = onDismissRequest,
             onApply = {
                 applyColor(color)