fix: Fix line height of texts in classic goal item (#146)

Signed-off-by: starry-shivam <[email protected]>
Pool-Of-Tears · Jun 21, 2024 · 81a08dd · 81a08dd
1 parent 76c3ebc
commit 81a08dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/GoalItems.kt b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/GoalItems.kt
@@ -151,15 +151,15 @@ fun GoalItemClassic(
                 Text(
                     text = primaryText,
                     modifier = Modifier.padding(start = 8.dp, top = 6.dp),
-                    lineHeight = 1.2f.em,
+                    lineHeight = 1.25f.em,
                     fontSize = 14.sp,
                     fontFamily = greenstashFont,
                     color = MaterialTheme.colorScheme.onSurface
                 )
                 Text(
                     text = secondaryText,
                     modifier = Modifier.padding(start = 8.dp, top = 8.dp),
-                    lineHeight = 1.1f.em,
+                    lineHeight = 1.3f.em,
                     fontSize = 14.sp,
                     fontFamily = greenstashFont,
                     color = MaterialTheme.colorScheme.onSurface

diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/welcome/composables/WelcomeScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/welcome/composables/WelcomeScreen.kt
@@ -52,6 +52,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -71,10 +72,12 @@ import com.starry.greenstash.ui.common.SlideInAnimatedContainer
 import com.starry.greenstash.ui.navigation.DrawerScreens
 import com.starry.greenstash.ui.screens.welcome.WelcomeViewModel
 import com.starry.greenstash.ui.theme.greenstashFont
+import com.starry.greenstash.utils.weakHapticFeedback
 
 
 @Composable
 fun WelcomeScreen(navController: NavController) {
+    val view = LocalView.current
     val context = LocalContext.current
     val viewModel: WelcomeViewModel = hiltViewModel()
 
@@ -142,7 +145,7 @@ fun WelcomeScreen(navController: NavController) {
                 OutlinedButton(
                     onClick = { currencyDialog.value = true },
                     modifier = Modifier
-                        .width(230.dp)
+                        .width(245.dp)
                         .animateContentSize(),
                     shape = RoundedCornerShape(16.dp),
                 ) {
@@ -158,11 +161,12 @@ fun WelcomeScreen(navController: NavController) {
 
                 FilledTonalButton(
                     onClick = {
+                        view.weakHapticFeedback()
                         viewModel.saveOnBoardingState(completed = true)
                         navController.popBackStack()
                         navController.navigate(DrawerScreens.Home.route)
                     },
-                    modifier = Modifier.width(230.dp),
+                    modifier = Modifier.width(245.dp),
                     shape = RoundedCornerShape(16.dp)
                 ) {
                     Text(
@@ -174,7 +178,7 @@ fun WelcomeScreen(navController: NavController) {
             }
         }
 
-        Spacer(modifier = Modifier.height(24.dp))
+        Spacer(modifier = Modifier.height(34.dp))
 
         CurrencyPicker(
             defaultCurrencyValue = viewModel.getDefaultCurrencyValue()