From b6f232f65525273eb5224bbe10041a5d9d519105 Mon Sep 17 00:00:00 2001 From: Cutiful <113351087+Syaroful@users.noreply.github.com> Date: Sun, 15 Jun 2025 15:58:06 +0700 Subject: [PATCH] feat: navigate to history screen from camera --- .../presentation/camera/CameraScreen.kt | 3 +++ .../presentation/camera/CameraViewModel.kt | 3 ++- .../presentation/camera/component/CurtomCameraShutter.kt | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/CameraScreen.kt b/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/CameraScreen.kt index 648bf28..e0828ed 100644 --- a/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/CameraScreen.kt +++ b/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/CameraScreen.kt @@ -111,6 +111,9 @@ fun CameraScreen( } }, + onHistoryClick = { + navController.navigate("history") + } ) Image( modifier = Modifier diff --git a/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/CameraViewModel.kt b/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/CameraViewModel.kt index 7afa3f5..a850ab0 100644 --- a/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/CameraViewModel.kt +++ b/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/CameraViewModel.kt @@ -5,6 +5,7 @@ import android.util.Log import androidx.camera.view.LifecycleCameraController import androidx.lifecycle.ViewModel import com.syaroful.agrilinkvocpro.plant_disease_detection_feature.core.extention.cropToSquare +import com.syaroful.agrilinkvocpro.plant_disease_detection_feature.core.extention.resize import com.syaroful.agrilinkvocpro.plant_disease_detection_feature.data.repository.CameraRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow @@ -35,7 +36,7 @@ class CameraViewModel( cameraRepository.takePicture(controller, executor) { bitmap -> Log.d(TAG, "Picture taken, updating state") val croppedImage = cropToSquare(bitmap) - _bitmap.value = croppedImage + _bitmap.value = croppedImage.resize() // croppedImage.let { // diagnosisViewModel.analyzePlant(bitmap = it, prompt = prompt) // Log.d(TAG, "analyzePlant() called") diff --git a/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/component/CurtomCameraShutter.kt b/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/component/CurtomCameraShutter.kt index 925d6d5..2d6d74c 100644 --- a/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/component/CurtomCameraShutter.kt +++ b/agrilinkvocpro/plant_disease_detection_feature/src/main/java/com/syaroful/agrilinkvocpro/plant_disease_detection_feature/presentation/camera/component/CurtomCameraShutter.kt @@ -26,7 +26,7 @@ fun CustomCameraShutter( modifier: Modifier = Modifier, onShutterClick: () -> Unit = {}, onFlashClick: () -> Unit = {}, - onGalleryClick: () -> Unit = {} + onHistoryClick: () -> Unit = {} ) { Row( modifier = modifier @@ -66,12 +66,12 @@ fun CustomCameraShutter( } IconButton( - onClick = onGalleryClick, + onClick = onHistoryClick, ) { Icon( modifier = Modifier.size(32.dp), - painter = painterResource(id = R.drawable.solar_gallery_broken), + painter = painterResource(id = R.drawable.solar_history), contentDescription = "Gallery", tint = MaterialTheme.colorScheme.onBackground )