Merge branch 'development'

Author: weberbox

app/build.gradle.kts

@@ -9,16 +9,16 @@ plugins {
     alias(libs.plugins.sentry.android.gradle)
     alias(libs.plugins.android.dagger.hilt)
     alias(libs.plugins.kotlin.parcelize)
-    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.jetbrains.kotlin.serialization)
-    alias(libs.plugins.jetbrains.kotlin.kapt)
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.kotlin.kapt)
 }
 
 private val keystoreProperties = getKeystoreProperties()
 
 val vMajor = 3
-val vMinor = 0
+val vMinor = 1
 val vPatch = 0
 val isAlpha = true
 
@@ -35,7 +35,7 @@ android {
         versionName = "${vMajor}.${vMinor}.${vPatch}"
     }
 
-    if(keystoreProperties.isNotEmpty()) {
+    if (keystoreProperties.isNotEmpty()) {
         signingConfigs {
             create("release") {
                 keyAlias = keystoreProperties["keyAlias"] as String
@@ -48,7 +48,6 @@ android {
 
     buildTypes {
         release {
-            manifestPlaceholders += mapOf()
             manifestPlaceholders.putAll(mapOf("appName" to "PiFire", "environment" to "production"))
             isMinifyEnabled = true
             isShrinkResources = true
@@ -145,6 +144,7 @@ dependencies {
     implementation(libs.androidx.datastore)
     implementation(libs.androidx.splashscreen)
     implementation(libs.androidx.crypto)
+    implementation(libs.androidx.biometric)
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)

app/src/main/java/com/weberbox/pifire/MainActivity.kt

@@ -3,10 +3,10 @@ package com.weberbox.pifire
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
@@ -44,7 +44,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class MainActivity : ComponentActivity() {
+class MainActivity : AppCompatActivity() {
     @Inject
     lateinit var appUpdateManager: UpdateManager
 

app/src/main/java/com/weberbox/pifire/changelog/data/model/ChangelogDto.kt

@@ -4,20 +4,21 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ChangelogDto(
-    var changelog: List<Changelog> = listOf()
+    val changelog: List<Changelog> = listOf()
 ) {
 
     @Serializable
     data class Changelog(
-        var version: String? = null,
-        var date: String? = null,
-        var current: Boolean? = null,
-        var logs: List<Logs> = listOf()
+        val version: String? = null,
+        val date: String? = null,
+        val current: Boolean? = null,
+        val isAlpha: Boolean? = null,
+        val logs: List<Logs> = listOf()
     )
 
     @Serializable
     data class Logs(
-        var type: String? = null,
-        var text: String? = null
+        val type: String? = null,
+        val text: String? = null
     )
 }

app/src/main/java/com/weberbox/pifire/changelog/domain/ChangelogDtoToDataMapper.kt

@@ -13,6 +13,7 @@ object ChangelogDtoToDataMapper : Mapper<ChangelogDto, ChangelogData> {
                 version = data.version.orEmpty(),
                 date = data.date.orEmpty(),
                 current = data.current == true,
+                isAlpha = data.isAlpha == true,
                 logs = data.logs.map { log ->
                     Log(
                         type = log.type ?: "new",

app/src/main/java/com/weberbox/pifire/changelog/presentation/component/LogHeader.kt

@@ -23,6 +23,7 @@ internal fun LogHeader(
     current: Boolean,
     version: String,
     date: String,
+    isAlpha: Boolean,
     modifier: Modifier = Modifier
 ) {
     Box(
@@ -51,6 +52,15 @@ internal fun LogHeader(
                         style = MaterialTheme.typography.titleSmall
                     )
                 }
+                if (isAlpha) {
+                    Text(
+                        text = " - Alpha Release",
+                        modifier = modifier.padding(end = 5.dp),
+                        style = MaterialTheme.typography.titleSmall,
+                        color = if (current) MaterialTheme.colorScheme.tertiaryContainer else
+                            MaterialTheme.colorScheme.onSurface,
+                    )
+                }
             }
             HorizontalDivider(
                 color = MaterialTheme.colorScheme.inverseOnSurface,
@@ -70,7 +80,8 @@ private fun LogHeaderPreview() {
             LogHeader(
                 current = true,
                 version = "3.0.0",
-                date = "4-24-2025"
+                date = "",
+                isAlpha = true
             )
         }
     }

app/src/main/java/com/weberbox/pifire/changelog/presentation/model/ChangelogData.kt

@@ -10,6 +10,7 @@ data class ChangelogData(
         val version: String = "",
         val date: String = "",
         val current: Boolean = false,
+        val isAlpha: Boolean = false,
         val logs: List<Log> = listOf()
     )
 

app/src/main/java/com/weberbox/pifire/changelog/presentation/screens/ChangelogScreen.kt

@@ -32,6 +32,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
+import com.weberbox.pifire.BuildConfig
 import com.weberbox.pifire.R
 import com.weberbox.pifire.changelog.presentation.component.LogAnimation
 import com.weberbox.pifire.changelog.presentation.component.LogHeader
@@ -117,15 +118,23 @@ private fun ChangelogScreen(
                 .hazeSource(state = hazeState)
                 .fillMaxSize(),
         ) {
-            items(items = state.changelogData.changelog) { item ->
+            val visibleItems = state.changelogData.changelog.filter { item ->
+                !item.isAlpha || BuildConfig.ALPHA_BUILD
+            }
+            items(items = visibleItems) { item ->
                 Column {
-                    LogHeader(item.current, item.version, item.date)
+                    LogHeader(
+                        current = item.current,
+                        version = item.version,
+                        date = item.date,
+                        isAlpha = item.isAlpha,
+                    )
                     item.logs.forEach { log ->
                         LogItem(log)
                     }
                 }
             }
-            if (state.changelogData.changelog.isEmpty()) {
+            if (visibleItems.isEmpty()) {
                 item {
                     Column(
                         modifier = Modifier
@@ -182,6 +191,7 @@ private fun buildChangelogItems(): List<Changelog> {
             version = "3.0.0",
             date = "",
             current = true,
+            isAlpha = true,
             logs = listOf(
                 Log(
                     type = "new",

app/src/main/java/com/weberbox/pifire/common/presentation/sheets/ConfirmSheet.kt

@@ -21,7 +21,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import com.weberbox.pifire.R
-import com.weberbox.pifire.common.presentation.theme.SettingsTheme
+import com.weberbox.pifire.common.presentation.theme.PiFireTheme
 import com.weberbox.pifire.common.presentation.theme.spacing
 
 @Composable
@@ -107,7 +107,7 @@ fun ConfirmSheet(
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, showBackground = true)
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO, showBackground = true)
 private fun ButtonSheetPreview() {
-    SettingsTheme {
+    PiFireTheme {
         Surface {
             ConfirmSheet(
                 title = stringResource(R.string.dialog_confirm_action),

app/src/main/java/com/weberbox/pifire/common/presentation/theme/Theme.kt

@@ -82,51 +82,6 @@ fun PiFireTheme(
     }
 }
 
-@Composable
-fun SettingsTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
-    dynamicColor: Boolean = false,
-    content: @Composable () -> Unit,
-) {
-    val context = LocalContext.current
-    val colorScheme =
-        when {
-            dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-                if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-            }
-
-            darkTheme -> mediumContrastDarkColorScheme
-            else -> mediumContrastLightColorScheme
-        }
-
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (context as Activity).window
-            WindowCompat.setDecorFitsSystemWindows(window, false)
-            val windowBackgroundColor = colorScheme.background.toArgb()
-            window.setBackgroundDrawable(windowBackgroundColor.toDrawable())
-            val insetsController = WindowCompat.getInsetsController(window, view)
-            insetsController.isAppearanceLightStatusBars = !darkTheme
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                @Suppress("DEPRECATION")
-                window.statusBarColor = Color.Transparent.toArgb()
-                @Suppress("DEPRECATION")
-                window.navigationBarColor = Color.Transparent.toArgb()
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                insetsController.isAppearanceLightNavigationBars = !darkTheme
-            }
-        }
-    }
-
-    MaterialTheme(
-        colorScheme = colorScheme,
-        typography = AppTypography,
-        content = content
-    )
-}
-
 @Suppress("unused")
 private val lightScheme = lightColorScheme(
     primary = primaryLight,

app/src/main/java/com/weberbox/pifire/common/presentation/util/CollectionsUtils.kt

@@ -0,0 +1,13 @@
+package com.weberbox.pifire.common.presentation.util
+
+import java.util.Collections
+
+fun <T> List<T>.toImmutableList(): List<T> = when (size) {
+    0 -> emptyList()
+    1 -> listOf(first())
+    else -> Collections.unmodifiableList(toList())
+}
+
+fun <K, V> Map<K, V>.toImmutableMap(): Map<K, V> {
+    return Collections.unmodifiableMap(this.toMap())
+}