Merge branch 'main' into droidcon/bkadel-2nd

gdg-berlin-android · Jul 3, 2024 · be8f073 · be8f073
2 parents ee73197 + 40e0b22
commit be8f073
Show file tree

Hide file tree

Showing 8 changed files with 92 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"
 
@@ -51,6 +51,7 @@ android {
                 "ur",
                 "bs",
                 "pt-rBR",
+                "pl",
             ),
         )
 

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/android/src/main/res/values-pl/strings.xml b/zeapp/android/src/main/res/values-pl/strings.xml
@@ -0,0 +1,57 @@
+<resources>
+    <string name="black_and_white">Czarno-białe</string>
+    <string name="reset">Anuluj</string>
+    <string name="floyd_steninberg_initials">FS</string>
+    <string name="positional">Pozycyjny</string>
+    <string name="rotate">Obrócić</string>
+    <string name="invert">Inwersja</string>
+    <string name="static_tool">Statyczny</string>
+
+    <string name="generate">Generować</string>
+    <string name="not_binary_image">Nie jest to obraz binarny. Upewnij się, że każdy piksel jest czarny lub biały.</string>
+    <string name="generate_image_page">Generuj stronę z obrazem</string>
+    <string name="draw_image_page">Narysuj stronę z obrazem</string>
+    <string name="enter_prompt">Wprowadź swóją podpowiedź</string>
+    <string name="could_not_generate_image">Nie można wygenerować obrazu</string>
+
+    <string name="image_needed">Wymagany jest obraz binarny. Kliknij dowolny przycisk pod obrazem.</string>
+    <string name="add_qr_url">Dodaj swój link QR</string>
+    <string name="qr_code_title">Tytuł kodu QR</string>
+    <string name="qr_code_text">Dodatkowy tekst</string>
+    <string name="url">URL</string>
+    <string name="add_barcode_url">Dodaj swój URL kodu kreskowego</string>
+    <string name="bar_code_title">Tytuł kodu kreskowego</string>
+    <string name="qr_vcard">vCard</string>
+    <string name="qr_code_email">Email</string>
+    <string name="qr_code_phone">Telefon</string>
+
+    <string name="your_name_here">Twoje imię tutaj</string>
+    <string name="contact_me_here">Skontaktuj się ze mną tutaj</string>
+    <string name="binary_image_needed">Wymagany obraz binarny. Naciśnij jeden z przycisków poniżej obrazu.</string>
+    <string name="add_your_phrase_here">Dodaj swoją frazę tutaj</string>
+    <string name="random_phrase">Losowa fraza</string>
+    <string name="unicorn_at_an_android_conference_in_isometric_view">Jednorożec na konferencji android w widoku izometrycznym.</string>
+    <string name="name">Imię</string>
+    <string name="contact">Kontakt</string>
+    <string name="clear">Wyczyść</string>
+    <string name="add_your_contact_details">Dodaj swoje dane kontaktowe</string>
+    <string name="set_picture">Ustaw zdjęcie</string>
+    <string name="click_get_to_show_quote_of_the_day">Kliknij "Pobierz", aby wyświetlić cytat dnia</string>
+    <string name="get">Pobierz</string>
+    <string name="decline">Odrzuć</string>
+    <string name="send">Wyślij</string>
+    <string name="n_a">N/D</string>
+    <string name="load_weather">Załaduj pogodę</string>
+    <string name="hello_my_github_profile_is">Witaj, mój profil github to</string>
+    <string name="your_phrase_here">Twoja fraza tutaj</string>
+    <string name="hello_my_name_is">Witaj, nazywam się</string>
+    <string name="upcoming_weather">☀️Nadchodząca pogoda</string>
+    <string name="quote_of_the_day">Cytat dnia</string>
+    <string name="send_icon_text">Wyślij</string>
+    <string name="badge_config_editor_title">Edytuj konfigurację plakietki</string>
+
+    <string name="ze_navdrawer_save_all_pages">Zapisz wszystkie strony na plakietce</string>
+    <string name="ze_navdrawer_update_config">Zaktualizuj konfigurację na plakietce</string>
+    <string name="ze_navdrawer_send_random_page">Wyślij losową stronę na plakietkę</string>
+    <string name="ze_navdrawer_open_release_page">Otwórz stronę publikacji</string>
+</resources>
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"