feat: adapted to the edit top app bar

f-arslan · f-arslan · commit 4bc3c8c23a5e · 2024-01-23T12:08:42.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,5 +38,4 @@ plugins {
     alias(libs.plugins.secrets) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.detekt) apply false
-    alias(libs.plugins.jetbrainsKotlinAndroid) apply false
 }
diff --git a/feature/favourite/src/main/kotlin/com/espressodev/gptmap/feature/favourite/FavouriteScreen.kt b/feature/favourite/src/main/kotlin/com/espressodev/gptmap/feature/favourite/FavouriteScreen.kt
@@ -1,5 +1,6 @@
 package com.espressodev.gptmap.feature.favourite
 
+import android.util.Log
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -47,7 +48,7 @@ fun FavouriteRoute(
     viewModel: FavouriteViewModel = hiltViewModel()
 ) {
     val favourites by viewModel.favourites.collectAsStateWithLifecycle()
-
+    Log.d("FavouriteRoute", "favourites: $favourites")
     FavouriteScreen(
         popUp = popUp,
         onCardClick = navigateToMap,
@@ -76,20 +77,27 @@ fun FavouriteScreen(
         with(favourites) {
             when (this) {
                 is Response.Success -> {
-                    LazyColumn(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(it),
-                        verticalArrangement = Arrangement.spacedBy(HIGH_PADDING),
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        contentPadding = PaddingValues(HIGH_PADDING)
-                    ) {
-                        items(data, key = { favourite -> favourite.id }) { favourite ->
-                            FavouriteCard(
-                                favourite = favourite,
-                                onClick = { onCardClick(favourite.favouriteId) }
-                            )
+                    if (data.isNotEmpty()) {
+                        LazyColumn(
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .padding(it),
+                            verticalArrangement = Arrangement.spacedBy(HIGH_PADDING),
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            contentPadding = PaddingValues(HIGH_PADDING)
+                        ) {
+                            items(data, key = { favourite -> favourite.id }) { favourite ->
+                                FavouriteCard(
+                                    favourite = favourite,
+                                    onClick = { onCardClick(favourite.favouriteId) }
+                                )
+                            }
                         }
+                    } else {
+                        LottieAnimationPlaceholder(
+                            modifier = Modifier.padding(it),
+                            rawRes = AppRaw.nothing_here_anim
+                        )
                     }
                 }
 
diff --git a/feature/profile/src/main/kotlin/com/espressodev/gptmap/feature/profile/ProfileScreen.kt b/feature/profile/src/main/kotlin/com/espressodev/gptmap/feature/profile/ProfileScreen.kt
@@ -27,7 +27,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -38,7 +37,6 @@ import com.espressodev.gptmap.core.designsystem.component.GmTonalIconButton
 import com.espressodev.gptmap.core.designsystem.component.GmTopAppBar
 import com.espressodev.gptmap.core.designsystem.component.LetterInCircle
 import com.espressodev.gptmap.core.designsystem.component.LottieAnimationPlaceholder
-import com.espressodev.gptmap.core.designsystem.theme.GptmapTheme
 import com.espressodev.gptmap.core.model.Response
 import com.espressodev.gptmap.core.model.User
 import com.espressodev.gptmap.core.designsystem.R.raw as AppRaw
@@ -144,21 +142,3 @@ fun ProfileItem(icon: ImageVector, @StringRes textId: Int, onClick: () -> Unit)
         )
     }
 }
-
-@Preview(showBackground = true)
-@Composable
-fun ProfilePreview() {
-    GptmapTheme {
-        ProfileScreen(
-            user = User(
-                userId = "sumo",
-                fullName = "Selena Beard",
-                email = "kristina.gonzales@example.com",
-                profilePictureUrl = "https://search.yahoo.com/search?p=vestibulum",
-                fcmToken = "perpetua",
-                provider = "iisque"
-            ),
-            {}, {}, {}
-        )
-    }
-}
diff --git a/feature/register/src/main/kotlin/com/espressodev/gptmap/feature/register/RegisterScreen.kt b/feature/register/src/main/kotlin/com/espressodev/gptmap/feature/register/RegisterScreen.kt
@@ -24,7 +24,7 @@ import com.espressodev.gptmap.core.designsystem.Constants.TERMS_CONDITIONS
 import com.espressodev.gptmap.core.designsystem.Constants.TERMS_CONDITIONS_LINK
 import com.espressodev.gptmap.core.designsystem.Constants.VERY_HIGH_PADDING
 import com.espressodev.gptmap.core.designsystem.GmIcons
-import com.espressodev.gptmap.core.designsystem.component.AppAlertDialog
+import com.espressodev.gptmap.core.designsystem.component.GmAlertDialog
 import com.espressodev.gptmap.core.designsystem.component.AppWrapper
 import com.espressodev.gptmap.core.designsystem.component.DayHeader
 import com.espressodev.gptmap.core.designsystem.component.DefaultButton
@@ -37,7 +37,6 @@ import com.espressodev.gptmap.core.designsystem.component.PasswordTextField
 import com.espressodev.gptmap.core.google_auth.composable.OneTapLauncher
 import com.espressodev.gptmap.core.model.LoadingState
 import com.espressodev.gptmap.core.model.google.GoogleResponse
-import kotlinx.collections.immutable.immutableMapOf
 import kotlinx.collections.immutable.persistentMapOf
 import com.espressodev.gptmap.core.designsystem.R.drawable as AppDrawable
 import com.espressodev.gptmap.core.designsystem.R.string as AppText
@@ -55,17 +54,19 @@ fun RegisterRoute(
         }
 
         uiState.verificationAlertState is LoadingState.Loading -> {
-            AppAlertDialog(
-                GmIcons.MarkEmailUnreadOutlined,
-                AppText.email_confirmation_title,
-                AppText.email_confirmation_body,
+            GmAlertDialog(
+                icon = GmIcons.MarkEmailUnreadOutlined,
+                title = AppText.email_confirmation_title,
                 onConfirm = { viewModel.handleVerificationAndNavigate { clearAndNavigateLogin() } },
                 onDismiss = {
                     viewModel.onEvent(
                         RegisterEvent.OnVerificationAlertStateChanged(
                             LoadingState.Idle
                         )
                     )
+                },
+                text = {
+                    Text(stringResource(AppText.email_confirmation_body), textAlign = TextAlign.Center)
                 }
             )
         }
diff --git a/feature/screenshot-gallery/src/main/kotlin/com/espressodev/gptmap/feature/screenshot_gallery/ScreenshotGalleryScreen.kt b/feature/screenshot-gallery/src/main/kotlin/com/espressodev/gptmap/feature/screenshot_gallery/ScreenshotGalleryScreen.kt
@@ -1,16 +1,17 @@
 package com.espressodev.gptmap.feature.screenshot_gallery
 
 import android.util.Log
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.border
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.aspectRatio
@@ -28,10 +29,9 @@ import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
-import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -46,7 +46,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextAlign
@@ -61,6 +63,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.espressodev.gptmap.core.designsystem.GmIcons
 import com.espressodev.gptmap.core.designsystem.IconType
 import com.espressodev.gptmap.core.designsystem.TextType
+import com.espressodev.gptmap.core.designsystem.component.GmEditAlertDialog
 import com.espressodev.gptmap.core.designsystem.component.GmTopAppBar
 import com.espressodev.gptmap.core.designsystem.component.LottieAnimationPlaceholder
 import com.espressodev.gptmap.core.designsystem.component.ShimmerImage
@@ -90,9 +93,9 @@ fun ScreenshotGalleryRoute(
                 onBackClick = popUp,
                 editText = uiState.selectedImageSummary.title,
                 isInEditMode = uiState.uiIsInEditMode,
-                onEditClick = viewModel::onEditClick,
-                onDeleteClick = viewModel::onDeleteClick,
-                onCancelClick = viewModel::onCancelClick
+                onEditClick = { viewModel.onEvent(ScreenshotGalleryUiEvent.OnEditClick) },
+                onDeleteClick = { viewModel.onEvent(ScreenshotGalleryUiEvent.OnDeleteClick) },
+                onCancelClick = { viewModel.onEvent(ScreenshotGalleryUiEvent.OnCancelClick) }
             )
         }
     ) {
@@ -103,15 +106,41 @@ fun ScreenshotGalleryRoute(
 
             Response.Loading -> {}
             is Response.Success -> {
-                ScreenshotGalleryScreen(
-                    modifier = Modifier.padding(it),
-                    images = result.data,
-                    onLongClick = viewModel::onLongClickToImage,
-                    selectedId = uiState.selectedImageSummary.id
-                )
+                if (result.data.isNotEmpty()) {
+                    ScreenshotGalleryScreen(
+                        modifier = Modifier.padding(it),
+                        images = result.data,
+                        onLongClick = { imageSummary ->
+                            viewModel.onEvent(
+                                ScreenshotGalleryUiEvent.OnLongClickToImage(imageSummary)
+                            )
+                        },
+                        selectedId = uiState.selectedImageSummary.id
+                    )
+                } else {
+                    LottieAnimationPlaceholder(
+                        modifier = Modifier.padding(it),
+                        rawRes = AppRaw.nothing_here_anim
+                    )
+                }
             }
         }
     }
+
+    BackHandler {
+        if (uiState.uiIsInEditMode) {
+            viewModel.onEvent(ScreenshotGalleryUiEvent.Reset)
+        }
+    }
+
+    if (uiState.editDialogState) {
+        GmEditAlertDialog(
+            title = AppText.screenshot_gallery_edit_dialog_title,
+            textFieldLabel = AppText.screenshot_gallery_edit_dialog_text_field_placeholder,
+            onConfirm = { viewModel.onEvent(ScreenshotGalleryUiEvent.OnEditDialogConfirm(it)) },
+            onDismiss = { viewModel.onEvent(ScreenshotGalleryUiEvent.OnEditDialogDismiss) }
+        )
+    }
 }
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -157,64 +186,48 @@ fun ScreenshotGalleryScreen(
 fun ImageCard(
     imageSummary: ImageSummary,
     modifier: Modifier = Modifier,
+    shape: Shape = RoundedCornerShape(16.dp),
     isSelected: Boolean = false,
     onClick: () -> Unit = {},
     onLongClick: () -> Unit = {}
 ) {
     var isImageLoaded by remember { mutableStateOf(value = false) }
+    val borderStroke = if (isSelected) 3.dp else 0.dp
+    val elevation = if (isSelected) 8.dp else 0.dp
 
-    ElevatedCard(
-        modifier = modifier.combinedClickable(
-            onClick = onClick,
-            onLongClick = onLongClick
-        )
+    Box(
+        modifier = modifier
+            .shadow(elevation, shape)
+            .clip(shape)
+            .border(borderStroke, MaterialTheme.colorScheme.primary, shape)
+            .combinedClickable(
+                onClick = onClick,
+                onLongClick = onLongClick
+            ),
     ) {
-        Box {
-            if (isSelected) {
-                SelectedIconView()
-            }
-            ShimmerImage(
-                imageSummary.imageUrl,
-                modifier = Modifier.aspectRatio(1f),
-                onSuccess = { isImageLoaded = true }
-            )
-            if (isImageLoaded)
-                Box(
-                    modifier = Modifier
-                        .matchParentSize()
-                        .background(brush = darkBottomOverlayBrush)
-                )
-            Text(
-                text = imageSummary.title,
+        ShimmerImage(
+            imageSummary.imageUrl,
+            modifier = Modifier.aspectRatio(1f),
+            onSuccess = { isImageLoaded = true }
+        )
+        if (isImageLoaded)
+            Box(
                 modifier = Modifier
-                    .padding(8.dp)
-                    .fillMaxWidth()
-                    .align(Alignment.BottomCenter)
-                    .basicMarquee(iterations = Int.MAX_VALUE),
-                style = MaterialTheme.typography.titleMedium,
-                textAlign = TextAlign.Center,
-                color = Color.White
+                    .matchParentSize()
+                    .background(brush = darkBottomOverlayBrush)
             )
-        }
-    }
-}
-
-@Composable
-private fun BoxScope.SelectedIconView() {
-    Box(
-        modifier = Modifier.Companion
-            .matchParentSize()
-            .zIndex(1f)
-    ) {
-        Icon(
-            imageVector = GmIcons.ApproveFilled,
-            contentDescription = null,
+        Text(
+            text = imageSummary.title,
             modifier = Modifier
                 .padding(8.dp)
-                .size(56.dp)
-                .align(Alignment.TopEnd),
-            tint = MaterialTheme.colorScheme.primary
+                .fillMaxWidth()
+                .align(Alignment.BottomCenter)
+                .basicMarquee(iterations = Int.MAX_VALUE),
+            style = MaterialTheme.typography.titleMedium,
+            textAlign = TextAlign.Center,
+            color = Color.White
         )
+
     }
 }
 
@@ -342,12 +355,18 @@ fun DotsIndicator(
 fun ScreenshotGalleryPreview() {
     GptmapTheme {
         Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            ImageCard(imageSummary = ImageSummary(
-                id = "debet",
-                imageUrl = "https://www.google.com/#q=fames",
-                title = "himenaeos",
-                date = LocalDateTime.now()
-            ), isSelected = true, onClick = {}, onLongClick = {})
+            ImageCard(
+                imageSummary = ImageSummary(
+                    id = "debet",
+                    imageUrl = "https://www.google.com/#q=fames",
+                    title = "himenaeos",
+                    date = LocalDateTime.now()
+                ),
+                isSelected = true,
+                onClick = {},
+                onLongClick = {},
+                modifier = Modifier.padding(8.dp)
+            )
         }
     }
 }
diff --git a/feature/screenshot-gallery/src/main/kotlin/com/espressodev/gptmap/feature/screenshot_gallery/ScreenshotGalleryUiState.kt b/feature/screenshot-gallery/src/main/kotlin/com/espressodev/gptmap/feature/screenshot_gallery/ScreenshotGalleryUiState.kt
@@ -6,4 +6,15 @@ import java.time.LocalDateTime
 data class ScreenshotGalleryUiState(
     val selectedImageSummary: ImageSummary = ImageSummary(date = LocalDateTime.now()),
     val uiIsInEditMode: Boolean = false,
-)
+    val editDialogState: Boolean = false,
+)
+
+sealed class ScreenshotGalleryUiEvent {
+    data class OnLongClickToImage(val imageSummary: ImageSummary) : ScreenshotGalleryUiEvent()
+    data object OnCancelClick : ScreenshotGalleryUiEvent()
+    data object OnDeleteClick : ScreenshotGalleryUiEvent()
+    data object OnEditClick : ScreenshotGalleryUiEvent()
+    data object OnEditDialogDismiss : ScreenshotGalleryUiEvent()
+    data object Reset: ScreenshotGalleryUiEvent()
+    data class OnEditDialogConfirm(val text: String) : ScreenshotGalleryUiEvent()
+}
diff --git a/feature/screenshot-gallery/src/main/kotlin/com/espressodev/gptmap/feature/screenshot_gallery/ScreenshotGalleryViewModel.kt b/feature/screenshot-gallery/src/main/kotlin/com/espressodev/gptmap/feature/screenshot_gallery/ScreenshotGalleryViewModel.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,4 @@ plugins {`
`38`	`38`	`alias(libs.plugins.secrets) apply false`
`39`	`39`	`alias(libs.plugins.android.library) apply false`
`40`	`40`	`alias(libs.plugins.detekt) apply false`
`41`		`- alias(libs.plugins.jetbrainsKotlinAndroid) apply false`
`42`	`41`	`}`