Merge branch 'main' into chore/blueworld

Author: Urizel

README.md

@@ -49,7 +49,7 @@ fun HelloWorld(
 ```
 
 ## First steps for attendees
-
+0. Follow local setup to set Python local variable: [Local setup and building](Local setup and building)
 1. Get the code
    - Open in Android Studio (Narwhal+). Let Gradle sync.  
    - Or build from CLI: ./gradlew assembleDebug
@@ -111,7 +111,7 @@ If you see missing Python errors, set an environment variable ZEPATCH_PYTHON_PAT
 Example (macOS/Linux):
 
 ```bash
-export ZEPATCH_PYTHON_PATH=/usr/local/bin/python3
+export ZEPATCH_PYTHON_PATH=/usr/bin/python3
 ```
 
 

app/CODEOWNERS

@@ -0,0 +1 @@
+* @gdg-berlin-android/ZeTeam

app/build.gradle.kts

@@ -12,7 +12,7 @@ android {
 
     defaultConfig {
         applicationId = "de.berlindroid.zepatch"
-        minSdk = 24
+        minSdk = 25
         targetSdk = 36
         versionCode = 1
         versionName = "1.0"
@@ -59,6 +59,7 @@ dependencies {
     implementation(libs.androidx.adaptive.navigation)
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.composableSheep)
 
     // Patch annotations + processor
     implementation(project(":patch-annotations"))

app/src/main/java/de/berlindroid/zepatch/patchable/Demo.kt

@@ -32,6 +32,9 @@ import androidx.compose.ui.unit.sp
 import de.berlindroid.zepatch.R
 import de.berlindroid.zepatch.annotations.Patch
 import de.berlindroid.zepatch.ui.SafeArea
+import dev.nstv.composablesheep.library.ComposableSheep
+import dev.nstv.composablesheep.library.model.Sheep
+import dev.nstv.composablesheep.library.util.SheepColor
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Patch("AppLogo")
@@ -72,6 +75,25 @@ fun BerlindroidLogo(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Patch("FourOfThem")
+@Composable
+fun FourOfThemLogo(
+    shouldCapture: Boolean = false,
+    onBitmap: (ImageBitmap) -> Unit = {},
+) {
+    SafeArea(
+        shouldCapture = shouldCapture,
+        onBitmap = onBitmap,
+    ) {
+        Image(
+            modifier = Modifier.size(200.dp),
+            painter = painterResource(R.drawable.four_of_them),
+            contentDescription = null
+        )
+    }
+}
+
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Patch("GoogleLogo")
@@ -298,3 +320,40 @@ fun PreviewBerlindroid() {
 private fun BlueworldLogoPreview() {
     BlueworldLogo()
 }
+
+@Patch("Composable Sheep")
+@Composable
+fun ComposableSheepPatchable(
+    shouldCapture: Boolean = false, // used to activate the convert to bitmap
+    onBitmap: (ImageBitmap) -> Unit = {}, // used to return the bitmap from the SafeArea
+) {
+    SafeArea(
+        shouldCapture = shouldCapture,
+        onBitmap = onBitmap,
+    ) {
+        ComposableSheep(
+            sheep = Sheep(fluffColor = SheepColor.Green),
+            modifier = Modifier.size(300.dp),
+        )
+    }
+}
+
+@Preview
+@Patch("ZeWednesday")
+@Composable
+fun ZeWednesday(
+    shouldCapture: Boolean = false, // used to activate the convert to bitmap
+    onBitmap: (ImageBitmap) -> Unit = {}, // used to return the bitmap from the SafeArea
+) {
+    SafeArea(
+        shouldCapture = shouldCapture,
+        onBitmap = onBitmap,
+    ) {
+        Image(
+            modifier = Modifier.size(200.dp),
+            painter = painterResource(R.drawable.ze_frog),
+            contentDescription = null
+        )
+    }
+}
+

app/src/main/res/drawable/four_of_them.png

@@ -10,7 +10,7 @@ android {
     compileSdk = 36
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 25
 
         ndk {
             abiFilters += listOf("arm64-v8a", "x86_64")

app/src/main/res/drawable/ze_frog.png

@@ -18,6 +18,7 @@ junitKtx = "1.3.0"
 appcompat = "1.7.1"
 material = "1.13.0"
 jts = "1.20.0"
+composableSheep = "1.1.0"
 
 [libraries]
 kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref = "kotlinpoet" }
@@ -47,6 +48,7 @@ androidx-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 jts = { group = "org.locationtech.jts", name = "jts-core", version.ref = "jts" }
+composableSheep = { module = "dev.nstv:composablesheep", version.ref = "composableSheep" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }