Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'onboarding-dialog-style' into 'master'

Browse Source 
Introduce Dialog Theme for Onboarding

Currently onboarding dialogs and confirmation dialogs look the same. This MR introduces a new dialog theme for onboarding dialogs that looks like the tap target onboarding, so that the user can immediately spot the purpose of the dialog.

![device-2016-12-06-085539](/uploads/6d75b17c0f20028bb7ffac65e6fba03a/device-2016-12-06-085539.png)

See merge request !446
This commit is contained in:
akwizgran
2016-12-07 15:47:12 +00:00
parent 27c2ee8d89 81337fe7ad
commit 9495163016
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java
View File

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

1
briar-android/src/main/res/values/strings.xml
View File

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

8
briar-android/src/main/res/values/themes.xml
View File

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