Merge pull request #8 from VladShurakov/fix-issue-3

VladShurakov · web-flow · commit 3050c4dca285 · 2023-12-09T13:52:36.000+05:00
Fix issue 3
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
         applicationId = "com.vladshurakov.jetnotesapp"
         minSdk = 26
         targetSdk = 34
-        versionCode = 4
-        versionName = "1.1.1"
+        versionCode = 5
+        versionName = "1.1.2"
         resourceConfigurations += listOf("en")
 
         vectorDrawables {
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/data/data_source/NoteDao.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/data/data_source/NoteDao.kt
@@ -29,7 +29,7 @@ interface NoteDao {
     @Query("SELECT * FROM note WHERE folder = :folder ORDER BY pinned DESC, timestamp DESC")
     fun getDesc(folder: Folder): Flow<List<NoteEntity>>
 
-    @Query("SELECT * FROM note WHERE folder = :folder ORDER BY pinned ASC, timestamp ASC")
+    @Query("SELECT * FROM note WHERE folder = :folder ORDER BY pinned DESC, timestamp ASC")
     fun getAsc(folder: Folder): Flow<List<NoteEntity>>
 
     @Query("SELECT * FROM note WHERE (title LIKE '%' || :query || '%' OR content LIKE '%' || :query || '%') ORDER BY pinned DESC, timestamp DESC")
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/domain/usecase/UpdatePinned.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/domain/usecase/UpdatePinned.kt
@@ -3,5 +3,5 @@ package com.vladshurakov.jetnotesapp.feature_notes.domain.usecase
 import com.vladshurakov.jetnotesapp.feature_notes.domain.repository.NotesRepository
 
 class UpdatePinned(private val repository: NotesRepository) {
-    suspend operator fun invoke(id: Long, pinned: Boolean) = repository.updatePinned(id, pinned)
+    suspend operator fun invoke(id: Long, pinned: Boolean) = repository.updatePinned(id, !pinned)
 }
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/components/NoteView.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/components/NoteView.kt
@@ -9,22 +9,27 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 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.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.vladshurakov.jetnotesapp.R
+import com.vladshurakov.jetnotesapp.feature_notes.domain.models.Note
 import com.vladshurakov.jetnotesapp.theme.MainTheme
 import org.ocpsoft.prettytime.PrettyTime
 import java.util.Date
 
 @Composable
 fun NoteView(
-    title: String = "ㅤ", content: String = "ㅤ", timestamp: Long = 0,
-    onClick: () -> Unit = {}, color: Color = MainTheme.colors.secondaryBackground
+    note: Note = Note(title = "ㅤ", content = "ㅤ", timestamp = 0), onClick: () -> Unit = {},
+    onPin: (() -> Unit)? = null, color: Color = MainTheme.colors.secondaryBackground
 ) {
     fun isContentBlank(content: String): Boolean = content.isBlank() || content.isEmpty()
 
@@ -39,13 +44,15 @@ fun NoteView(
             .fillMaxWidth()
             .padding(vertical = 8.dp)
     ) {
-        Row {
+        Row(
+            verticalAlignment = Alignment.Top
+        ) {
             Column(
                 modifier = Modifier.weight(1f)
             ) {
 
                 Text(
-                    text = title,
+                    text = note.title,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                     style = MainTheme.typography.title,
@@ -57,10 +64,10 @@ fun NoteView(
                 Spacer(modifier = Modifier.height(6.dp))
 
                 Text(
-                    text = if (isContentBlank(content = content))
+                    text = if (isContentBlank(content = note.content))
                         stringResource(id = R.string.hint_no_content)
                     else
-                        content,
+                        note.content,
                     maxLines = 1,
                     style = MainTheme.typography.body,
                     color = MainTheme.colors.secondaryTextColor
@@ -69,11 +76,26 @@ fun NoteView(
                 Spacer(modifier = Modifier.height(6.dp))
 
                 Text(
-                    text = if (timestamp == 0.toLong()) "   " else PrettyTime().format(Date(timestamp)),
+                    text = if (note.timestamp == 0.toLong()) "   " else PrettyTime().format(Date(note.timestamp)),
                     style = MainTheme.typography.caption,
                     color = MainTheme.colors.secondaryTextColor
                 )
+            }
 
+            if (onPin != null){
+                IconButton(
+                    onClick = (onPin)
+                ) {
+                    Icon(
+                        painter = painterResource(
+                            id = if (note.pinned) R.drawable.ic_pinned else R.drawable.ic_unpinned
+                        ),
+                        contentDescription = stringResource(
+                            id = if (note.pinned) R.string.pinned else R.string.unpinned
+                        ),
+                        tint = MainTheme.colors.invertColor
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/components/SwipeToDismissNote.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/components/SwipeToDismissNote.kt
@@ -15,19 +15,15 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
 import com.vladshurakov.jetnotesapp.R
 import com.vladshurakov.jetnotesapp.feature_notes.domain.models.Note
 import com.vladshurakov.jetnotesapp.theme.MainTheme
-import com.vladshurakov.jetnotesapp.util.Screen
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SwipeToDismissNote(
-    dismissState: DismissState,
-    @DrawableRes starDrawable: Int,
-    note: Note,
-    navController: NavController
+    note: Note, onClick: () -> Unit = {}, onPin: (() -> Unit)? = null,
+    dismissState: DismissState, @DrawableRes starDrawable: Int,
 ) {
     SwipeToDismiss(
         state = dismissState,
@@ -66,14 +62,9 @@ fun SwipeToDismissNote(
         },
         dismissContent = {
             NoteView(
-                title = note.title,
-                content = note.content,
-                timestamp = note.timestamp,
-                onClick = {
-                    navController.navigate(
-                        Screen.AddEditNote.route + "?id=${note.id}"
-                    )
-                }
+                note = note,
+                onClick = (onClick),
+                onPin = (onPin)
             )
         }
     )
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/screen/ArchivedScreen.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/screen/ArchivedScreen.kt
@@ -23,6 +23,7 @@ import com.vladshurakov.jetnotesapp.feature_notes.presenter.viewmodel.ArchivedVi
 import com.vladshurakov.jetnotesapp.feature_notes.presenter.viewmodel.events.ArchivedEvent
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.ArchivedNotesTopBar
 import com.vladshurakov.jetnotesapp.theme.MainTheme
+import com.vladshurakov.jetnotesapp.util.Screen
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -49,8 +50,8 @@ fun ArchivedScreen(
             items(
                 items = archivedViewModel.state.value,
                 key = { archivedNote -> archivedNote.id.hashCode() }
-            ) { archivedNotes ->
-                val currentNote by rememberUpdatedState(archivedNotes)
+            ) { archivedNote ->
+                val currentNote by rememberUpdatedState(archivedNote)
                 val dismissState = rememberDismissState(
                     confirmValueChange = {
                         if (it == DismissValue.DismissedToStart) {
@@ -65,10 +66,12 @@ fun ArchivedScreen(
                 )
 
                 SwipeToDismissNote(
+                    note = currentNote,
+                    onClick = {
+                        navController.navigate(Screen.AddEditNote.route + "?id=${currentNote.id}")
+                    },
                     dismissState = dismissState,
                     starDrawable = R.drawable.ic_unarchive,
-                    note = archivedNotes,
-                    navController = navController
                 )
             }
         }
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/screen/DeletedScreen.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/screen/DeletedScreen.kt
@@ -26,6 +26,7 @@ import com.vladshurakov.jetnotesapp.feature_notes.presenter.viewmodel.events.Del
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.DeleteAlertDialog
 import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.DeletedNotesTopBar
 import com.vladshurakov.jetnotesapp.theme.MainTheme
+import com.vladshurakov.jetnotesapp.util.Screen
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -84,10 +85,12 @@ fun DeletedScreen(
                 )
 
                 SwipeToDismissNote(
+                    note = currentNote,
+                    onClick = {
+                        navController.navigate(Screen.AddEditNote.route + "?id=${currentNote.id}")
+                    },
                     dismissState = dismissState,
                     starDrawable = R.drawable.ic_restore,
-                    note = deletedNote,
-                    navController = navController
                 )
             }
         }
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/screen/NotesScreen.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/screen/NotesScreen.kt
@@ -42,7 +42,7 @@ import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.NotesT
 import com.vladshurakov.jetnotesapp.theme.MainTheme
 import com.vladshurakov.jetnotesapp.util.Screen
 
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class,)
+@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun NotesScreen(
     navController: NavController, notesViewModel: NotesViewModel = hiltViewModel()
@@ -53,8 +53,9 @@ fun NotesScreen(
     Scaffold(
         topBar = {
             NotesTopBar(
+                orderType = notesViewModel.notesState.value.orderType,
                 onSort = {
-                    notesViewModel.onEvent(NotesEvent.ChangeOrderType)
+                    notesViewModel.onEvent(NotesEvent.ToggleOrderType)
                 }
             ) {
                 navController.navigate(Screen.Settings.route)
@@ -146,8 +147,7 @@ fun NotesScreen(
                     confirmValueChange = {
                         if (it == DismissValue.DismissedToStart) {
                             notesViewModel.onEvent(NotesEvent.Delete(currentNote))
-                        }
-                        else if (it == DismissValue.DismissedToEnd) {
+                        } else if (it == DismissValue.DismissedToEnd) {
                             notesViewModel.onEvent(NotesEvent.Archive(currentNote))
                         }
                         true
@@ -156,10 +156,15 @@ fun NotesScreen(
                 )
 
                 SwipeToDismissNote(
+                    note = currentNote,
+                    onClick = {
+                        navController.navigate(Screen.AddEditNote.route + "?id=${currentNote.id}")
+                    },
+                    onPin = {
+                        notesViewModel.onEvent(NotesEvent.TogglePin(currentNote))
+                    },
                     dismissState = dismissState,
                     starDrawable = R.drawable.ic_archive,
-                    note = note,
-                    navController = navController
                 )
             }
         }
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/viewmodel/NotesViewModel.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/viewmodel/NotesViewModel.kt
@@ -43,7 +43,7 @@ class NotesViewModel @Inject constructor(
 
     fun onEvent(event: NotesEvent) {
         when (event) {
-            NotesEvent.ChangeOrderType -> {
+            NotesEvent.ToggleOrderType -> {
                 _notesState.value.orderType = when (_notesState.value.orderType) {
                     OrderType.Descending -> OrderType.Ascending
                     OrderType.Ascending -> OrderType.Descending
@@ -88,6 +88,14 @@ class NotesViewModel @Inject constructor(
                     notesUseCases.moveTo(event.note.id, Folder.ARCHIVED)
                 }
             }
+
+            is NotesEvent.TogglePin -> {
+                viewModelScope.launch {
+                    if (event.note.id == null)
+                        return@launch
+                    notesUseCases.updatePinned(event.note.id, event.note.pinned)
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/viewmodel/events/NotesEvent.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_notes/presenter/viewmodel/events/NotesEvent.kt
@@ -6,9 +6,10 @@ import com.vladshurakov.jetnotesapp.feature_notes.domain.models.Note
  * Event for the Notes screen
  */
 sealed interface NotesEvent {
-    data object ChangeOrderType: NotesEvent
+    data object ToggleOrderType: NotesEvent
+    data class Archive(val note: Note): NotesEvent
     data class Delete(val note: Note): NotesEvent
     data object GetNotes : NotesEvent
     data class Search(val value: String): NotesEvent
-    data class Archive(val note: Note): NotesEvent
+    data class TogglePin(val note: Note): NotesEvent
 }
diff --git a/app/src/main/java/com/vladshurakov/jetnotesapp/feature_settings/presenter/components/CustomTopAppBars.kt b/app/src/main/java/com/vladshurakov/jetnotesapp/feature_settings/presenter/components/CustomTopAppBars.kt
@@ -8,10 +8,13 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import com.vladshurakov.jetnotesapp.R
 import com.vladshurakov.jetnotesapp.theme.MainTheme
+import com.vladshurakov.jetnotesapp.util.OrderType
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -40,8 +43,9 @@ fun CustomTopAppBar(
 
 @Composable
 fun NotesTopBar(
+    orderType: OrderType,
     onSort: () -> Unit,
-    onSettings: () -> Unit
+    onSettings: () -> Unit,
 ) {
     CustomTopAppBar(
         title = stringResource(id = R.string.app_name),
@@ -50,9 +54,13 @@ fun NotesTopBar(
                 onClick = (onSort)
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.ic_order),
+                    painter = painterResource(id = R.drawable.ic_order),
                     contentDescription = stringResource(id = R.string.label_order),
-                    tint = MainTheme.colors.invertColor
+                    tint = MainTheme.colors.invertColor,
+                    modifier = Modifier
+                        .graphicsLayer(
+                            scaleY = if (orderType == OrderType.Descending) 1f else -1f
+                        )
                 )
             }
             IconButton(
diff --git a/app/src/main/res/drawable/ic_pinned.xml b/app/src/main/res/drawable/ic_pinned.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white"
+        android:fillType="evenOdd" android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unpinned.xml b/app/src/main/res/drawable/ic_unpinned.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M14,4v5c0,1.12 0.37,2.16 1,3H9c0.65,-0.86 1,-1.9 1,-3V4H14M17,2H7C6.45,2 6,2.45 6,3c0,0.55 0.45,1 1,1c0,0 0,0 0,0l1,0v5c0,1.66 -1.34,3 -3,3v2h5.97v7l1,1l1,-1v-7H19v-2c0,0 0,0 0,0c-1.66,0 -3,-1.34 -3,-3V4l1,0c0,0 0,0 0,0c0.55,0 1,-0.45 1,-1C18,2.45 17.55,2 17,2L17,2z"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -36,10 +36,12 @@
     <string name="label_light_theme">Light theme</string>
     <string name="label_dark_theme">Dark theme</string>
     <string name="label_about">About</string>
-    <string name="app_version">Version 1.1.1</string>
+    <string name="app_version">Version 1.1.2</string>
     <string name="empty">Empty</string>
     <string name="search">Search</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="archived_notes">Archived Notes</string>
     <string name="unarchive">Unarchive</string>
+    <string name="pinned">Pinned</string>
+    <string name="unpinned">Unpinned</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ package com.vladshurakov.jetnotesapp.feature_notes.domain.usecase`
`3`	`3`	`import com.vladshurakov.jetnotesapp.feature_notes.domain.repository.NotesRepository`
`4`	`4`
`5`	`5`	`class UpdatePinned(private val repository: NotesRepository) {`
`6`		`- suspend operator fun invoke(id: Long, pinned: Boolean) = repository.updatePinned(id, pinned)`
	`6`	`+ suspend operator fun invoke(id: Long, pinned: Boolean) = repository.updatePinned(id, !pinned)`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import com.vladshurakov.jetnotesapp.feature_notes.presenter.viewmodel.events.Del`
`26`	`26`	`import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.DeleteAlertDialog`
`27`	`27`	`import com.vladshurakov.jetnotesapp.feature_settings.presenter.components.DeletedNotesTopBar`
`28`	`28`	`import com.vladshurakov.jetnotesapp.theme.MainTheme`
	`29`	`+import com.vladshurakov.jetnotesapp.util.Screen`
`29`	`30`
`30`	`31`	`@OptIn(ExperimentalMaterial3Api::class)`
`31`	`32`	`@Composable`
`@@ -84,10 +85,12 @@ fun DeletedScreen(`
`84`	`85`	`)`
`85`	`86`
`86`	`87`	`SwipeToDismissNote(`
	`88`	`+ note = currentNote,`
	`89`	`+ onClick = {`
	`90`	`+ navController.navigate(Screen.AddEditNote.route + "?id=${currentNote.id}")`
	`91`	`+ },`
`87`	`92`	`dismissState = dismissState,`
`88`	`93`	`starDrawable = R.drawable.ic_restore,`
`89`		`- note = deletedNote,`
`90`		`- navController = navController`
`91`	`94`	`)`
`92`	`95`	`}`
`93`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class NotesViewModel @Inject constructor(`
`43`	`43`
`44`	`44`	`fun onEvent(event: NotesEvent) {`
`45`	`45`	`when (event) {`
`46`		`- NotesEvent.ChangeOrderType -> {`
	`46`	`+ NotesEvent.ToggleOrderType -> {`
`47`	`47`	`_notesState.value.orderType = when (_notesState.value.orderType) {`
`48`	`48`	`OrderType.Descending -> OrderType.Ascending`
`49`	`49`	`OrderType.Ascending -> OrderType.Descending`
`@@ -88,6 +88,14 @@ class NotesViewModel @Inject constructor(`
`88`	`88`	`notesUseCases.moveTo(event.note.id, Folder.ARCHIVED)`
`89`	`89`	`}`
`90`	`90`	`}`
	`91`	`+`
	`92`	`+ is NotesEvent.TogglePin -> {`
	`93`	`+ viewModelScope.launch {`
	`94`	`+ if (event.note.id == null)`
	`95`	`+ return@launch`
	`96`	`+ notesUseCases.updatePinned(event.note.id, event.note.pinned)`
	`97`	`+ }`
	`98`	`+ }`
`91`	`99`	`}`
`92`	`100`	`}`
`93`	`101`