Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 04:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
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), text = stringResource(id = R.string.DonationPendingBottomSheet__donation_pending),
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleLarge, style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier.padding(bottom = 8.dp) 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), text = stringResource(id = R.string.DonationErrorBottomSheet__donation_couldnt_be_processed),
style = MaterialTheme.typography.titleLarge, style = MaterialTheme.typography.titleLarge,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 45.dp) .padding(horizontal = 45.dp)
@@ -262,6 +263,7 @@ private fun DonationCompletedSheetContent(
text = stringResource(id = R.string.DonationCompletedBottomSheet__donation_complete), text = stringResource(id = R.string.DonationCompletedBottomSheet__donation_complete),
style = MaterialTheme.typography.titleLarge, style = MaterialTheme.typography.titleLarge,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 45.dp) .padding(horizontal = 45.dp)
@@ -319,6 +321,7 @@ private fun DonationToggleRow(
) { ) {
Text( Text(
text = text, text = text,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.align(Alignment.CenterVertically) .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"), REVOLUT("revolut"),
SNS_BANK("sns_bank"), SNS_BANK("sns_bank"),
TRIODOS_BANK("triodos_bank"), TRIODOS_BANK("triodos_bank"),
VAN_LANCHOT("van_lanchot"), VAN_LANSCHOT("van_lanschot"),
YOURSAFE("yoursafe"); YOURSAFE("yoursafe");
fun getUIValues(): UIValues = bankToUIValues[this]!! fun getUIValues(): UIValues = bankToUIValues[this]!!
@@ -83,8 +83,8 @@ enum class IdealBank(
name = R.string.IdealBank__triodos_bank, name = R.string.IdealBank__triodos_bank,
icon = R.drawable.ideal_triodos_bank icon = R.drawable.ideal_triodos_bank
), ),
VAN_LANCHOT to UIValues( VAN_LANSCHOT to UIValues(
name = R.string.IdealBank__van_lanchot, name = R.string.IdealBank__van_lanschot,
icon = R.drawable.ideal_van_lanschot icon = R.drawable.ideal_van_lanschot
), ),
YOURSAFE to UIValues( 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(
text = stringResource(titleRes), text = stringResource(titleRes),
style = MaterialTheme.typography.headlineSmall, style = MaterialTheme.typography.headlineSmall,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier modifier = Modifier
.align(Alignment.CenterHorizontally) .align(Alignment.CenterHorizontally)
.padding(bottom = 12.dp, top = 10.dp) .padding(bottom = 12.dp, top = 10.dp)
@@ -155,6 +156,7 @@ private fun TurnOnNotificationsSheetContent(
Text( Text(
text = stringResource(subtitleRes), text = stringResource(subtitleRes),
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier modifier = Modifier
.align(Alignment.CenterHorizontally) .align(Alignment.CenterHorizontally)
.padding(bottom = 32.dp) .padding(bottom = 32.dp)
@@ -162,6 +164,7 @@ private fun TurnOnNotificationsSheetContent(
Text( Text(
text = stringResource(R.string.TurnOnNotificationsBottomSheet__1_tap_settings_below), text = stringResource(R.string.TurnOnNotificationsBottomSheet__1_tap_settings_below),
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier.padding(bottom = 32.dp) modifier = Modifier.padding(bottom = 32.dp)
) )
@@ -190,6 +193,7 @@ private fun TurnOnNotificationsSheetContent(
Text( Text(
text = step2Text, text = step2Text,
inlineContent = step2InlineContent, inlineContent = step2InlineContent,
color = MaterialTheme.colorScheme.onSurface,
modifier = Modifier.padding(bottom = 32.dp) modifier = Modifier.padding(bottom = 32.dp)
) )

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

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