From 81337fe7ad5c2f896b3127e1578782d3d24c2d5c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 5 Dec 2016 14:48:37 -0200
Subject: [PATCH] Introduce Dialog Theme for Onboarding
---
.../privategroup/reveal/RevealContactsActivity.java | 4 ++--
briar-android/src/main/res/values/strings.xml | 1 +
briar-android/src/main/res/values/themes.xml | 8 +++++++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java
index 029d770a5a..db6236a1d9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java
@@ -112,9 +112,9 @@ public class RevealContactsActivity extends ContactSelectorActivity
}
private void showOnboardingDialog() {
- new AlertDialog.Builder(this, R.style.BriarDialogTheme)
+ new AlertDialog.Builder(this, R.style.OnboardingDialogTheme)
.setMessage(getString(R.string.groups_reveal_dialog_message))
- .setNeutralButton(R.string.ok,
+ .setNeutralButton(R.string.got_it,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog,
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index e27a3ea9ca..e7e2e7558c 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -71,6 +71,7 @@
<string name="hide">Hide</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>
+ <string name="got_it">Got it</string>
<string name="delete">Delete</string>
<string name="accept">Accept</string>
<string name="decline">Decline</string>
diff --git a/briar-android/src/main/res/values/themes.xml b/briar-android/src/main/res/values/themes.xml
index 1cc3700cd1..71bd3c9d5e 100644
--- a/briar-android/src/main/res/values/themes.xml
+++ b/briar-android/src/main/res/values/themes.xml
@@ -58,6 +58,13 @@
<item name="android:windowExitAnimation">@android:anim/fade_out</item>
</style>
+ <style name="OnboardingDialogTheme" parent="BriarDialogTheme">
+ <item name="android:background">@color/briar_primary</item>
+ <item name="android:textColorPrimary">@color/briar_text_primary_inverse</item>
+ <item name="android:textColorSecondary">@color/briar_text_secondary_inverse</item>
+ <item name="buttonBarNeutralButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
+ </style>
+
<!-- This fixes a UI bug in the support preference library -->
<style name="BriarTheme.ListSeparatorTextView">
<item name="android:textSize">14sp</item>
@@ -67,5 +74,4 @@
<item name="android:layout_marginBottom">16dp</item>
</style>
-
</resources>
\ No newline at end of file
--
GitLab