Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jun 21, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .idea/deploymentTargetSelector.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/src/main/java/com/starry/greenstash/ui/screens/home/composables/GoalItems.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/com/starry/greenstash/ui/screens/welcome/composables/WelcomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()

Expand Down Expand Up @@ -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),
) {
Expand All @@ -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(
Expand All @@ -174,7 +178,7 @@ fun WelcomeScreen(navController: NavController) {
}
}

Spacer(modifier = Modifier.height(24.dp))
Spacer(modifier = Modifier.height(34.dp))

CurrencyPicker(
defaultCurrencyValue = viewModel.getDefaultCurrencyValue()
Expand Down
Loading