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

In dark mode, use a dark theme base for RegistrationLockDialog and RationaleDialog.

Browse source 
Fixes #8995
Closes #9077
This commit is contained in:
Alan Evans 2019-11-14 13:51:01 -05:00 • committed by GitHub
parent 6da734c2f9
commit dfa08d1356
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/values/themes.xml
View file

@ -585,7 +585,11 @@
<item name="shared_contact_item_button_color">@color/core_grey_85</item> <item name="shared_contact_item_button_color">@color/core_grey_85</item>
</style> </style>
<style name="RationaleDialog" parent="Theme.AppCompat.Light.Dialog.Alert"> <style name="RationaleDialogLight" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item>
</style>
<style name="RationaleDialogDark" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item> <item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item>
</style> </style>

11
src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
View file

@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.SwitchPreferenceCompat; import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.ThemeUtil;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.SignalServiceAccountManager; import org.whispersystems.signalservice.api.SignalServiceAccountManager;
@ -45,11 +46,11 @@ public class RegistrationLockDialog {
if (!RegistrationLockReminders.needsReminder(context)) return; if (!RegistrationLockReminders.needsReminder(context)) return;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return; if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
AlertDialog dialog = new AlertDialog.Builder(context, R.style.RationaleDialog) AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.RationaleDialogDark : R.style.RationaleDialogLight)
.setView(R.layout.registration_lock_reminder_view) .setView(R.layout.registration_lock_reminder_view)
.setCancelable(true) .setCancelable(true)
.setOnCancelListener(d -> RegistrationLockReminders.scheduleReminder(context, false)) .setOnCancelListener(d -> RegistrationLockReminders.scheduleReminder(context, false))
.create(); .create();
WindowManager windowManager = ServiceUtil.getWindowManager(context); WindowManager windowManager = ServiceUtil.getWindowManager(context);
Display display = windowManager.getDefaultDisplay(); Display display = windowManager.getDefaultDisplay();

4
src/org/thoughtcrime/securesms/permissions/RationaleDialog.java
View file

@ -19,6 +19,7 @@ import android.widget.LinearLayout.LayoutParams;
import android.widget.TextView; import android.widget.TextView;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.ThemeUtil;
import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.ViewUtil;
public class RationaleDialog { public class RationaleDialog {
@ -53,7 +54,8 @@ public class RationaleDialog {
text.setText(message); text.setText(message);
return new AlertDialog.Builder(context, R.style.RationaleDialog).setView(view); return new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.RationaleDialogDark : R.style.RationaleDialogLight)
.setView(view);
} }
} }