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

Home screen dark theme fix: MW-164 #1851

Closed
wants to merge 7 commits into from
Closed

Home screen dark theme fix: MW-164 #1851

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7b64e9
fix: Update color scheme in HomeScreen and TransactionHistoryCard com…
rohitlokhande47 Mar 10, 2025
a4d5216
fix: Update color scheme in HomeScreen and TransactionHistoryCard com…
rohitlokhande47 Mar 10, 2025
6fca950
fix: Remove explicit color setting for title in TopAppBar and update …
rohitlokhande47 Mar 12, 2025
04f43ca
Merge branch 'development' into homeScreenDarkThemeFix
rohitlokhande47 Mar 26, 2025
dc32390
fix: Update color scheme and dependencies for Material3 integration
rohitlokhande47 Mar 27, 2025
b6c3197
fix: Update color scheme and dependencies for Material3 integration
rohitlokhande47 Mar 27, 2025
8b4d470
Fix formatting issues with spotlessApply
rohitlokhande47 Mar 30, 2025
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
3 changes: 1 addition & 2 deletions core/ui/src/commonMain/kotlin/org/mifospay/core/ui/TransactionHistoryCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import org.mifospay.core.designsystem.theme.NewUi
Expand All @@ -43,7 +42,7 @@ fun TransactionHistoryCard(
modifier = modifier
.fillMaxWidth(),
colors = CardDefaults.cardColors(
containerColor = Color.White,
containerColor = MaterialTheme.colorScheme.background,
),
) {
Column(
Expand Down
4 changes: 2 additions & 2 deletions feature/home/src/commonMain/kotlin/org/mifospay/feature/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ internal fun HomeScreen(
}

@Composable
@Preview
fun HomeScreenContent(
viewState: ViewState,
defaultAccountId: Long?,
Expand Down Expand Up @@ -527,7 +528,7 @@ private fun MifosSendMoneyFreeCard(
Card(
modifier = modifier,
colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
containerColor = MaterialTheme.colorScheme.background,
),
) {
Row(
Expand All @@ -547,7 +548,6 @@ private fun MifosSendMoneyFreeCard(
)
Text(
text = stringResource(Res.string.feature_home_desc),
color = NewUi.onSurface,
style = MaterialTheme.typography.bodySmall,
fontWeight = FontWeight(300),
)
Expand Down
2 changes: 1 addition & 1 deletion mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private fun MifosAppBar(
modifier: Modifier = Modifier,
) {
TopAppBar(
title = { Text(text = title) },
title = { Text(text = title, color = Color.Black) },
actions = {
Box {
when (destination) {
Expand Down