Skip to content

Commit 1b15229

Browse files
HellBus1HellBus1
committed
Feat ui-redesign-1.3.0: Revamp the whole style to flat design
1 parent afeb818 commit 1b15229

13 files changed

Lines changed: 196 additions & 71 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ fun RichTextEditor(
6262
MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)
6363
}
6464
),
65-
shape = RoundedCornerShape(16.dp),
65+
shape = MaterialTheme.shapes.small,
6666
elevation = CardDefaults.cardElevation(
67-
defaultElevation = if (isEditing) 4.dp else 0.dp
67+
defaultElevation = 0.dp
6868
),
6969
border = BorderStroke(
70-
width = if (isEditing) 2.dp else 0.dp,
70+
width = if (isEditing) 1.dp else 0.dp,
7171
color = borderColor
7272
)
7373
) {

‎app/src/main/java/com/digiventure/ventnote/components/bottomSheet/RegularBottomSheet.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.material3.ModalBottomSheet
66
import androidx.compose.material3.SheetState
77
import androidx.compose.runtime.Composable
88
import androidx.compose.ui.Modifier
9+
import androidx.compose.ui.unit.dp
910

1011
@OptIn(ExperimentalMaterial3Api::class)
1112
@Composable
@@ -22,6 +23,8 @@ fun RegularBottomSheet(
2223
sheetState = bottomSheetState,
2324
modifier = modifier ?: Modifier,
2425
containerColor = MaterialTheme.colorScheme.background,
26+
tonalElevation = 0.dp,
27+
shape = MaterialTheme.shapes.large,
2528
) {
2629
content()
2730
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fun LoadingDialog(
3030
BasicAlertDialog(onDismissRequest = { onDismissCallback() },
3131
modifier = modifier,
3232
content = {
33-
Surface(shape = RoundedCornerShape(8.dp)) {
33+
Surface(shape = MaterialTheme.shapes.medium) {
3434
Row(
3535
modifier = Modifier.padding(16.dp),
3636
horizontalArrangement = Arrangement.Center,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fun TextDialog(
5353
if (onConfirmCallback != null) {
5454
TextButton(
5555
onClick = { onConfirmCallback() },
56-
shape = RoundedCornerShape(8.dp),
56+
shape = MaterialTheme.shapes.small,
5757
modifier = Modifier.semantics { testTag = TestTags.CONFIRM_BUTTON }
5858
) {
5959
Text(
@@ -68,7 +68,7 @@ fun TextDialog(
6868
dismissButton = {
6969
TextButton(
7070
onClick = { onDismissCallback() },
71-
shape = RoundedCornerShape(8.dp),
71+
shape = MaterialTheme.shapes.small,
7272
modifier = Modifier.semantics { testTag = TestTags.DISMISS_BUTTON }
7373
) {
7474
Text(
@@ -80,7 +80,7 @@ fun TextDialog(
8080
}
8181
},
8282
containerColor = MaterialTheme.colorScheme.surface,
83-
shape = RoundedCornerShape(16.dp),
83+
shape = MaterialTheme.shapes.medium,
8484
modifier = modifier
8585
)
8686
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ private fun SignedOutStateContent(
274274
colors = CardDefaults.cardColors(
275275
containerColor = MaterialTheme.colorScheme.primaryContainer
276276
),
277-
shape = CircleShape
277+
shape = MaterialTheme.shapes.extraLarge
278278
) {
279279
Box(
280280
modifier = Modifier.fillMaxSize(),

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ fun SignInButton(
6565
launcher.launch(authViewModel.getSignInIntent())
6666
},
6767
modifier = Modifier.height(56.dp),
68-
shape = RoundedCornerShape(16.dp),
68+
shape = MaterialTheme.shapes.medium,
6969
colors = ButtonDefaults.buttonColors(
7070
containerColor = MaterialTheme.colorScheme.primary,
7171
contentColor = MaterialTheme.colorScheme.onPrimary
7272
),
7373
elevation = ButtonDefaults.buttonElevation(
74-
defaultElevation = 4.dp,
75-
pressedElevation = 8.dp
74+
defaultElevation = 0.dp,
75+
pressedElevation = 0.dp
7676
),
7777
enabled = !isLoading
7878
) {

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

Lines changed: 38 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ import androidx.compose.material3.ButtonDefaults
2828
import androidx.compose.material3.Card
2929
import androidx.compose.material3.CardDefaults
3030
import androidx.compose.material3.CircularProgressIndicator
31-
import androidx.compose.material3.FilledTonalButton
3231
import androidx.compose.material3.Icon
32+
import androidx.compose.material3.IconButton
3333
import androidx.compose.material3.MaterialTheme
34-
import androidx.compose.material3.OutlinedButton
3534
import androidx.compose.material3.Text
3635
import androidx.compose.runtime.Composable
3736
import androidx.compose.runtime.LaunchedEffect
@@ -218,14 +217,14 @@ fun EmptyBackupListContainer(
218217
onBackupRequest()
219218
},
220219
modifier = Modifier.height(56.dp),
221-
shape = RoundedCornerShape(16.dp),
220+
shape = MaterialTheme.shapes.medium,
222221
colors = ButtonDefaults.buttonColors(
223222
containerColor = MaterialTheme.colorScheme.primary,
224223
contentColor = MaterialTheme.colorScheme.onPrimary
225224
),
226225
elevation = ButtonDefaults.buttonElevation(
227-
defaultElevation = 4.dp,
228-
pressedElevation = 8.dp
226+
defaultElevation = 0.dp,
227+
pressedElevation = 0.dp
229228
),
230229
) {
231230
Row(
@@ -265,14 +264,14 @@ fun BackupListContainer(
265264
onBackupRequest()
266265
},
267266
modifier = Modifier.fillMaxWidth().height(56.dp),
268-
shape = RoundedCornerShape(16.dp),
267+
shape = MaterialTheme.shapes.medium,
269268
colors = ButtonDefaults.buttonColors(
270269
containerColor = MaterialTheme.colorScheme.primary,
271270
contentColor = MaterialTheme.colorScheme.onPrimary
272271
),
273272
elevation = ButtonDefaults.buttonElevation(
274-
defaultElevation = 4.dp,
275-
pressedElevation = 8.dp
273+
defaultElevation = 0.dp,
274+
pressedElevation = 0.dp
276275
),
277276
) {
278277
Row(
@@ -301,14 +300,15 @@ fun BackupListContainer(
301300
modifier = Modifier
302301
.fillMaxWidth()
303302
.semantics { contentDescription = EMPTY_STRING },
304-
shape = RoundedCornerShape(16.dp),
303+
shape = MaterialTheme.shapes.medium,
305304
colors = CardDefaults.cardColors(
306305
containerColor = MaterialTheme.colorScheme.surface
307306
),
308307
elevation = CardDefaults.cardElevation(
309-
defaultElevation = 2.dp,
310-
hoveredElevation = 4.dp
311-
)
308+
defaultElevation = 0.dp,
309+
hoveredElevation = 0.dp
310+
),
311+
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant)
312312
) {
313313
Row(
314314
modifier = Modifier
@@ -332,37 +332,27 @@ fun BackupListContainer(
332332
Row(
333333
horizontalArrangement = Arrangement.spacedBy(8.dp)
334334
) {
335-
FilledTonalButton(
336-
onClick = { onRestoreRequest(file) },
337-
shape = RoundedCornerShape(12.dp),
338-
colors = ButtonDefaults.filledTonalButtonColors(
339-
containerColor = MaterialTheme.colorScheme.primaryContainer,
340-
contentColor = MaterialTheme.colorScheme.onPrimaryContainer
341-
),
342-
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp)
343-
) {
344-
Icon(
345-
imageVector = Icons.Filled.Refresh,
346-
contentDescription = stringResource(R.string.restore_icon),
347-
modifier = Modifier.size(18.dp)
348-
)
349-
}
350-
351-
OutlinedButton(
352-
onClick = { onDeleteRequest(file) },
353-
shape = RoundedCornerShape(12.dp),
354-
colors = ButtonDefaults.outlinedButtonColors(
355-
contentColor = MaterialTheme.colorScheme.error
356-
),
357-
border = BorderStroke(1.dp, MaterialTheme.colorScheme.error.copy(alpha = 0.5f)),
358-
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp)
359-
) {
360-
Icon(
361-
imageVector = Icons.Filled.Delete,
362-
contentDescription = stringResource(R.string.delete_icon),
363-
modifier = Modifier.size(18.dp)
364-
)
365-
}
335+
IconButton(
336+
onClick = { onRestoreRequest(file) }
337+
) {
338+
Icon(
339+
imageVector = Icons.Filled.Refresh,
340+
contentDescription = stringResource(R.string.restore_icon),
341+
tint = MaterialTheme.colorScheme.primary,
342+
modifier = Modifier.size(24.dp)
343+
)
344+
}
345+
346+
IconButton(
347+
onClick = { onDeleteRequest(file) }
348+
) {
349+
Icon(
350+
imageVector = Icons.Filled.Delete,
351+
contentDescription = stringResource(R.string.delete_icon),
352+
tint = MaterialTheme.colorScheme.error,
353+
modifier = Modifier.size(24.dp)
354+
)
355+
}
366356
}
367357
}
368358
}
@@ -416,10 +406,14 @@ fun BackupFailedContainer(
416406
onClick = {
417407
onGetBackupList()
418408
},
419-
shape = RoundedCornerShape(12.dp),
409+
shape = MaterialTheme.shapes.medium,
420410
colors = ButtonDefaults.buttonColors(
421411
containerColor = MaterialTheme.colorScheme.primary,
422412
contentColor = MaterialTheme.colorScheme.onPrimary
413+
),
414+
elevation = ButtonDefaults.buttonElevation(
415+
defaultElevation = 0.dp,
416+
pressedElevation = 0.dp
423417
)
424418
) {
425419
Icon(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fun NavDrawerItem(
3535
) {
3636
Box(
3737
modifier = Modifier
38-
.clip(RoundedCornerShape(8.dp))
38+
.clip(MaterialTheme.shapes.medium)
3939
.background(MaterialTheme.colorScheme.background)
4040
) {
4141
Box(modifier = Modifier.padding(8.dp)) {

‎app/src/main/java/com/digiventure/ventnote/feature/notes/NotesPage.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.material.icons.Icons
1515
import androidx.compose.material.icons.filled.Add
1616
import androidx.compose.material3.ExperimentalMaterial3Api
1717
import androidx.compose.material3.ExtendedFloatingActionButton
18+
import androidx.compose.material3.FloatingActionButtonDefaults
1819
import androidx.compose.material3.Icon
1920
import androidx.compose.material3.MaterialTheme
2021
import androidx.compose.material3.Scaffold
@@ -242,7 +243,9 @@ fun NotesPage(
242243
)
243244
},
244245
containerColor = MaterialTheme.colorScheme.primary,
245-
contentColor = MaterialTheme.colorScheme.onPrimary
246+
contentColor = MaterialTheme.colorScheme.onPrimary,
247+
elevation = FloatingActionButtonDefaults.elevation(0.dp,0.dp,0.dp,0.dp),
248+
shape = MaterialTheme.shapes.medium
246249
)
247250
}
248251
},

‎app/src/main/java/com/digiventure/ventnote/feature/notes/components/item/NoteItem.kt‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ fun NotesItem(
4141
onLongClick: () -> Unit,
4242
onCheckClick: () -> Unit
4343
) {
44-
val overallItemShape = RoundedCornerShape(16.dp)
45-
val titleContainerShape = RoundedCornerShape(12.dp)
46-
val descriptionContainerShape = RoundedCornerShape(10.dp)
44+
val overallItemShape = MaterialTheme.shapes.medium
45+
val titleContainerShape = MaterialTheme.shapes.small
46+
val descriptionContainerShape = MaterialTheme.shapes.small
4747

4848
Box(
4949
modifier = Modifier
5050
.fillMaxWidth()
5151
.semantics { contentDescription = "Note item ${data.id}" }
5252
.clip(overallItemShape)
53-
.background(MaterialTheme.colorScheme.surfaceContainerLow)
53+
.background(MaterialTheme.colorScheme.surface)
5454
.combinedClickable(
5555
onClick = { if (isMarking) onCheckClick() else onClick() },
5656
onLongClick = { onLongClick() }
@@ -59,8 +59,6 @@ fun NotesItem(
5959
Column(
6060
modifier = Modifier
6161
.fillMaxWidth()
62-
.clip(titleContainerShape)
63-
.background(MaterialTheme.colorScheme.surfaceContainerHighest)
6462
.padding(2.dp, 12.dp, 2.dp, 2.dp)
6563
) {
6664
Row(verticalAlignment = Alignment.CenterVertically) {
@@ -79,8 +77,8 @@ fun NotesItem(
7977
maxLines = 1,
8078
overflow = TextOverflow.Ellipsis,
8179
style = MaterialTheme.typography.titleMedium.copy(
82-
color = MaterialTheme.colorScheme.onSurfaceVariant,
83-
fontWeight = FontWeight.Medium,
80+
color = MaterialTheme.colorScheme.onSurface,
81+
fontWeight = FontWeight.SemiBold,
8482
),
8583
modifier = Modifier.padding(horizontal = 12.dp)
8684
)
@@ -91,8 +89,6 @@ fun NotesItem(
9189
Box(
9290
modifier = Modifier
9391
.fillMaxWidth()
94-
.clip(descriptionContainerShape)
95-
.background(MaterialTheme.colorScheme.surface)
9692
.padding(horizontal = 12.dp, vertical = 8.dp)
9793
) {
9894
Column {

0 commit comments

Comments
 (0)