Replace badge pixel size with constants

gdg-berlin-android · Mar 29, 2024 · 49324a7 · 49324a7
1 parent 71a123b
commit 49324a7
Show file tree

Hide file tree

Showing 19 changed files with 97 additions and 92 deletions.
diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/ZeConfig.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/ZeConfig.kt
@@ -1,6 +1,3 @@
 package de.berlindroid.zeapp
 
-const val PAGE_WIDTH = 296
-const val PAGE_HEIGHT = 128
-
 const val OPENAI_API_KEY: String = BuildConfig.OPEN_API_TOKEN
diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zebits/ZeBitmapManipulation.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zebits/ZeBitmapManipulation.kt
@@ -11,8 +11,8 @@ import android.widget.LinearLayout
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.graphics.scale
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.zeui.zepages.BarCodePage
 import de.berlindroid.zeapp.zeui.zepages.QRCodePage
 import de.berlindroid.zekompanion.forEach
@@ -36,8 +36,8 @@ fun composableToBitmap(
     // create a custom view like in the good old days
     class ParentView(context: Context) : LinearLayout(context) {
         init {
-            val width = PAGE_WIDTH
-            val height = PAGE_HEIGHT
+            val width = BADGE_WIDTH
+            val height = BADGE_HEIGHT
 
             val view = ComposeView(context)
             view.visibility = View.GONE
@@ -106,8 +106,8 @@ fun qrComposableToBitmap(
     // create a custom view like in the good old days
     class ParentView(context: Context) : LinearLayout(context) {
         init {
-            val width = PAGE_WIDTH
-            val height = PAGE_HEIGHT
+            val width = BADGE_WIDTH
+            val height = BADGE_HEIGHT
 
             val view = ComposeView(context)
             view.visibility = View.GONE
@@ -175,8 +175,8 @@ fun barCodeComposableToBitmap(
     // create a custom view like in the good old days
     class ParentView(context: Context) : LinearLayout(context) {
         init {
-            val width = PAGE_WIDTH
-            val height = PAGE_HEIGHT
+            val width = BADGE_WIDTH
+            val height = BADGE_HEIGHT
 
             val view = ComposeView(context)
             view.visibility = View.GONE
@@ -300,18 +300,18 @@ fun Bitmap.isBinary(): Boolean {
 /**
  * Take this bitmap and crop out a page from it's center.
  *
- * The width will be scaled to PAGE_WIDTH, but the height will be cropped.
+ * The width will be scaled to BADGE_WIDTH, but the height will be cropped.
  */
 fun Bitmap.cropPageFromCenter(): Bitmap {
     val aspectRatio = this.width.toFloat().div(this.height.toFloat())
-    val targetHeight = PAGE_WIDTH.div(aspectRatio).toInt()
+    val targetHeight = BADGE_WIDTH.div(aspectRatio).toInt()
 
-    return scale(PAGE_WIDTH, targetHeight)
+    return scale(BADGE_WIDTH, targetHeight)
         .crop(
             fromX = 0,
-            fromY = PAGE_HEIGHT / 2 - targetHeight / 2,
-            targetWidth = PAGE_WIDTH,
-            targetHeight = PAGE_HEIGHT,
+            fromY = BADGE_HEIGHT / 2 - targetHeight / 2,
+            targetWidth = BADGE_WIDTH,
+            targetHeight = BADGE_HEIGHT,
         )
 }
 

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZeImageProviderService.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeservices/ZeImageProviderService.kt
@@ -5,8 +5,8 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import androidx.annotation.DrawableRes
 import dagger.hilt.android.qualifiers.ApplicationContext
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.R
 import de.berlindroid.zeapp.zebits.scaleIfNeeded
 import javax.inject.Inject
@@ -19,14 +19,14 @@ class ZeImageProviderService @Inject constructor(
         return BitmapFactory.decodeResource(
             context.resources,
             R.drawable.sample_badge,
-        ).scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT)
+        ).scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT)
     }
 
     fun provideImageBitmap(@DrawableRes imageResource: Int): Bitmap {
         return BitmapFactory.decodeResource(
             context.resources,
             imageResource,
             BitmapFactory.Options().apply { inScaled = false },
-        ).scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT)
+        ).scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT)
     }
 }
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
@@ -8,8 +8,8 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import dagger.hilt.android.qualifiers.ApplicationContext
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.zebits.toBitmap
 import de.berlindroid.zeapp.zemodels.ZeBadgeType
 import de.berlindroid.zeapp.zemodels.ZeConfiguration
@@ -122,7 +122,7 @@ class ZePreferencesService @Inject constructor(
             val type = ZeBadgeType.getOrNull(preferences[slot.preferencesKey(TYPE_KEY)].orEmpty())
             val bitmap = preferences[slot.preferencesKey(IMAGE_KEY)]
                 ?.debase64()
-                ?.toBitmap(PAGE_WIDTH, PAGE_HEIGHT)
+                ?.toBitmap(BADGE_WIDTH, BADGE_HEIGHT)
                 ?: return@mapNotNull null
 
             when (type) {

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeBadgeSimulator.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeBadgeSimulator.kt
@@ -21,8 +21,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.R
 import de.berlindroid.zeapp.zebits.scaleIfNeeded
 import de.berlindroid.zeapp.zemodels.ZeSlot
@@ -55,7 +55,7 @@ fun BadgeSimulator(
                     .width(550.dp)
                     .fillMaxHeight(),
                 bitmap = page
-                    .scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT)
+                    .scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT)
                     .asImageBitmap(),
                 contentDescription = null,
                 filterQuality = FilterQuality.None,

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeBinaryImageEditor.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeBinaryImageEditor.kt
@@ -27,8 +27,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.R
 import de.berlindroid.zeapp.ZeDimen
 import de.berlindroid.zeapp.zebits.copy
@@ -61,7 +61,7 @@ fun BinaryImageEditor(
             modifier = Modifier
                 .fillMaxWidth()
                 .wrapContentHeight(unbounded = false)
-                .height(PAGE_HEIGHT.dp)
+                .height(BADGE_HEIGHT.dp)
                 .padding(horizontal = ZeDimen.One, vertical = ZeDimen.Half),
             painter = BitmapPainter(
                 image = bitmap.asImageBitmap(),
@@ -179,7 +179,7 @@ class BinaryBitmapPageProvider : PreviewParameterProvider<Bitmap> {
     override val values: Sequence<Bitmap>
         get() {
             return sequenceOf(
-                with(Bitmap.createBitmap(PAGE_WIDTH, PAGE_HEIGHT, Bitmap.Config.ARGB_8888)) {
+                with(Bitmap.createBitmap(BADGE_WIDTH, BADGE_HEIGHT, Bitmap.Config.ARGB_8888)) {
                     this
                 },
             )

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeCameraEditor.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeCameraEditor.kt
@@ -18,8 +18,8 @@ import coil.size.Precision
 import coil.size.Scale
 import com.commit451.coiltransformations.CropTransformation
 import de.berlindroid.zeapp.BuildConfig
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.zemodels.ZeConfiguration
 import de.berlindroid.zeapp.zemodels.ZeEditor
 import de.berlindroid.zeapp.zevm.ZeBadgeViewModel
@@ -46,7 +46,7 @@ fun ZeCameraEditor(
                 val imageRequest = ImageRequest.Builder(context)
                     .data(uri)
                     .transformations(CropTransformation())
-                    .size(PAGE_WIDTH, PAGE_HEIGHT)
+                    .size(BADGE_WIDTH, BADGE_HEIGHT)
                     .scale(Scale.FIT)
                     .precision(Precision.EXACT)
                     .allowHardware(false)
@@ -58,15 +58,15 @@ fun ZeCameraEditor(
                     val drawable =
                         context.imageLoader.execute(imageRequest).drawable as BitmapDrawable
                     val bitmap = Bitmap.createBitmap(
-                        PAGE_WIDTH,
-                        PAGE_HEIGHT,
+                        BADGE_WIDTH,
+                        BADGE_HEIGHT,
                         Bitmap.Config.ARGB_8888,
                     )
                     val canvas = Canvas(bitmap)
                     canvas.drawColor(Color.WHITE)
                     canvas.drawBitmap(
                         drawable.bitmap,
-                        (PAGE_WIDTH / 2f) - (drawable.bitmap.width / 2f),
+                        (BADGE_WIDTH / 2f) - (drawable.bitmap.width / 2f),
                         0f,
                         null,
                     )

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeImageDrawEditorDialog.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeImageDrawEditorDialog.kt
@@ -34,8 +34,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.view.drawToBitmap
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.R
 import de.berlindroid.zeapp.zebits.isBinary
 import de.berlindroid.zeapp.zebits.scaleIfNeeded
@@ -75,7 +75,7 @@ fun ZeImageDrawEditorDialog(
                 Canvas(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .aspectRatio(PAGE_WIDTH / PAGE_HEIGHT.toFloat())
+                        .aspectRatio(BADGE_WIDTH / BADGE_HEIGHT.toFloat())
                         .clipToBounds()
                         .background(Color.White)
                         .pointerInput(Unit) {
@@ -114,7 +114,7 @@ fun ZeImageDrawEditorDialog(
                         val bitmap =
                             drawContainer
                                 .drawToBitmap()
-                                .scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT)
+                                .scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT)
                                 .pixelManipulation { _, _ ->
                                     threshold()
                                 }
@@ -137,7 +137,7 @@ fun ZeImageDrawEditorDialog(
             AndroidView(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .aspectRatio(PAGE_WIDTH / PAGE_HEIGHT.toFloat())
+                    .aspectRatio(BADGE_WIDTH / BADGE_HEIGHT.toFloat())
                     .clipToBounds()
                     .background(Color.Green),
                 factory = {

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeImageGenerationEditorDialog.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZeImageGenerationEditorDialog.kt
@@ -23,8 +23,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.google.gson.annotations.SerializedName
 import de.berlindroid.zeapp.OPENAI_API_KEY
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.R
 import de.berlindroid.zeapp.zebits.copy
 import de.berlindroid.zeapp.zebits.cropPageFromCenter
@@ -70,7 +70,7 @@ fun ImageGenerationEditorDialog(
             BitmapFactory.decodeResource(
                 context.resources,
                 R.drawable.error,
-            ).scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT),
+            ).scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT),
         )
     }
 
@@ -138,7 +138,7 @@ fun ImageGenerationEditorDialog(
                                     bitmap = BitmapFactory.decodeResource(
                                         context.resources,
                                         R.drawable.error,
-                                    ).scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT)
+                                    ).scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT)
                                     lastLoadedBitmap = null
                                 }
                                 progress = null
@@ -185,7 +185,7 @@ private suspend fun requestImageGeneration(
                     BitmapFactory.decodeResource(
                         context.resources,
                         R.drawable.error,
-                    ).scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT)
+                    ).scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT)
                 }
             }
 

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZePictureEditorDialog.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/ZePictureEditorDialog.kt
@@ -18,8 +18,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.R
 import de.berlindroid.zeapp.zebits.cropPageFromCenter
 import de.berlindroid.zeapp.zebits.isBinary
@@ -48,7 +48,7 @@ fun PictureEditorDialog(
             BitmapFactory.decodeResource(
                 context.resources,
                 R.drawable.error,
-            ).scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT),
+            ).scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT),
         )
     }
 
@@ -62,7 +62,7 @@ fun PictureEditorDialog(
             BitmapFactory.decodeResource(
                 context.resources,
                 R.drawable.error,
-            ).scaleIfNeeded(PAGE_WIDTH, PAGE_HEIGHT)
+            ).scaleIfNeeded(BADGE_WIDTH, BADGE_HEIGHT)
         } else {
             // yes, so read image
             BitmapFactory.decodeStream(

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zepages/ZeBarCodePage.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zepages/ZeBarCodePage.kt
@@ -19,8 +19,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.R
 import de.berlindroid.zeapp.zeui.rememberBarcodeBitmapPainter
 
@@ -39,8 +39,8 @@ fun BarCodePage(
                 color = Color.White,
             )
             .size(
-                width = with(LocalDensity.current) { PAGE_WIDTH.toDp() },
-                height = with(LocalDensity.current) { PAGE_HEIGHT.toDp() },
+                width = with(LocalDensity.current) { BADGE_WIDTH.toDp() },
+                height = with(LocalDensity.current) { BADGE_HEIGHT.toDp() },
             ),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zepages/ZeNamePage.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zepages/ZeNamePage.kt
@@ -20,8 +20,8 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.sp
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.R
 
 /**
@@ -42,8 +42,8 @@ fun NamePage(
                 color = Color.White,
             )
             .size(
-                width = with(LocalDensity.current) { PAGE_WIDTH.toDp() },
-                height = with(LocalDensity.current) { PAGE_HEIGHT.toDp() },
+                width = with(LocalDensity.current) { BADGE_WIDTH.toDp() },
+                height = with(LocalDensity.current) { BADGE_HEIGHT.toDp() },
             ),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {

diff --git a/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zepages/ZeQRCodePage.kt b/zeapp/android/src/main/java/de/berlindroid/zeapp/zeui/zepages/ZeQRCodePage.kt
@@ -21,8 +21,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.sp
-import de.berlindroid.zeapp.PAGE_HEIGHT
-import de.berlindroid.zeapp.PAGE_WIDTH
+import de.berlindroid.zekompanion.BADGE_HEIGHT
+import de.berlindroid.zekompanion.BADGE_WIDTH
 import de.berlindroid.zeapp.zeui.rememberQrBitmapPainter
 
 /**
@@ -35,8 +35,8 @@ fun QRCodePage(
     text: String = "gdg-berlin-android",
     qrContent: String = "https://github.com/gdg-berlin-android",
 ) {
-    val pageWidth = with(LocalDensity.current) { PAGE_WIDTH.toDp() }
-    val pageHeight = with(LocalDensity.current) { PAGE_HEIGHT.toDp() }
+    val pageWidth = with(LocalDensity.current) { BADGE_WIDTH.toDp() }
+    val pageHeight = with(LocalDensity.current) { BADGE_HEIGHT.toDp() }
     Row(
         modifier = Modifier
             .background(