blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dialog theme rename.

master
Alex Hart 2020-04-20 09:18:29 -03:00 committed by Greyson Parrelli
parent 83f6640bd3
commit 00ee6d0bbd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/lock/RegistrationLockV1Dialog.java
View File

@ -72,7 +72,7 @@ public final class RegistrationLockV1Dialog {
}
private static void showLegacyPinReminder(@NonNull Context context) {
AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.RationaleDialogDark : R.style.RationaleDialogLight)
AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered : R.style.Theme_Signal_AlertDialog_Light_Cornered)
.setView(R.layout.registration_lock_reminder_view)
.setCancelable(true)
.setOnCancelListener(d -> RegistrationLockReminders.scheduleReminder(context, false))

2
app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
View File

@ -44,7 +44,7 @@ public final class SignalPinReminderDialog {
public static void show(@NonNull Context context, @NonNull Launcher launcher, @NonNull Callback mainCallback) {
Log.i(TAG, "Showing PIN reminder dialog.");
AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.RationaleDialogDark_SignalAccent : R.style.RationaleDialogLight_SignalAccent)
AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered_ColoredAccent : R.style.Theme_Signal_AlertDialog_Light_Cornered_ColoredAccent)
.setView(R.layout.kbs_pin_reminder_view)
.setCancelable(false)
.setOnCancelListener(d -> RegistrationLockReminders.scheduleReminder(context, false))

2
app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
View File

@ -54,7 +54,7 @@ public class RationaleDialog {
text.setText(message);
return new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.RationaleDialogDark : R.style.RationaleDialogLight)
return new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered : R.style.Theme_Signal_AlertDialog_Light_Cornered)
.setView(view);
}

8
app/src/main/res/values/themes.xml
View File

@ -696,19 +696,19 @@
<item name="colorControlNormal">@color/core_white</item>
</style>
<style name="RationaleDialogLight" parent="Theme.AppCompat.Light.Dialog.Alert">
<style name="Theme.Signal.AlertDialog.Light.Cornered" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowBackground">@drawable/dialog_corners_light</item>
</style>
<style name="RationaleDialogDark" parent="Theme.AppCompat.Dialog.Alert">
<style name="Theme.Signal.AlertDialog.Dark.Cornered" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowBackground">@drawable/dialog_corners_dark</item>
</style>
<style name="RationaleDialogLight.SignalAccent">
<style name="Theme.Signal.AlertDialog.Light.Cornered.ColoredAccent">
<item name="colorAccent">@color/core_ultramarine</item>
</style>
<style name="RationaleDialogDark.SignalAccent">
<style name="Theme.Signal.AlertDialog.Dark.Cornered.ColoredAccent">
<item name="colorAccent">@color/core_ultramarine_light</item>
</style>