diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt index c5aa49ea79..042b9d22b5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt @@ -113,6 +113,7 @@ private fun DonationPendingBottomSheetContent( text = stringResource(id = R.string.DonationPendingBottomSheet__donation_pending), textAlign = TextAlign.Center, style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(bottom = 8.dp) ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt index ea87275f84..7cfc6e8ed9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt @@ -183,6 +183,7 @@ private fun DonationPaymentFailureBottomSheet( text = stringResource(id = R.string.DonationErrorBottomSheet__donation_couldnt_be_processed), style = MaterialTheme.typography.titleLarge, textAlign = TextAlign.Center, + color = MaterialTheme.colorScheme.onSurface, modifier = Modifier .fillMaxWidth() .padding(horizontal = 45.dp) @@ -262,6 +263,7 @@ private fun DonationCompletedSheetContent( text = stringResource(id = R.string.DonationCompletedBottomSheet__donation_complete), style = MaterialTheme.typography.titleLarge, textAlign = TextAlign.Center, + color = MaterialTheme.colorScheme.onSurface, modifier = Modifier .fillMaxWidth() .padding(horizontal = 45.dp) @@ -319,6 +321,7 @@ private fun DonationToggleRow( ) { Text( text = text, + color = MaterialTheme.colorScheme.onSurface, modifier = Modifier .weight(1f) .align(Alignment.CenterVertically) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt index 9efffaa9dc..bc69f3f77d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt @@ -28,7 +28,7 @@ enum class IdealBank( REVOLUT("revolut"), SNS_BANK("sns_bank"), TRIODOS_BANK("triodos_bank"), - VAN_LANCHOT("van_lanchot"), + VAN_LANSCHOT("van_lanschot"), YOURSAFE("yoursafe"); fun getUIValues(): UIValues = bankToUIValues[this]!! @@ -83,8 +83,8 @@ enum class IdealBank( name = R.string.IdealBank__triodos_bank, icon = R.drawable.ideal_triodos_bank ), - VAN_LANCHOT to UIValues( - name = R.string.IdealBank__van_lanchot, + VAN_LANSCHOT to UIValues( + name = R.string.IdealBank__van_lanschot, icon = R.drawable.ideal_van_lanschot ), YOURSAFE to UIValues( diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt index 13ab601885..efc65452c7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt @@ -147,6 +147,7 @@ private fun TurnOnNotificationsSheetContent( Text( text = stringResource(titleRes), style = MaterialTheme.typography.headlineSmall, + color = MaterialTheme.colorScheme.onSurface, modifier = Modifier .align(Alignment.CenterHorizontally) .padding(bottom = 12.dp, top = 10.dp) @@ -155,6 +156,7 @@ private fun TurnOnNotificationsSheetContent( Text( text = stringResource(subtitleRes), style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, modifier = Modifier .align(Alignment.CenterHorizontally) .padding(bottom = 32.dp) @@ -162,6 +164,7 @@ private fun TurnOnNotificationsSheetContent( Text( text = stringResource(R.string.TurnOnNotificationsBottomSheet__1_tap_settings_below), + color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(bottom = 32.dp) ) @@ -190,6 +193,7 @@ private fun TurnOnNotificationsSheetContent( Text( text = step2Text, inlineContent = step2InlineContent, + color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(bottom = 32.dp) ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a83ede1dfb..395fea54dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5910,7 +5910,7 @@ Triodos Bank - Van Lanchot Kempen + Van Lanschot Kempen Yoursafe