Skip to content

Commit 28d7c47

Browse files
HellBus1HellBus1
authored
Merge pull request #76 from HellBus1/list-notes-ux-enhancement-1.3.0
Merge list notes and ux enhancement into 1.3.0
2 parents d5bcecf + 5d47975 commit 28d7c47

29 files changed

Lines changed: 367 additions & 147 deletions

File tree

‎app/src/main/java/com/digiventure/ventnote/commons/Constants.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ object Constants {
1111
const val COLOR_PALLET = "COLOR_PALLET"
1212
const val BACKUP_FILE_NAME = "backup"
1313
const val EMPTY_STRING = ""
14+
15+
const val VIEW_MODE_LIST = "LIST"
16+
const val VIEW_MODE_STAGGERED = "STAGGERED"
17+
const val NOTE_VIEW_MODE = "NOTE_VIEW_MODE"
1418
}
1519

1620
object ColorPalletName {

‎app/src/main/java/com/digiventure/ventnote/components/dialog/TextDialog.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.digiventure.ventnote.components.dialog
22

33
import androidx.compose.foundation.shape.RoundedCornerShape
44
import androidx.compose.material.icons.Icons
5-
import androidx.compose.material.icons.filled.Info
5+
import androidx.compose.material.icons.rounded.Info
66
import androidx.compose.material3.AlertDialog
77
import androidx.compose.material3.Icon
88
import androidx.compose.material3.MaterialTheme
@@ -32,7 +32,7 @@ fun TextDialog(
3232
onDismissRequest = { onDismissCallback() },
3333
icon = {
3434
Icon(
35-
imageVector = Icons.Default.Info,
35+
imageVector = Icons.Rounded.Info,
3636
contentDescription = null,
3737
tint = MaterialTheme.colorScheme.primary
3838
)

‎app/src/main/java/com/digiventure/ventnote/feature/backup/BackupPage.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.padding
1111
import androidx.compose.foundation.layout.size
1212
import androidx.compose.foundation.shape.CircleShape
1313
import androidx.compose.material.icons.Icons
14-
import androidx.compose.material.icons.filled.Lock
14+
import androidx.compose.material.icons.rounded.Lock
1515
import androidx.compose.material3.Card
1616
import androidx.compose.material3.CardDefaults
1717
import androidx.compose.material3.CircularProgressIndicator
@@ -281,7 +281,7 @@ private fun SignedOutStateContent(
281281
contentAlignment = Alignment.Center
282282
) {
283283
Icon(
284-
imageVector = Icons.Filled.Lock,
284+
imageVector = Icons.Rounded.Lock,
285285
contentDescription = null,
286286
modifier = Modifier.size(48.dp),
287287
tint = MaterialTheme.colorScheme.onPrimaryContainer

‎app/src/main/java/com/digiventure/ventnote/feature/backup/components/button/SignInButton.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import androidx.compose.foundation.layout.height
1616
import androidx.compose.foundation.layout.size
1717
import androidx.compose.foundation.shape.RoundedCornerShape
1818
import androidx.compose.material.icons.Icons
19-
import androidx.compose.material.icons.filled.Person
19+
import androidx.compose.material.icons.rounded.Person
2020
import androidx.compose.material3.Button
2121
import androidx.compose.material3.ButtonDefaults
2222
import androidx.compose.material3.CircularProgressIndicator
@@ -105,7 +105,7 @@ fun SignInButton(
105105
verticalAlignment = Alignment.CenterVertically
106106
) {
107107
Icon(
108-
imageVector = Icons.Filled.Person,
108+
imageVector = Icons.Rounded.Person,
109109
contentDescription = null,
110110
modifier = Modifier.size(20.dp)
111111
)

‎app/src/main/java/com/digiventure/ventnote/feature/backup/components/list/BackupFileList.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import androidx.compose.foundation.lazy.items
1919
import androidx.compose.foundation.shape.CircleShape
2020
import androidx.compose.foundation.shape.RoundedCornerShape
2121
import androidx.compose.material.icons.Icons
22-
import androidx.compose.material.icons.filled.Delete
23-
import androidx.compose.material.icons.filled.Refresh
24-
import androidx.compose.material.icons.filled.Share
25-
import androidx.compose.material.icons.filled.Warning
22+
import androidx.compose.material.icons.rounded.Delete
23+
import androidx.compose.material.icons.rounded.Refresh
24+
import androidx.compose.material.icons.rounded.Share
25+
import androidx.compose.material.icons.rounded.Warning
2626
import androidx.compose.material3.Button
2727
import androidx.compose.material3.ButtonDefaults
2828
import androidx.compose.material3.Card
@@ -184,7 +184,7 @@ fun EmptyBackupListContainer(
184184
contentAlignment = Alignment.Center
185185
) {
186186
Icon(
187-
imageVector = Icons.Filled.Warning,
187+
imageVector = Icons.Rounded.Warning,
188188
contentDescription = null,
189189
modifier = Modifier.size(48.dp),
190190
tint = MaterialTheme.colorScheme.onPrimaryContainer
@@ -232,7 +232,7 @@ fun EmptyBackupListContainer(
232232
verticalAlignment = Alignment.CenterVertically
233233
) {
234234
Icon(
235-
imageVector = Icons.Filled.Share,
235+
imageVector = Icons.Rounded.Share,
236236
contentDescription = null,
237237
modifier = Modifier.size(20.dp)
238238
)
@@ -279,7 +279,7 @@ fun BackupListContainer(
279279
verticalAlignment = Alignment.CenterVertically
280280
) {
281281
Icon(
282-
imageVector = Icons.Filled.Share,
282+
imageVector = Icons.Rounded.Share,
283283
contentDescription = null,
284284
modifier = Modifier.size(20.dp)
285285
)
@@ -336,7 +336,7 @@ fun BackupListContainer(
336336
onClick = { onRestoreRequest(file) }
337337
) {
338338
Icon(
339-
imageVector = Icons.Filled.Refresh,
339+
imageVector = Icons.Rounded.Refresh,
340340
contentDescription = stringResource(R.string.restore_icon),
341341
tint = MaterialTheme.colorScheme.primary,
342342
modifier = Modifier.size(24.dp)
@@ -347,7 +347,7 @@ fun BackupListContainer(
347347
onClick = { onDeleteRequest(file) }
348348
) {
349349
Icon(
350-
imageVector = Icons.Filled.Delete,
350+
imageVector = Icons.Rounded.Delete,
351351
contentDescription = stringResource(R.string.delete_icon),
352352
tint = MaterialTheme.colorScheme.error,
353353
modifier = Modifier.size(24.dp)
@@ -385,7 +385,7 @@ fun BackupFailedContainer(
385385
contentAlignment = Alignment.Center
386386
) {
387387
Icon(
388-
imageVector = Icons.Filled.Warning,
388+
imageVector = Icons.Rounded.Warning,
389389
contentDescription = null,
390390
modifier = Modifier.size(48.dp),
391391
tint = MaterialTheme.colorScheme.error
@@ -417,7 +417,7 @@ fun BackupFailedContainer(
417417
)
418418
) {
419419
Icon(
420-
imageVector = Icons.Filled.Refresh,
420+
imageVector = Icons.Rounded.Refresh,
421421
contentDescription = null,
422422
modifier = Modifier.size(18.dp)
423423
)

‎app/src/main/java/com/digiventure/ventnote/feature/backup/components/navbar/AppBar.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.digiventure.ventnote.feature.backup.components.navbar
22

33
import androidx.compose.foundation.layout.padding
44
import androidx.compose.material.icons.Icons
5-
import androidx.compose.material.icons.automirrored.filled.ArrowBack
6-
import androidx.compose.material.icons.filled.Lock
5+
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
6+
import androidx.compose.material.icons.rounded.Lock
77
import androidx.compose.material3.CenterAlignedTopAppBar
88
import androidx.compose.material3.ExperimentalMaterial3Api
99
import androidx.compose.material3.MaterialTheme
@@ -47,7 +47,7 @@ fun BackupPageAppBar(
4747
),
4848
navigationIcon = {
4949
TopNavBarIcon(
50-
Icons.AutoMirrored.Filled.ArrowBack,
50+
Icons.AutoMirrored.Rounded.ArrowBack,
5151
stringResource(R.string.backup_nav_icon),
5252
Modifier.semantics { }) {
5353
onBackRequest()
@@ -70,7 +70,7 @@ fun TrailingMenuIcons(
7070
onLogoutRequest: () -> Unit,
7171
) {
7272
TopNavBarIcon(
73-
Icons.Filled.Lock,
73+
Icons.Rounded.Lock,
7474
stringResource(R.string.logout_nav_icon),
7575
modifier = Modifier.semantics { }) {
7676
onLogoutRequest()

‎app/src/main/java/com/digiventure/ventnote/feature/drawer/NavDrawer.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import androidx.compose.foundation.layout.widthIn
1212
import androidx.compose.foundation.rememberScrollState
1313
import androidx.compose.foundation.verticalScroll
1414
import androidx.compose.material.icons.Icons
15-
import androidx.compose.material.icons.filled.Info
16-
import androidx.compose.material.icons.filled.Person
17-
import androidx.compose.material.icons.filled.Search
18-
import androidx.compose.material.icons.filled.Settings
19-
import androidx.compose.material.icons.filled.Share
20-
import androidx.compose.material.icons.filled.ThumbUp
15+
import androidx.compose.material.icons.rounded.Info
16+
import androidx.compose.material.icons.rounded.Person
17+
import androidx.compose.material.icons.rounded.Search
18+
import androidx.compose.material.icons.rounded.Settings
19+
import androidx.compose.material.icons.rounded.Share
20+
import androidx.compose.material.icons.rounded.ThumbUp
2121

2222
import androidx.compose.material3.DrawerDefaults
2323
import androidx.compose.material3.DrawerState
@@ -100,19 +100,19 @@ fun NavDrawer(
100100
) {
101101
SectionTitle(title = stringResource(id = R.string.about_us))
102102

103-
NavDrawerItem(leftIcon = Icons.Filled.ThumbUp,
103+
NavDrawerItem(leftIcon = Icons.Rounded.ThumbUp,
104104
title = stringResource(id = R.string.rate_app),
105105
subtitle = stringResource(id = R.string.rate_app_description),
106106
testTagName = TestTags.RATE_APP_TILE,
107107
onClick = { openPlayStore(context, appPath, onError) })
108108

109-
NavDrawerItem(leftIcon = Icons.Filled.Search,
109+
NavDrawerItem(leftIcon = Icons.Rounded.Search,
110110
title = stringResource(id = R.string.more_apps),
111111
subtitle = stringResource(id = R.string.more_apps_description),
112112
testTagName = TestTags.MORE_APPS_TILE,
113113
onClick = { openPlayStore(context, devPagePath, onError) })
114114

115-
NavDrawerItem(leftIcon = Icons.Filled.Info,
115+
NavDrawerItem(leftIcon = Icons.Rounded.Info,
116116
title = stringResource(id = R.string.app_version),
117117
subtitle = BuildConfig.VERSION_NAME,
118118
testTagName = TestTags.APP_VERSION_TILE,
@@ -121,15 +121,15 @@ fun NavDrawer(
121121
SectionTitle(title = stringResource(id = R.string.preferences))
122122

123123
NavDrawerColorPicker(
124-
leftIcon = Icons.Filled.Settings,
124+
leftIcon = Icons.Rounded.Settings,
125125
title = stringResource(id = R.string.theme_color),
126126
testTagName = TestTags.THEME_TILE
127127
) {
128128
themeViewModel.updateColorPallet(it.second)
129129
}
130130

131131
NavDrawerItemColorSchemeSwitch(
132-
leftIcon = Icons.Filled.Person,
132+
leftIcon = Icons.Rounded.Person,
133133
title = stringResource(id = R.string.theme_setting),
134134
currentScheme = currentSchemeName,
135135
testTagName = TestTags.COLOR_MODE_TILE
@@ -140,7 +140,7 @@ fun NavDrawer(
140140
SectionTitle(title = stringResource(id = R.string.settings))
141141

142142
NavDrawerItem(
143-
leftIcon = Icons.Filled.Share,
143+
leftIcon = Icons.Rounded.Share,
144144
title = stringResource(id = R.string.backup),
145145
subtitle = stringResource(id = R.string.backup_description),
146146
testTagName = TestTags.BACKUP_TILE,

‎app/src/main/java/com/digiventure/ventnote/feature/drawer/components/NavDrawerItemColorSchemeSwitch.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.padding
1010
import androidx.compose.foundation.layout.size
1111
import androidx.compose.foundation.shape.RoundedCornerShape
1212
import androidx.compose.material.icons.Icons
13-
import androidx.compose.material.icons.automirrored.filled.ArrowForward
13+
import androidx.compose.material.icons.automirrored.rounded.ArrowForward
1414
import androidx.compose.material3.Icon
1515
import androidx.compose.material3.MaterialTheme
1616
import androidx.compose.material3.Text
@@ -97,7 +97,7 @@ fun NavDrawerItemColorSchemeSwitch(
9797
}
9898

9999
Icon(
100-
Icons.AutoMirrored.Filled.ArrowForward,
100+
Icons.AutoMirrored.Rounded.ArrowForward,
101101
contentDescription = null,
102102
tint = MaterialTheme.colorScheme.onSurface,
103103
modifier = Modifier.size(20.dp)

‎app/src/main/java/com/digiventure/ventnote/feature/note_creation/components/navbar/AppBar.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.digiventure.ventnote.feature.note_creation.components.navbar
22

33
import androidx.compose.material.icons.Icons
4-
import androidx.compose.material.icons.automirrored.filled.ArrowBack
4+
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
55
import androidx.compose.material3.CenterAlignedTopAppBar
66
import androidx.compose.material3.ExperimentalMaterial3Api
77
import androidx.compose.material3.MaterialTheme
@@ -38,7 +38,7 @@ fun NoteCreationAppBar(
3838
containerColor = MaterialTheme.colorScheme.surface,
3939
),
4040
navigationIcon = {
41-
TopNavBarIcon(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.back_nav_icon), Modifier.semantics { testTag = TestTags.BACK_ICON_BUTTON }) {
41+
TopNavBarIcon(Icons.AutoMirrored.Rounded.ArrowBack, stringResource(R.string.back_nav_icon), Modifier.semantics { testTag = TestTags.BACK_ICON_BUTTON }) {
4242
onBackPressed()
4343
}
4444
},

‎app/src/main/java/com/digiventure/ventnote/feature/note_creation/components/navbar/EnhancedBottomAppBar.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.size
1515
import androidx.compose.foundation.layout.width
1616
import androidx.compose.foundation.shape.RoundedCornerShape
1717
import androidx.compose.material.icons.Icons
18-
import androidx.compose.material.icons.filled.Check
18+
import androidx.compose.material.icons.rounded.Check
1919
import androidx.compose.material3.BottomAppBar
2020
import androidx.compose.material3.ExperimentalMaterial3Api
2121
import androidx.compose.material3.Icon
@@ -62,7 +62,7 @@ fun EnhancedBottomAppBar(
6262
verticalAlignment = Alignment.CenterVertically
6363
) {
6464
EnhancedBottomBarButton(
65-
icon = Icons.Filled.Check,
65+
icon = Icons.Rounded.Check,
6666
label = stringResource(R.string.save),
6767
onClick = onSaveClick,
6868
containerColor = MaterialTheme.colorScheme.primaryContainer,

0 commit comments

Comments
 (0)