Crop image to square

app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt

@@ -72,6 +72,8 @@ import io.github.droidkaigi.confsched.model.AboutItem
 import io.github.droidkaigi.confsched.model.Lang.JAPANESE
 import io.github.droidkaigi.confsched.model.TimetableItem
 import io.github.droidkaigi.confsched.model.defaultLang
+import io.github.droidkaigi.confsched.profilecard.cropImageScreenRoute
+import io.github.droidkaigi.confsched.profilecard.cropImageScreens
 import io.github.droidkaigi.confsched.profilecard.navigateProfileCardScreen
 import io.github.droidkaigi.confsched.profilecard.profileCardScreen
 import io.github.droidkaigi.confsched.profilecard.profileCardScreenRoute
@@ -189,6 +191,11 @@ private fun KaigiNavHost(
                     onTimetableItemClick = navController::navigateToTimetableItemDetailScreen,
                     contentPadding = PaddingValues(),
                 )
+
+                cropImageScreens(
+                    onNavigationIconClick = navController::popBackStack,
+                    onBackWithConfirm = navController::popBackStack,
+                )
             }
         }
     }
@@ -267,6 +274,7 @@ private fun NavGraphBuilder.mainScreen(
             profileCardScreen(
                 contentPadding = contentPadding,
                 onClickShareProfileCard = externalNavController::onShareProfileCardClick,
+                onNavigateToCropImage = { navController.navigate(cropImageScreenRoute) },
             )
         },
     )

app-ios-shared/src/commonMain/kotlin/io/github/droidkaigi/confsched/shared/IosComposeKaigiApp.kt

@@ -22,8 +22,8 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import co.touchlab.kermit.Logger
-import conference_app_2024.app_ios_shared.generated.resources.permission_required
 import conference_app_2024.app_ios_shared.generated.resources.open_settings
+import conference_app_2024.app_ios_shared.generated.resources.permission_required
 import io.github.droidkaigi.confsched.about.aboutScreen
 import io.github.droidkaigi.confsched.about.aboutScreenRoute
 import io.github.droidkaigi.confsched.about.navigateAboutScreen
@@ -64,6 +64,8 @@ import io.github.droidkaigi.confsched.model.SettingsRepository
 import io.github.droidkaigi.confsched.model.TimetableItem
 import io.github.droidkaigi.confsched.model.compositionlocal.LocalRepositories
 import io.github.droidkaigi.confsched.model.defaultLang
+import io.github.droidkaigi.confsched.profilecard.cropImageScreenRoute
+import io.github.droidkaigi.confsched.profilecard.cropImageScreens
 import io.github.droidkaigi.confsched.profilecard.navigateProfileCardScreen
 import io.github.droidkaigi.confsched.profilecard.profileCardScreen
 import io.github.droidkaigi.confsched.profilecard.profileCardScreenRoute
@@ -251,6 +253,11 @@ private fun KaigiNavHost(
             onTimetableItemClick = navController::navigateToTimetableItemDetailScreen,
             contentPadding = PaddingValues(),
         )
+
+        cropImageScreens(
+            onNavigationIconClick = navController::popBackStack,
+            onBackWithConfirm = navController::popBackStack,
+        )
     }
 }
 
@@ -327,6 +334,7 @@ private fun NavGraphBuilder.mainScreen(
             profileCardScreen(
                 contentPadding = contentPadding,
                 onClickShareProfileCard = externalNavController::onShareProfileCardClick,
+                onNavigateToCropImage = { navController.navigate(cropImageScreenRoute) },
             )
         },
     )

core/data/src/commonMain/kotlin/io/github/droidkaigi/confsched/data/profilecard/DefaultProfileCardRepository.kt

@@ -6,7 +6,9 @@ import androidx.compose.runtime.remember
 import io.github.droidkaigi.confsched.compose.safeCollectAsRetainedState
 import io.github.droidkaigi.confsched.model.ProfileCard
 import io.github.droidkaigi.confsched.model.ProfileCardRepository
