Fix add and add camera

gdg-berlin-android · Jul 3, 2024 · 40e0b22 · 40e0b22
1 parent 2632429
commit 40e0b22
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 12 deletions.
diff --git a/zeapp/android/build.gradle.kts b/zeapp/android/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         applicationId = "de.berlindroid.zeapp"
         compileSdk = 34
         targetSdk = 34
-        minSdk = 33
+        minSdk = 29
         versionCode = appVersionCode
         versionName = "1.0"
 

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/ZeMainActivity.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/ZeMainActivity.kt
@@ -246,7 +246,7 @@ private fun ZeScreen(vm: ZeBadgeViewModel, modifier: Modifier = Modifier) {
                                 drawerState.close()
                             }
                         },
-                        onTitleClick = goToGithubPage
+                        onTitleClick = goToGithubPage,
                     )
                 },
             ) {
@@ -269,7 +269,7 @@ private fun ZeScreen(vm: ZeBadgeViewModel, modifier: Modifier = Modifier) {
                             onTitleClick = {
                                 scope.launch { drawerState.close() }
                                 goToGithubPage()
-                            }
+                            },
                         )
                     },
                     content = { paddingValues ->
@@ -299,7 +299,7 @@ private fun ZeDrawerContent(
     onGotoReleaseClick: () -> Unit = {},
     onUpdateConfig: () -> Unit = {},
     onCloseDrawer: () -> Unit = {},
-    onTitleClick: () -> Unit = {}
+    onTitleClick: () -> Unit = {},
 ) {
 
     @Composable
@@ -360,7 +360,7 @@ private fun ZeDrawerContent(
     ) {
         ZeTitle(
             modifier = Modifier.padding(horizontal = 16.dp, vertical = 64.dp),
-        ){
+        ) {
             onTitleClick()
         }
 
@@ -489,7 +489,7 @@ private fun ZeTopBar(
             }
         },
         title = {
-            ZeTitle{
+            ZeTitle {
                 onTitleClick()
             }
         },
@@ -514,7 +514,7 @@ private fun ZeTopBar(
 @Composable
 private fun ZeTitle(
     modifier: Modifier = Modifier,
-    titleClick: () -> Unit
+    titleClick: () -> Unit,
 ) {
     ZeText(
         modifier = modifier.clickable {
@@ -774,6 +774,8 @@ private fun SelectedEditor(
             ZeSlot.Weather,
             ZeSlot.Quote,
             ZeSlot.BarCode,
+            ZeSlot.Add,
+            ZeSlot.Camera,
         )
     ) {
         Timber.e("Slot", "This slot '${editor.slot}' is not supposed to be editable.")

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zemodels/ZeSlot.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zemodels/ZeSlot.kt
@@ -13,5 +13,6 @@ sealed class ZeSlot(val name: String) {
     data object Weather : ZeSlot("Wa")
     data object Quote : ZeSlot("Quite")
     data object BarCode : ZeSlot("Ba")
-    data object Add: ZeSlot("Add")
+    data object Add : ZeSlot("Add")
+    data object Camera : ZeSlot("Camera")
 }
diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZePreferencesService.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZePreferencesService.kt
@@ -173,9 +173,11 @@ class ZePreferencesService @Inject constructor(
                 ZeBadgeType.RANDOM_QUOTE -> ZeConfiguration.Quote(
                     message = slot.preferencesValue("quote_message"),
                     author = slot.preferencesValue("quote_author"),
-                    bitmap = bitmap
+                    bitmap = bitmap,
                 )
 
+                ZeBadgeType.CAMERA -> ZeConfiguration.Camera(bitmap)
+
                 else -> {
                     Timber.e(
                         "Slot from Prefs",

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zevm/ZeBadgeViewModel.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zevm/ZeBadgeViewModel.kt
@@ -12,6 +12,7 @@ import de.berlindroid.zeapp.zemodels.ZeEditor
 import de.berlindroid.zeapp.zemodels.ZeSlot
 import de.berlindroid.zeapp.zemodels.ZeTemplateChooser
 import de.berlindroid.zeapp.zeservices.*
+import de.berlindroid.zeapp.zeui.ZeCameraEditor
 import de.berlindroid.zeapp.zeui.pixelManipulation
 import de.berlindroid.zekompanion.ditherFloydSteinberg
 import kotlinx.coroutines.*
@@ -107,7 +108,7 @@ class ZeBadgeViewModel @Inject constructor(
         if (bitmap.isBinary()) {
             viewModelScope.launch {
                 badgeManager.storePage(configuration.type.name, bitmap).fold(
-                    onSuccess = {storeResult ->
+                    onSuccess = { storeResult ->
                         delay(300) // serial stuff
                         badgeManager.showPage(configuration.type.name).fold(
                             onSuccess = { showResult ->
@@ -201,6 +202,16 @@ class ZeBadgeViewModel @Inject constructor(
                     slots[ZeSlot.BarCode]!!,
                 )
 
+                is ZeSlot.Add -> ZeEditor(
+                    slot,
+                    slots[ZeSlot.Add]!!,
+                )
+
+                is ZeSlot.Camera -> ZeEditor(
+                    slot,
+                    slots[ZeSlot.Camera]!!,
+                )
+
                 else -> {
                     Timber.d("Customize Page", "Cannot configure slot '${slot.name}'.")
                     null
@@ -346,11 +357,16 @@ class ZeBadgeViewModel @Inject constructor(
                 "",
                 R.drawable.soon.toBitmap(),
             )
+
             ZeSlot.Add -> ZeConfiguration.Name(
                 null,
                 null,
                 imageProviderService.provideImageBitmap(R.drawable.add),
             )
+
+            ZeSlot.Camera -> ZeConfiguration.Camera(
+                imageProviderService.provideImageBitmap(R.drawable.soon),
+            )
         }
     }
 
@@ -469,6 +485,7 @@ class ZeBadgeViewModel @Inject constructor(
             val slots = mapOf(
                 ZeSlot.Name to initialConfiguration(ZeSlot.Name),
                 ZeSlot.FirstSponsor to initialConfiguration(ZeSlot.FirstSponsor),
+                ZeSlot.Camera to initialConfiguration(ZeSlot.Camera),
                 ZeSlot.Add to initialConfiguration(ZeSlot.Add),
             )
             _uiState.update {

diff --git a/zeapp/badge/build.gradle.kts b/zeapp/badge/build.gradle.kts
@@ -117,6 +117,6 @@ android {
     namespace = "de.berlindroid.zebadge"
     compileSdk = 34
     defaultConfig {
-        minSdk = 33
+        minSdk = 29
     }
 }
diff --git a/zeapp/benchmark/build.gradle.kts b/zeapp/benchmark/build.gradle.kts
@@ -18,7 +18,7 @@ android {
     }
 
     defaultConfig {
-        minSdk = 33
+        minSdk = 29
         targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"