feat: add merge highlights toggle (#138)

jaamesokhan · Sep 4, 2024 · 330bd96 · 330bd96
1 parent 9d96e28
commit 330bd96
Show file tree

Hide file tree

Showing 18 changed files with 351 additions and 211 deletions.
diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/dao/HighlightDao.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/dao/HighlightDao.kt
@@ -46,6 +46,7 @@ interface HighlightDao {
             JOIN poems p ON v.poem_id = p.id
             JOIN categories c ON p.category_id = c.id
             JOIN poets pt ON c.poet_id = pt.id
+            ORDER BY hg.verse_id
         """
     )
     fun getHighlightsWithVersePoemPoet(): List<HighlightVersePoemPoet>

diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/model/HighlightVersePoemCategoriesPoet.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/model/HighlightVersePoemCategoriesPoet.kt
@@ -4,4 +4,14 @@ package ir.jaamebaade.jaamebaade_client.model
 data class HighlightVersePoemCategoriesPoet(
     val highlight: Highlight,
     val versePath: VersePoemCategoriesPoet,
-)
+)
+
+fun HighlightVersePoemCategoriesPoet.toMergedHighlight(): MergedHighlight =
+    MergedHighlight(
+        highlights = mutableListOf(highlight),
+        verses = mutableListOf(versePath.verse!!),
+        poem = versePath.poem,
+        categories = versePath.categories,
+        poet = versePath.poet
+    )
+
diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/model/MergedHighlight.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/model/MergedHighlight.kt
@@ -0,0 +1,9 @@
+package ir.jaamebaade.jaamebaade_client.model
+
+data class MergedHighlight (
+    val highlights: MutableList<Highlight>,
+    val verses: MutableList<Verse>,
+    val poem: Poem,
+    val categories: List<Category>,
+    val poet: Poet
+)
diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/model/VersePoemCategoriesPoet.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/model/VersePoemCategoriesPoet.kt
@@ -8,4 +8,8 @@ data class VersePoemCategoriesPoet(
     val poem: Poem,
     val categories: List<Category>,
     val poet: Poet
-)
+)
+
+fun VersePoemCategoriesPoet.toPathHeaderText() = "${
+    categories.joinToString(separator = " > ") { it.text }
+} > ${poem.title}"
diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/utility/SharedPrefManager.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/utility/SharedPrefManager.kt
@@ -72,4 +72,14 @@ class SharedPrefManager(
             } ?: AppThemeType.SYSTEM_AUTO
         return savedTheme
     }
+
+    fun setHighlightMergeToggleState(state: Boolean) {
+        val editor = sharedPreferences.edit()
+        editor.putBoolean("highlightMergeToggleState", state)
+        editor.apply()
+    }
+
+    fun getHighlightMergeToggleState(): Boolean {
+        return sharedPreferences.getBoolean("highlightMergeToggleState", false)
+    }
 }
diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/view/CommentsScreen.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/view/CommentsScreen.kt
@@ -1,5 +1,8 @@
 package ir.jaamebaade.jaamebaade_client.view
 
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -15,12 +18,12 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import ir.jaamebaade.jaamebaade_client.view.components.CommentItem
@@ -36,7 +39,7 @@ fun CommentsScreen(poemId: Int, modifier: Modifier) {
         }
 
     var commentText by remember { mutableStateOf("") }
-    val comments by viewModel.comments.collectAsState()
+    val comments = viewModel.comments
 
     Column(
         modifier = modifier
@@ -46,10 +49,24 @@ fun CommentsScreen(poemId: Int, modifier: Modifier) {
         LazyColumn(
             verticalArrangement = Arrangement.Bottom,
         ) {
-            items(comments) { comment ->
+            items(items = comments, key = { it.id }) { comment ->
+                var lapVisible by remember { mutableStateOf(false) }
+                val animatedLapAlpha by animateFloatAsState(
+                    targetValue = if (lapVisible) 1f else 0f,
+                    label = "Lap alpha",
+                    animationSpec = tween(
+                        durationMillis = 250,
+                        easing = LinearEasing,
+                    )
+                )
                 CommentItem(
+                    modifier = Modifier.graphicsLayer {
+                        lapVisible = true
+                        alpha = animatedLapAlpha
+                    },
                     comment = comment,
-                    onDeleteClicked = { viewModel.deleteComment(comment) })
+                    onDeleteClicked = { viewModel.deleteComment(comment) }
+                )
             }
         }
 

diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/view/SearchScreen.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/view/SearchScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -15,13 +16,21 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.withStyle
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
+import ir.jaamebaade.jaamebaade_client.constants.AppRoutes
 import ir.jaamebaade.jaamebaade_client.model.Status
 import ir.jaamebaade.jaamebaade_client.model.VersePoemCategoriesPoet
+import ir.jaamebaade.jaamebaade_client.model.toPathHeaderText
+import ir.jaamebaade.jaamebaade_client.view.components.CardItem
 import ir.jaamebaade.jaamebaade_client.view.components.LoadingIndicator
 import ir.jaamebaade.jaamebaade_client.view.components.SearchBar
-import ir.jaamebaade.jaamebaade_client.view.components.SearchResultItem
 import ir.jaamebaade.jaamebaade_client.viewmodel.SearchViewModel
 
 @Composable
@@ -72,13 +81,44 @@ fun SearchResults(
     } else {
         LazyColumn {
             items(results) { result ->
-                SearchResultItem(
-                    modifier = Modifier,
-                    result = result,
+                val bodyText = createSearchResultBody(
+                    item = result,
                     searchQuery = searchQuery,
-                    navController = navController
+                    color = MaterialTheme.colorScheme.onSurface
+                )
+                CardItem(
+                    headerText = result.toPathHeaderText(),
+                    bodyText = bodyText,
+                    onClick = {
+                        navController.navigate("${AppRoutes.POEM}/${result.poet.id}/${result.verse!!.poemId}/${result.verse.id}")
+                    },
+                )
+            }
+        }
+    }
+}
+
+private fun createSearchResultBody(
+    item: VersePoemCategoriesPoet,
+    searchQuery: String,
+    color: Color
+): AnnotatedString {
+    val text = item.verse!!.text
+    val annotatedString = buildAnnotatedString {
+        withStyle(style = SpanStyle(color = color)) {
+            append(text)
+        }
+        text.indexOf(searchQuery, ignoreCase = true).let { index ->
+            if (index >= 0) {
+                addStyle(
+                    style = SpanStyle(
+                        fontWeight = FontWeight.Bold
+                    ),
+                    start = index,
+                    end = index + searchQuery.length
                 )
             }
         }
     }
+    return annotatedString
 }
diff --git a/...e_client/view/components/PoemTracePath.kt → ...aade_client/view/components/CardHeader.kt b/...e_client/view/components/PoemTracePath.kt → ...aade_client/view/components/CardHeader.kt
@@ -9,22 +9,19 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ir.jaamebaade.jaamebaade_client.model.VersePoemCategoriesPoet
 
 @Composable
-fun PoemTracePath(versePoemCategoriesPoet: VersePoemCategoriesPoet) {
+fun CardHeader(modifier: Modifier  = Modifier, text: String) {
     Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .background(color = MaterialTheme.colorScheme.secondaryContainer)
+    modifier = modifier
+    .fillMaxWidth()
+    .background(color = MaterialTheme.colorScheme.secondaryContainer)
     ) {
         Text(
             modifier = Modifier.padding(8.dp),
-            text = "${
-                versePoemCategoriesPoet.categories.joinToString(separator = " > ") { it.text }
-            } > ${versePoemCategoriesPoet.poem.title}",
+            text = text,
             color = MaterialTheme.colorScheme.onSecondaryContainer,
             style = MaterialTheme.typography.labelSmall,
         )
     }
-}
+}
diff --git a/...client/view/components/CommentListItem.kt → ...ebaade_client/view/components/CardItem.kt b/...client/view/components/CommentListItem.kt → ...ebaade_client/view/components/CardItem.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -16,29 +14,32 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
-import ir.jaamebaade.jaamebaade_client.constants.AppRoutes
-import ir.jaamebaade.jaamebaade_client.model.Comment
-import ir.jaamebaade.jaamebaade_client.model.VersePoemCategoriesPoet
 
 @Composable
-fun CommentListItem(
+fun CardItem(
     modifier: Modifier = Modifier,
-    comment: Comment,
-    path: VersePoemCategoriesPoet,
-    navController: NavController,
-    onDeleteClicked: () -> Unit,
+    headerText: String? = null,
+    bodyText: AnnotatedString,
+    icon: ImageVector? = null,
+    iconDescription: String? = null,
+    onClick: () -> Unit,
+    onIconClick: () -> Unit = {},
 ) {
-
     Card(
         modifier = modifier
             .fillMaxWidth()
             .padding(8.dp)
-            .clickable { navController.navigate("${AppRoutes.POEM}/${path.poet.id}/${path.poem.id}/-1") }
+            .clickable { onClick() }
     ) {
 
-        PoemTracePath(versePoemCategoriesPoet = path)
+        if (headerText != null) {
+            CardHeader(
+                text = headerText
+            )
+        }
 
         Row(
             modifier = Modifier
@@ -47,22 +48,28 @@ fun CommentListItem(
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Box(modifier = Modifier.weight(1f)) {
+            Box(
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(vertical = 8.dp)
+            ) {
                 Text(
-                    comment.text,
+                    text = bodyText,
                     style = MaterialTheme.typography.bodyMedium,
                     modifier = Modifier
                         .padding(horizontal = 2.dp)
                 )
             }
 
-            IconButton(
-                onClick = {
-                    onDeleteClicked()
-                },
-                modifier = Modifier.padding(start = 8.dp)
-            ) {
-                Icon(imageVector = Icons.Outlined.Delete, contentDescription = "حذف")
+            if (icon != null) {
+                IconButton(
+                    onClick = {
+                        onIconClick()
+                    },
+                    modifier = Modifier.padding(start = 8.dp)
+                ) {
+                    Icon(imageVector = icon, contentDescription = iconDescription)
+                }
             }
         }
     }

diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/view/components/CommentItem.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/view/components/CommentItem.kt
@@ -24,9 +24,9 @@ import ir.jaamebaade.jaamebaade_client.utility.toLocalFormat
 import java.util.Date
 
 @Composable
-fun CommentItem(comment: Comment, onDeleteClicked: () -> Unit) {
+fun CommentItem(modifier: Modifier = Modifier, comment: Comment, onDeleteClicked: () -> Unit) {
     Card(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .padding(8.dp)
     ) {

diff --git a/app/src/main/java/ir/jaamebaade/jaamebaade_client/view/components/CommentsList.kt b/app/src/main/java/ir/jaamebaade/jaamebaade_client/view/components/CommentsList.kt
@@ -1,19 +1,26 @@
 package ir.jaamebaade.jaamebaade_client.view.components
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import ir.jaamebaade.jaamebaade_client.constants.AppRoutes
+import ir.jaamebaade.jaamebaade_client.model.toPathHeaderText
 import ir.jaamebaade.jaamebaade_client.viewmodel.FavoritesViewModel
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun CommentsList(viewModel: FavoritesViewModel, navController: NavController) {
     val comments = viewModel.comments
@@ -32,14 +39,14 @@ fun CommentsList(viewModel: FavoritesViewModel, navController: NavController) {
         }
     } else {
         LazyColumn(modifier = Modifier.fillMaxSize()) {
-            items(comments) { commentInfo ->
-                CommentListItem(
-                    comment = commentInfo.comment,
-                    path = commentInfo.path,
-                    navController = navController,
-                    onDeleteClicked = {
-                        viewModel.deleteComment(commentInfo)
-                    }
+            items(items = comments, key = { it.comment.id }) { commentInfo ->
+                CardItem(
+                    modifier = Modifier.animateItemPlacement(),
+                    headerText = commentInfo.path.toPathHeaderText(),
+                    bodyText = AnnotatedString(commentInfo.comment.text),
+                    icon = Icons.Outlined.Delete,
+                    onClick = { navController.navigate("${AppRoutes.POEM}/${commentInfo.path.poet.id}/${commentInfo.path.poem.id}/-1") },
+                    onIconClick = { viewModel.deleteComment(commentInfo) }
                 )
             }
         }