+import io.github.droidkaigi.confsched.model.ProfileImage
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.withContext
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.ExperimentalResourceApi
@@ -18,6 +20,9 @@ public class DefaultProfileCardRepository(
     private val profileCardDataStore: ProfileCardDataStore,
     private val ioDispatcher: CoroutineDispatcher,
 ) : ProfileCardRepository {
+    private val profileImageInEditStateFlow = MutableStateFlow<ProfileImage?>(null)
+    private val profileImageCandidateStateFlow = MutableStateFlow<ProfileImage?>(null)
+
     @Composable
     override fun profileCard(): ProfileCard {
         val profileCard by remember {
@@ -32,7 +37,10 @@ public class DefaultProfileCardRepository(
     }
 
     @OptIn(ExperimentalResourceApi::class)
-    override suspend fun loadQrCodeImageByteArray(link: String, centerLogoRes: DrawableResource): ByteArray {
+    override suspend fun loadQrCodeImageByteArray(
+        link: String,
+        centerLogoRes: DrawableResource,
+    ): ByteArray {
         return withContext(ioDispatcher) {
             val logoImage = getDrawableResourceBytes(
                 environment = getSystemResourceEnvironment(),
@@ -44,4 +52,32 @@ public class DefaultProfileCardRepository(
                 .renderToBytes()
         }
     }
+
+    @Composable
+    override fun profileImageInEdit(): ProfileImage? {
+        val profileImage by profileImageInEditStateFlow.safeCollectAsRetainedState()
+        return profileImage
+    }
+
+    override fun setProfileImageInEdit(profileImage: ProfileImage) {
+        profileImageInEditStateFlow.value = profileImage
+    }
+
+    override fun clearProfileImageInEdit() {
+        profileImageInEditStateFlow.value = null
+    }
+
+    @Composable
+    override fun profileImageCandidate(): ProfileImage? {
+        val profileImageCandidate by profileImageCandidateStateFlow.safeCollectAsRetainedState()
+        return profileImageCandidate
+    }
+
+    override fun setProfileImageCandidate(profileImage: ProfileImage) {
+        profileImageCandidateStateFlow.value = profileImage
+    }
+
+    override fun clearProfileImageCache() {
+        profileImageCandidateStateFlow.value = null
+    }
 }

core/model/src/androidMain/kotlin/io/github/droidkaigi/confsched/model/ProfileImage.kt

@@ -0,0 +1,25 @@
+package io.github.droidkaigi.confsched.model
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import java.io.ByteArrayOutputStream
+
+actual val ByteArray.imageSize: IntSize
+    get() = this.asBitmap().let {
+        IntSize(width = it.width, height = it.height)
+    }
+
+actual fun ByteArray.crop(rect: IntRect): ByteArray {
+    val cropped = Bitmap.createBitmap(this.asBitmap(), rect.left, rect.top, rect.width, rect.height)
+
+    return ByteArrayOutputStream(cropped.byteCount).use { stream ->
+        cropped.compress(Bitmap.CompressFormat.PNG, 100, stream)
+        stream.toByteArray()
+    }
+}
+
+private fun ByteArray.asBitmap(): Bitmap {
+    return BitmapFactory.decodeByteArray(this, 0, size)
+}

core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/ProfileCardRepository.kt

@@ -9,6 +9,16 @@ interface ProfileCardRepository {
     fun profileCard(): ProfileCard
     suspend fun save(profileCard: ProfileCard.Exists)
     suspend fun loadQrCodeImageByteArray(link: String, centerLogoRes: DrawableResource): ByteArray
+
+    @Composable
+    fun profileImageInEdit(): ProfileImage?
+    fun setProfileImageInEdit(profileImage: ProfileImage)
+    fun clearProfileImageInEdit()
+
+    @Composable
+    fun profileImageCandidate(): ProfileImage?
+    fun setProfileImageCandidate(profileImage: ProfileImage)
+    fun clearProfileImageCache()
 }
 
 @Composable

core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/ProfileImage.kt

@@ -0,0 +1,33 @@
+package io.github.droidkaigi.confsched.model
+
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+
+data class ProfileImage(
+    val bytes: ByteArray,
+) {
+    val size: IntSize
+        get() = bytes.imageSize
+
+    fun crop(rect: IntRect): ProfileImage {
+        return copy(
+            bytes = bytes.crop(rect),
+        )
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as ProfileImage
+
+        return bytes.contentEquals(other.bytes)
+    }
+
+    override fun hashCode(): Int {
+        return bytes.contentHashCode()
+    }
+}
+
+expect val ByteArray.imageSize: IntSize
+expect fun ByteArray.crop(rect: IntRect): ByteArray

core/model/src/iosMain/kotlin/io/github/droidkaigi/confsched/model/ProfileImage.kt

@@ -0,0 +1,30 @@
+package io.github.droidkaigi.confsched.model
+
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import org.jetbrains.skia.Bitmap
+import org.jetbrains.skia.EncodedImageFormat
+import org.jetbrains.skia.Image
+
+actual val ByteArray.imageSize: IntSize
+    get() = Bitmap.makeFromImage(
+        Image.makeFromEncoded(this),
+    ).let {
+        IntSize(width = it.width, height = it.height)
+    }
+
+actual fun ByteArray.crop(rect: IntRect): ByteArray {
+    val image = Image.makeFromEncoded(this)
+
+    val bitmap = Bitmap()
+    val imageInfo = image.imageInfo.withWidthHeight(
+        width = rect.width,
+        height = rect.height,
+    )
+    bitmap.allocPixels(imageInfo)
+    image.readPixels(dst = bitmap, srcX = rect.left, srcY = rect.top)
+
+    val data = Image.makeFromBitmap(bitmap)
+        .encodeToData(format = EncodedImageFormat.PNG, quality = 100)
+    return requireNotNull(data).bytes
+}

core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/CropImageScreenRobot.kt

@@ -0,0 +1,31 @@
+package io.github.droidkaigi.confsched.testing.robot
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasTestTag
+import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
+import io.github.droidkaigi.confsched.profilecard.CropImageScreen
+import io.github.droidkaigi.confsched.profilecard.CropImageScreenTestTag
+import javax.inject.Inject
+
+class CropImageScreenRobot @Inject constructor(
+    screenRobot: DefaultScreenRobot,
+) : ScreenRobot by screenRobot {
+
+    fun setupScreenContent() {
+        robotTestRule.setContent {
+            KaigiTheme {
+                CropImageScreen(
+                    onNavigationIconClick = {},
+                    onBackWithConfirm = {},
+                )
+            }
+        }
+        waitUntilIdle()
+    }
+
+    fun checkScreenDisplayed() {
+        composeTestRule
+            .onNode(hasTestTag(CropImageScreenTestTag))
+            .assertIsDisplayed()
+    }
+}

core/testing/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt

@@ -41,6 +41,7 @@ class ProfileCardScreenRobot @Inject constructor(
             KaigiTheme {
                 ProfileCardScreen(
                     onClickShareProfileCard = { _, _ -> },
+                    onNavigateToCropImage = {},
                 )
             }
         }

feature/profilecard/src/androidMain/kotlin/io/github/droidkaigi/confsched/profilecard/component/SingleImagePickerLauncher.kt

@@ -0,0 +1,23 @@
+package io.github.droidkaigi.confsched.profilecard.component
+
+import androidx.compose.runtime.Composable
+import com.preat.peekaboo.image.picker.ImagePickerLauncher
+import com.preat.peekaboo.image.picker.toImageBitmap
+import kotlinx.coroutines.CoroutineScope
+
+@Composable
+internal actual fun rememberCroppingImagePickerLauncher(
+    onCropImage: (ByteArray) -> Unit,
+    onSelectedImage: (ByteArray) -> Unit,
+    scope: CoroutineScope,
+): ImagePickerLauncher {
+    return rememberSingleImagePickerLauncher(scope) {
+        val imageBitmap = it.toImageBitmap()
+
+        if (imageBitmap.height != imageBitmap.width) {
+            onCropImage(it)
+        } else {
+            onSelectedImage(it)
+        }
+    }
+}

feature/profilecard/src/androidUnitTest/kotlin/io/github/droidkaigi/confsched/profilecard/CropImageScreenTest.kt

@@ -0,0 +1,55 @@
+package io.github.droidkaigi.confsched.profilecard
+
+import dagger.hilt.android.testing.BindValue
+import dagger.hilt.android.testing.HiltAndroidTest
+import io.github.droidkaigi.confsched.testing.DescribedBehavior
+import io.github.droidkaigi.confsched.testing.describeBehaviors
+import io.github.droidkaigi.confsched.testing.execute
+import io.github.droidkaigi.confsched.testing.robot.CropImageScreenRobot
+import io.github.droidkaigi.confsched.testing.robot.runRobot
+import io.github.droidkaigi.confsched.testing.rules.RobotTestRule
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import javax.inject.Inject
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@HiltAndroidTest
+class CropImageScreenTest(
+    private val testCase: DescribedBehavior<CropImageScreenRobot>,
+) {
+
+    @get:Rule
+    @BindValue
+    val robotTestRule: RobotTestRule = RobotTestRule(testInstance = this)
+
+    @Inject
+    lateinit var cropImageScreenRobot: CropImageScreenRobot
+
+    @Test
+    fun runTest() {
+        runRobot(cropImageScreenRobot) {
+            testCase.execute(cropImageScreenRobot)
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
+        fun behaviors(): List<DescribedBehavior<CropImageScreenRobot>> {
+            return describeBehaviors(name = "CropImageScreen") {
+                describe("when launch") {
+                    doIt {
+                        setupScreenContent()
+                    }
+                    itShould("show screen") {
+                        captureScreenWithChecks {
+                            checkScreenDisplayed()
+                        }
+                    }
+                }
+            }
+        }
+    }
+}