empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix dark theme issues with compose bottom sheets and donation bank name typo.

Browse source
This commit is contained in:
Cody Henthorne 2023-11-08 16:27:33 -05:00
parent f062e58f7b
commit 24ac385898
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt
View file

@ -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)
)

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt
View file

@ -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)

6
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt
View file

@ -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(

4
app/src/main/java/org/thoughtcrime/securesms/notifications/TurnOnNotificationsBottomSheet.kt
View file

@ -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)
)

2
app/src/main/res/values/strings.xml
View file

@ -5910,7 +5910,7 @@
<!-- iDEAL bank name -->
<string name="IdealBank__triodos_bank">Triodos Bank</string>
<!-- iDEAL bank name -->
<string name="IdealBank__van_lanchot">Van Lanchot Kempen</string>
<string name="IdealBank__van_lanschot">Van Lanschot Kempen</string>
<!-- iDEAL bank name -->
<string name="IdealBank__yoursafe">Yoursafe</string>