From d150bc3e8fc11e57d3cd5867a7f671f0d992ff55 Mon Sep 17 00:00:00 2001 From: Sanju S Date: Fri, 26 Nov 2021 09:49:46 +0530 Subject: [PATCH] Update `Dimensions & Shapes` Signed-off-by: Sanju S --- .idea/misc.xml | 10 ++++++ .../einsen/components/BottomCTA.kt | 9 +++-- .../spikeysanju/einsen/components/Button.kt | 6 ++-- .../spikeysanju/einsen/components/ChipView.kt | 20 ++++++++--- .../einsen/components/DashboardCard.kt | 29 +++++++-------- .../spikeysanju/einsen/components/InfoCard.kt | 3 +- .../einsen/components/ItemProjectCard.kt | 10 +++--- .../einsen/components/TextInput.kt | 19 +++++++--- .../einsen/ui/theme/apptheme/AppTheme.kt | 14 +++++++- .../einsen/ui/theme/color/AppColors.kt | 2 +- .../ui/theme/dimensions/AppDimensions.kt | 5 ++- .../ui/theme/shape/{Shape.kt => AppShapes.kt} | 15 ++++---- .../ui/theme/typography/AppTypography.kt | 2 +- .../einsen/view/about/AboutScreen.kt | 18 +++++----- .../einsen/view/add/AddTaskScreen.kt | 28 +++++++-------- .../animationviewstate/AnimationViewState.kt | 6 ++-- .../einsen/view/dashboard/DashboardScreen.kt | 2 +- .../einsen/view/details/TaskDetailScreen.kt | 18 +++++----- .../einsen/view/edit/EditTaskScreen.kt | 36 +++++++++---------- .../einsen/view/project/ProjectScreen.kt | 2 +- .../einsen/view/task/AllTaskScreen.kt | 2 +- .../einsen/view/webview/WebViewScreen.kt | 2 +- 22 files changed, 157 insertions(+), 101 deletions(-) rename app/src/main/java/dev/spikeysanju/einsen/ui/theme/shape/{Shape.kt => AppShapes.kt} (70%) diff --git a/.idea/misc.xml b/.idea/misc.xml index 560993e..2eaa67a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -61,6 +61,16 @@ + + + + + + + + + + diff --git a/app/src/main/java/dev/spikeysanju/einsen/components/BottomCTA.kt b/app/src/main/java/dev/spikeysanju/einsen/components/BottomCTA.kt index 10859b2..13bc9e5 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/components/BottomCTA.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/components/BottomCTA.kt @@ -74,12 +74,17 @@ fun BottomCTA( contentAlignment = Alignment.Center ) { Row( - modifier = modifier.padding(top = 12.dp, bottom = 12.dp, start = 16.dp, end = 16.dp), + modifier = modifier.padding( + top = AppTheme.dimensions.paddingLarge, + bottom = AppTheme.dimensions.paddingLarge, + start = AppTheme.dimensions.paddingXL, + end = AppTheme.dimensions.paddingXL + ), horizontalArrangement = Arrangement.SpaceAround, verticalAlignment = Alignment.CenterVertically ) { ActionIcons(onEdit = { onEdit() }, onDelete = { onDelete() }, onShare = { onShare() }) - Spacer(modifier = modifier.width(12.dp)) + Spacer(modifier = modifier.width(AppTheme.dimensions.paddingLarge)) Row(modifier = modifier.fillMaxWidth(), Arrangement.End) { PrimaryButtonWithIcon( diff --git a/app/src/main/java/dev/spikeysanju/einsen/components/Button.kt b/app/src/main/java/dev/spikeysanju/einsen/components/Button.kt index 6524bc3..119b049 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/components/Button.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/components/Button.kt @@ -56,7 +56,7 @@ fun PrimaryButton(modifier: Modifier = Modifier, title: String, onclick: () -> U .fillMaxWidth() .height(54.dp) .clip(RoundedCornerShape(60.dp)) - .padding(start = 20.dp, end = 20.dp), + .padding(start = AppTheme.dimensions.paddingXL, end = AppTheme.dimensions.paddingXL), onClick = { onclick() }, colors = ButtonDefaults.buttonColors( backgroundColor = AppTheme.colors.primary, @@ -100,7 +100,7 @@ fun PrimaryButtonWithIcon( tint = Color.White ) - Spacer(modifier = modifier.width(12.dp)) + Spacer(modifier = modifier.width(AppTheme.dimensions.paddingLarge)) Text( text = title, @@ -124,7 +124,7 @@ fun ButtonPreview() { color = AppTheme.colors.primary ) - Spacer(modifier = Modifier.height(12.dp)) + Spacer(modifier = Modifier.height(AppTheme.dimensions.paddingLarge)) PrimaryButton(title = "Save Task") { // onclick action goes here diff --git a/app/src/main/java/dev/spikeysanju/einsen/components/ChipView.kt b/app/src/main/java/dev/spikeysanju/einsen/components/ChipView.kt index 73385e1..50f8eb9 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/components/ChipView.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/components/ChipView.kt @@ -36,7 +36,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp import dev.spikeysanju.einsen.ui.theme.apptheme.AppTheme /** @@ -55,11 +54,17 @@ fun ChipView( .wrapContentWidth() .animateContentSize() .clickable(onClick = onClick) - .clip(RoundedCornerShape(12.dp)) + .clip(RoundedCornerShape(AppTheme.shapes.shapeLarge)) .background(AppTheme.colors.primary) ) { Text( - text = title, modifier = modifier.padding(12.dp, 6.dp, 12.dp, 6.dp), + text = title, + modifier = modifier.padding( + AppTheme.dimensions.paddingLarge, + AppTheme.dimensions.paddingSmall, + AppTheme.dimensions.paddingLarge, + AppTheme.dimensions.paddingSmall + ), style = AppTheme.typography.overline, color = AppTheme.colors.white ) @@ -83,12 +88,17 @@ fun SmallChipView( .wrapContentWidth() .animateContentSize() .clickable(onClick = onClick) - .clip(RoundedCornerShape(12.dp)) + .clip(RoundedCornerShape(AppTheme.shapes.shapeLarge)) .background(color = color.copy(0.10F)) ) { Text( text = title, - modifier = modifier.padding(start = 6.dp, end = 6.dp, top = 4.dp, bottom = 4.dp), + modifier = modifier.padding( + start = AppTheme.dimensions.paddingSmall, + end = AppTheme.dimensions.paddingSmall, + top = AppTheme.dimensions.paddingSmall, + bottom = AppTheme.dimensions.paddingSmall + ), style = MaterialTheme.typography.overline, color = color ) diff --git a/app/src/main/java/dev/spikeysanju/einsen/components/DashboardCard.kt b/app/src/main/java/dev/spikeysanju/einsen/components/DashboardCard.kt index 1a5678b..b1c8824 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/components/DashboardCard.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/components/DashboardCard.kt @@ -28,7 +28,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Text @@ -39,7 +38,6 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp import dev.spikeysanju.einsen.ui.theme.apptheme.AppTheme import dev.spikeysanju.einsen.utils.coloredShadow @@ -62,21 +60,21 @@ fun DashboardCardItem( ) { val gradientBrush = Brush.verticalGradient(listOf(color.copy(.8F), color), startY = 10F) - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) Row( modifier = modifier .fillMaxWidth() - .padding(start = 16.dp, end = 16.dp) + .padding(start = AppTheme.dimensions.paddingXL, end = AppTheme.dimensions.paddingXL) .coloredShadow( color, alpha = 0.4F, - borderRadius = AppTheme.dimensions.paddingExtraLarge, + borderRadius = AppTheme.dimensions.paddingXXL, shadowRadius = AppTheme.dimensions.paddingMedium, - offsetX = 0.dp, - offsetY = 4.dp + offsetX = AppTheme.dimensions.paddingNone, + offsetY = AppTheme.dimensions.paddingSmall ) - .clip(RoundedCornerShape(24.dp)) + .clip(RoundedCornerShape(AppTheme.shapes.shapeXL)) .background(brush = gradientBrush) .clickable { onClick() @@ -87,14 +85,17 @@ fun DashboardCardItem( Column( modifier = modifier .wrapContentWidth() - .padding(top = 36.dp, bottom = 36.dp) + .padding( + top = AppTheme.dimensions.paddingXXXL, + bottom = AppTheme.dimensions.paddingXXXL + ) .align(Alignment.CenterVertically) ) { Text(text = title, style = AppTheme.typography.h2, color = Color.White) - Spacer(modifier = modifier.height(16.dp)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXL)) Text(text = description, style = AppTheme.typography.subtitle, color = Color.White) } - Spacer(modifier = modifier.width(16.dp)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXL)) Text(text = count, style = AppTheme.typography.bigTitle, color = Color.White) } } @@ -113,7 +114,7 @@ fun DashboardPreview() { ) { // click action goes here } - Spacer(modifier = Modifier.height(12.dp)) + Spacer(modifier = Modifier.height(AppTheme.dimensions.paddingLarge)) DashboardCardItem( title = "Decide when to do", description = "Important not Urgent", @@ -123,7 +124,7 @@ fun DashboardPreview() { // click action goes here } - Spacer(modifier = Modifier.height(12.dp)) + Spacer(modifier = Modifier.height(AppTheme.dimensions.paddingLarge)) DashboardCardItem( title = "Delegate it", description = "Urgent not Important", @@ -133,7 +134,7 @@ fun DashboardPreview() { // click action goes here } - Spacer(modifier = Modifier.height(12.dp)) + Spacer(modifier = Modifier.height(AppTheme.dimensions.paddingLarge)) DashboardCardItem( title = "Dump it", description = "Not Important & Not Urgent", diff --git a/app/src/main/java/dev/spikeysanju/einsen/components/InfoCard.kt b/app/src/main/java/dev/spikeysanju/einsen/components/InfoCard.kt index cae7612..7bc50ef 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/components/InfoCard.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/components/InfoCard.kt @@ -38,7 +38,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp import dev.spikeysanju.einsen.R import dev.spikeysanju.einsen.ui.theme.apptheme.AppTheme @@ -52,7 +51,7 @@ import dev.spikeysanju.einsen.ui.theme.apptheme.AppTheme fun InfoCard(title: String, value: String, modifier: Modifier) { Box( modifier = modifier - .clip(RoundedCornerShape(12.dp)) + .clip(RoundedCornerShape(AppTheme.shapes.shapeLarge)) .background(color = AppTheme.colors.card) .padding( AppTheme.dimensions.paddingLarge diff --git a/app/src/main/java/dev/spikeysanju/einsen/components/ItemProjectCard.kt b/app/src/main/java/dev/spikeysanju/einsen/components/ItemProjectCard.kt index 80f8b36..5ba6dbd 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/components/ItemProjectCard.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/components/ItemProjectCard.kt @@ -48,16 +48,18 @@ fun ItemWorkspaceCard( Card( modifier = modifier .fillMaxWidth() - .padding(12.dp) + .padding(AppTheme.dimensions.paddingLarge) .clickable { onCardClick() }, - backgroundColor = AppTheme.colors.card, shape = RoundedCornerShape(24.dp), elevation = 0.dp + backgroundColor = AppTheme.colors.card, + shape = RoundedCornerShape(AppTheme.shapes.shapeXL), + elevation = 0.dp ) { Column( modifier = modifier .fillMaxWidth() - .padding(24.dp), + .padding(AppTheme.dimensions.paddingXXL), horizontalAlignment = Alignment.Start ) { EmojiTextView(emoji = emoji) @@ -69,7 +71,7 @@ fun ItemWorkspaceCard( style = AppTheme.typography.caption, color = AppTheme.colors.text ) - Spacer(modifier = modifier.height(16.dp)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXL)) SmallChipView(title = tag, color = AppTheme.colors.information) { onChipViewClick() } diff --git a/app/src/main/java/dev/spikeysanju/einsen/components/TextInput.kt b/app/src/main/java/dev/spikeysanju/einsen/components/TextInput.kt index bc4e343..aad36bd 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/components/TextInput.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/components/TextInput.kt @@ -43,7 +43,6 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp import dev.spikeysanju.einsen.ui.theme.apptheme.AppTheme /** @@ -86,7 +85,10 @@ fun EinsenInputTextField( TextField( modifier = modifier .fillMaxWidth() - .padding(start = 20.dp, end = 20.dp), + .padding( + start = AppTheme.dimensions.paddingXL, + end = AppTheme.dimensions.paddingXL + ), value = value, readOnly = readOnly, enabled = enabled, @@ -136,7 +138,11 @@ fun EinsenInputTextField( errorMessage, style = AppTheme.typography.caption, color = AppTheme.colors.error, - modifier = modifier.padding(top = 12.dp, start = 16.dp, end = 16.dp) + modifier = modifier.padding( + top = AppTheme.dimensions.paddingLarge, + start = AppTheme.dimensions.paddingXL, + end = AppTheme.dimensions.paddingLarge + ) ) } } @@ -156,7 +162,10 @@ fun EinsenInputTextFieldWithoutHint( TextField( modifier = modifier .fillMaxWidth() - .padding(start = 20.dp, end = 20.dp), + .padding( + start = AppTheme.dimensions.paddingXL, + end = AppTheme.dimensions.paddingXL + ), value = value, onValueChange = { onValueChanged(it) @@ -200,7 +209,7 @@ fun TextInputPreview() { } ) - Spacer(modifier = Modifier.height(12.dp)) + Spacer(modifier = Modifier.height(AppTheme.dimensions.paddingLarge)) EinsenInputTextFieldWithoutHint( title = "Description", value = "Einsen Architecture is really cool!", diff --git a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/apptheme/AppTheme.kt b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/apptheme/AppTheme.kt index 2d201de..7549129 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/apptheme/AppTheme.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/apptheme/AppTheme.kt @@ -27,6 +27,8 @@ import dev.spikeysanju.einsen.ui.theme.color.AppColors import dev.spikeysanju.einsen.ui.theme.color.LocalColors import dev.spikeysanju.einsen.ui.theme.dimensions.AppDimensions import dev.spikeysanju.einsen.ui.theme.dimensions.LocalDimensions +import dev.spikeysanju.einsen.ui.theme.shape.AppShapes +import dev.spikeysanju.einsen.ui.theme.shape.LocalShapes import dev.spikeysanju.einsen.ui.theme.typography.AppTypography import dev.spikeysanju.einsen.ui.theme.typography.LocalTypography @@ -56,6 +58,14 @@ object AppTheme { @ReadOnlyComposable get() = LocalDimensions.current + /** + * Get [LocalShapes] from the AppShapes + */ + val shapes: AppShapes + @Composable + @ReadOnlyComposable + get() = LocalShapes.current + /** * [Einsen] application custom theme */ @@ -64,6 +74,7 @@ object AppTheme { colors: AppColors = AppTheme.colors, typography: AppTypography = AppTheme.typography, dimensions: AppDimensions = AppTheme.dimensions, + shapes: AppShapes = AppTheme.shapes, content: @Composable () -> Unit ) { @@ -77,7 +88,8 @@ object AppTheme { CompositionLocalProvider( LocalColors provides rememberColors, LocalTypography provides typography, - LocalDimensions provides dimensions + LocalDimensions provides dimensions, + LocalShapes provides shapes ) { content() } diff --git a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/color/AppColors.kt b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/color/AppColors.kt index cbbaa99..0b813cc 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/color/AppColors.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/color/AppColors.kt @@ -181,4 +181,4 @@ fun darkColors( isLight = false ) -val LocalColors = staticCompositionLocalOf { lightColors() } +internal val LocalColors = staticCompositionLocalOf { lightColors() } diff --git a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/dimensions/AppDimensions.kt b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/dimensions/AppDimensions.kt index 39cfc57..215b401 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/dimensions/AppDimensions.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/dimensions/AppDimensions.kt @@ -24,10 +24,13 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp data class AppDimensions( + val paddingNone: Dp = 0.dp, val paddingSmall: Dp = 4.dp, val paddingMedium: Dp = 8.dp, val paddingLarge: Dp = 12.dp, - val paddingExtraLarge: Dp = 24.dp + val paddingXL: Dp = 16.dp, + val paddingXXL: Dp = 24.dp, + val paddingXXXL: Dp = 36.dp ) internal val LocalDimensions = staticCompositionLocalOf { AppDimensions() } diff --git a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/shape/Shape.kt b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/shape/AppShapes.kt similarity index 70% rename from app/src/main/java/dev/spikeysanju/einsen/ui/theme/shape/Shape.kt rename to app/src/main/java/dev/spikeysanju/einsen/ui/theme/shape/AppShapes.kt index 26da318..4b9b499 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/shape/Shape.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/shape/AppShapes.kt @@ -19,12 +19,15 @@ package dev.spikeysanju.einsen.ui.theme.shape -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Shapes +import androidx.compose.runtime.staticCompositionLocalOf +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -val Shapes = Shapes( - small = RoundedCornerShape(4.dp), - medium = RoundedCornerShape(4.dp), - large = RoundedCornerShape(12.dp), +data class AppShapes( + val shapeSmall: Dp = 4.dp, + val shapeMedium: Dp = 8.dp, + val shapeLarge: Dp = 12.dp, + val shapeXL: Dp = 24.dp ) + +internal val LocalShapes = staticCompositionLocalOf { AppShapes() } diff --git a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/typography/AppTypography.kt b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/typography/AppTypography.kt index 1eb1199..0b0e829 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/ui/theme/typography/AppTypography.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/ui/theme/typography/AppTypography.kt @@ -87,4 +87,4 @@ data class AppTypography( ) -val LocalTypography = staticCompositionLocalOf { AppTypography() } +internal val LocalTypography = staticCompositionLocalOf { AppTypography() } diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/about/AboutScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/about/AboutScreen.kt index 014bdfc..1860311 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/about/AboutScreen.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/about/AboutScreen.kt @@ -61,6 +61,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.core.os.bundleOf import com.google.firebase.analytics.FirebaseAnalytics import dev.spikeysanju.einsen.BuildConfig @@ -107,7 +108,7 @@ fun AboutScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainActio style = AppTheme.typography.h2, textAlign = TextAlign.Start, color = AppTheme.colors.text, - modifier = modifier.padding(start = 16.dp) + modifier = modifier.padding(start = AppTheme.dimensions.paddingXL) ) }, navigationIcon = { @@ -129,7 +130,7 @@ fun AboutScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainActio val listState = rememberLazyListState() LazyColumn( state = listState, - contentPadding = PaddingValues(16.dp), + contentPadding = PaddingValues(AppTheme.dimensions.paddingXL), modifier = modifier .fillMaxSize() .background( @@ -151,7 +152,7 @@ fun AboutScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainActio } item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) val (version, code) = getVersionCodeAndName() TitleAndDescription( modifier, @@ -161,7 +162,7 @@ fun AboutScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainActio } item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) TitleAndDescription( title = stringResource(R.string.text_attribution_and_license), description = stringResource( @@ -174,7 +175,7 @@ fun AboutScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainActio url = stringResource(id = R.string.text_repo_link) title = stringResource(id = R.string.text_visit) - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) TitleAndURL( title = stringResource(R.string.text_visit), url = url, @@ -212,11 +213,11 @@ fun TitleAndDescription(modifier: Modifier = Modifier, title: String, descriptio color = AppTheme.colors.text, fontWeight = FontWeight.Bold ) - Spacer(modifier = modifier.height(8.dp)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingMedium)) CompositionLocalProvider(values = arrayOf(LocalContentAlpha provides ContentAlpha.disabled)) { Text( text = description, - style = AppTheme.typography.subtitle, + style = AppTheme.typography.body, color = AppTheme.colors.text ) } @@ -236,7 +237,7 @@ fun TitleAndURL(modifier: Modifier = Modifier, title: String, url: String, onCli color = AppTheme.colors.text, fontWeight = FontWeight.Bold ) - Spacer(modifier = modifier.height(8.dp)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingMedium)) CompositionLocalProvider(values = arrayOf(LocalContentAlpha provides ContentAlpha.disabled)) { Text( text = AnnotatedString( @@ -246,6 +247,7 @@ fun TitleAndURL(modifier: Modifier = Modifier, title: String, url: String, onCli fontFamily = FontFamily( Font(R.font.avenir_medium, FontWeight.Medium) ), + fontSize = 14.sp, textDecoration = TextDecoration.Underline ) ), diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/add/AddTaskScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/add/AddTaskScreen.kt index 5527ec0..c735429 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/add/AddTaskScreen.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/add/AddTaskScreen.kt @@ -138,7 +138,7 @@ fun AddTaskScreen( style = AppTheme.typography.h2, textAlign = TextAlign.Start, color = AppTheme.colors.text, - modifier = modifier.padding(start = 16.dp) + modifier = modifier.padding(start = AppTheme.dimensions.paddingLarge) ) }, navigationIcon = { @@ -158,7 +158,7 @@ fun AddTaskScreen( LazyColumn( state = listState, - contentPadding = PaddingValues(bottom = AppTheme.dimensions.paddingExtraLarge), + contentPadding = PaddingValues(bottom = AppTheme.dimensions.paddingXXL), modifier = modifier .background( AppTheme.colors.background @@ -168,7 +168,7 @@ fun AddTaskScreen( // Emoji item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) Box( modifier = modifier.fillMaxWidth(), contentAlignment = Alignment.Center @@ -193,7 +193,7 @@ fun AddTaskScreen( // Title item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) EinsenInputTextField( title = stringResource(R.string.text_title), value = taskState.title @@ -204,7 +204,7 @@ fun AddTaskScreen( // Description item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) EinsenInputTextField( title = stringResource(R.string.text_description), value = taskState.description @@ -215,7 +215,7 @@ fun AddTaskScreen( // Category item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) EinsenInputTextField( title = stringResource(R.string.text_category), value = taskState.category @@ -226,7 +226,7 @@ fun AddTaskScreen( // Due Date Time item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) EinsenInputTextField( modifier = Modifier.clickable { val calendar = getCalendar(taskState.due) @@ -247,11 +247,11 @@ fun AddTaskScreen( // Urgency item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) Column( modifier = modifier.padding( - start = AppTheme.dimensions.paddingExtraLarge, - end = AppTheme.dimensions.paddingExtraLarge + start = AppTheme.dimensions.paddingXXL, + end = AppTheme.dimensions.paddingXXL ) ) { Text( @@ -269,11 +269,11 @@ fun AddTaskScreen( // Importance item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) Column( modifier = modifier.padding( - start = AppTheme.dimensions.paddingExtraLarge, - end = AppTheme.dimensions.paddingExtraLarge + start = AppTheme.dimensions.paddingXXL, + end = AppTheme.dimensions.paddingXXL ) ) { Text( @@ -291,7 +291,7 @@ fun AddTaskScreen( // Save Task CTA item { - Spacer(modifier = modifier.height(36.dp)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXXL)) PrimaryButton(title = stringResource(R.string.text_save_task)) { // calculate the average value by adding urgency + priority / 2 diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/animationviewstate/AnimationViewState.kt b/app/src/main/java/dev/spikeysanju/einsen/view/animationviewstate/AnimationViewState.kt index ba65f5d..9dc60ca 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/animationviewstate/AnimationViewState.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/animationviewstate/AnimationViewState.kt @@ -119,15 +119,15 @@ fun LottieAnimationPlaceHolder( modifier = modifier .fillMaxWidth() .padding( - start = AppTheme.dimensions.paddingExtraLarge, - end = AppTheme.dimensions.paddingExtraLarge + start = AppTheme.dimensions.paddingXXL, + end = AppTheme.dimensions.paddingXXL ), style = AppTheme.typography.body, maxLines = 3, textAlign = TextAlign.Center, color = AppTheme.colors.text.copy(.7F) ) - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) Button( onClick = { actions() }, colors = ButtonDefaults.buttonColors( diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/dashboard/DashboardScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/dashboard/DashboardScreen.kt index 16784d6..1103ae3 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/dashboard/DashboardScreen.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/dashboard/DashboardScreen.kt @@ -141,7 +141,7 @@ fun DashboardScreen( floatingActionButton = { FloatingActionButton( - modifier = modifier.padding(30.dp), + modifier = modifier.padding(AppTheme.dimensions.paddingXXXL), onClick = { actions.gotoAddTask.invoke(0, 0).run { // log event to firebase diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/details/TaskDetailScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/details/TaskDetailScreen.kt index 3f1054e..bd5b782 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/details/TaskDetailScreen.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/details/TaskDetailScreen.kt @@ -258,14 +258,14 @@ fun TaskDetailsScreen( modifier = modifier .fillMaxWidth() .padding( - start = 16.dp, - end = 16.dp, - bottom = AppTheme.dimensions.paddingExtraLarge, - top = AppTheme.dimensions.paddingExtraLarge + start = AppTheme.dimensions.paddingXL, + end = AppTheme.dimensions.paddingXL, + bottom = AppTheme.dimensions.paddingXXL, + top = AppTheme.dimensions.paddingXXL ) ) { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) // Emoji view Box( @@ -279,7 +279,7 @@ fun TaskDetailsScreen( ) } - Spacer(modifier = modifier.height(16.dp)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXL)) // Category chip ChipView( @@ -289,7 +289,7 @@ fun TaskDetailsScreen( } ) - Spacer(modifier = modifier.height(16.dp)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXL)) // Title Text( @@ -299,7 +299,7 @@ fun TaskDetailsScreen( color = AppTheme.colors.text ) - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) // Description Text( @@ -309,7 +309,7 @@ fun TaskDetailsScreen( color = AppTheme.colors.text ) - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) // Priority score card Row( diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/edit/EditTaskScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/edit/EditTaskScreen.kt index a7e6071..2b31a8b 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/edit/EditTaskScreen.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/edit/EditTaskScreen.kt @@ -126,7 +126,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc style = AppTheme.typography.h1, textAlign = TextAlign.Start, color = AppTheme.colors.text, - modifier = Modifier.padding(start = 16.dp) + modifier = Modifier.padding(start = AppTheme.dimensions.paddingXL) ) }, navigationIcon = { @@ -228,7 +228,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc LazyColumn( state = listState, - contentPadding = PaddingValues(bottom = AppTheme.dimensions.paddingExtraLarge), + contentPadding = PaddingValues(bottom = AppTheme.dimensions.paddingXXL), modifier = modifier .fillMaxSize() .background( @@ -238,7 +238,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc // Emoji item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) Box( modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center @@ -266,7 +266,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc // Title item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) EinsenInputTextField( title = stringResource(R.string.text_title), value = titleState @@ -277,7 +277,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc // Description item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) EinsenInputTextField( title = stringResource(R.string.text_description), value = descriptionState @@ -288,7 +288,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc // Category item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) EinsenInputTextField( title = stringResource(R.string.text_category), value = categoryState @@ -299,7 +299,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc // Due Date Time item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) EinsenInputTextField( modifier = Modifier.clickable { val calendar = getCalendar(dueState) @@ -323,11 +323,11 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc // Urgency item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) Column( modifier = Modifier.padding( - start = AppTheme.dimensions.paddingExtraLarge, - end = AppTheme.dimensions.paddingExtraLarge + start = AppTheme.dimensions.paddingXXL, + end = AppTheme.dimensions.paddingXXL ) ) { Text( @@ -345,11 +345,11 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc // Importance item { - Spacer(modifier = modifier.height(AppTheme.dimensions.paddingExtraLarge)) + Spacer(modifier = modifier.height(AppTheme.dimensions.paddingXXL)) Column( modifier = Modifier.padding( - start = AppTheme.dimensions.paddingExtraLarge, - end = AppTheme.dimensions.paddingExtraLarge + start = AppTheme.dimensions.paddingXXL, + end = AppTheme.dimensions.paddingXXL ) ) { Text( @@ -357,7 +357,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc style = AppTheme.typography.subtitle, color = AppTheme.colors.text ) - Spacer(modifier = Modifier.height(12.dp)) + Spacer(modifier = Modifier.height(AppTheme.dimensions.paddingLarge)) EinsenStepSlider(modifier, points, importanceState.toFloat()) { importanceState = it @@ -368,7 +368,7 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc // Update Task CTA item { - Spacer(modifier = Modifier.height(36.dp)) + Spacer(modifier = Modifier.height(AppTheme.dimensions.paddingXXL)) PrimaryButton(title = stringResource(R.string.text_save_task)) { // calculate the average value by adding urgency + priority / 2 @@ -426,9 +426,9 @@ fun EditTaskScreen(modifier: Modifier, viewModel: MainViewModel, actions: MainAc internal fun BottomSheetTitle() { Text( modifier = Modifier.padding( - start = 16.dp, - top = 16.dp, - bottom = AppTheme.dimensions.paddingExtraLarge + start = AppTheme.dimensions.paddingXL, + top = AppTheme.dimensions.paddingXL, + bottom = AppTheme.dimensions.paddingXXL ), text = stringResource(R.string.tetxt_choose_emoji), style = AppTheme.typography.h1, diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/project/ProjectScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/project/ProjectScreen.kt index 4bee4a6..45a36cc 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/project/ProjectScreen.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/project/ProjectScreen.kt @@ -124,7 +124,7 @@ fun ProjectScreen( floatingActionButton = { FloatingActionButton( - modifier = modifier.padding(30.dp), + modifier = modifier.padding(AppTheme.dimensions.paddingXXXL), onClick = { actions.gotoAddTask.invoke(0, 0).run { // log event to firebase diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/task/AllTaskScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/task/AllTaskScreen.kt index da9a8ff..2ab715e 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/task/AllTaskScreen.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/task/AllTaskScreen.kt @@ -99,7 +99,7 @@ fun AllTaskScreen( }, floatingActionButton = { FloatingActionButton( - modifier = modifier.padding(30.dp), + modifier = modifier.padding(AppTheme.dimensions.paddingXXXL), onClick = { actions.gotoAddTask.invoke(defaultUrgency, defaultImportance).run { // log event to firebase diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/webview/WebViewScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/webview/WebViewScreen.kt index 8c77893..ef70a45 100644 --- a/app/src/main/java/dev/spikeysanju/einsen/view/webview/WebViewScreen.kt +++ b/app/src/main/java/dev/spikeysanju/einsen/view/webview/WebViewScreen.kt @@ -82,7 +82,7 @@ fun WebViewScreen( style = AppTheme.typography.h2, textAlign = TextAlign.Start, color = AppTheme.colors.text, - modifier = modifier.padding(start = 16.dp) + modifier = modifier.padding(start = AppTheme.dimensions.paddingXL) ) }, navigationIcon = {