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

Merge branch '504-define-and-design-primary-and-secondary-actions' into 'master'

Browse Source 
Make dialog actions consistent

Closes #504

See merge request !430
This commit is contained in:
akwizgran
2016-11-23 15:08:58 +00:00
parent f1371f1db8 38f46a9c60
commit 7d1ddb6d65
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,6 +78,7 @@
<string name="online">Online</string> <string name="online">Online</string>
<string name="offline">Offline</string> <string name="offline">Offline</string>
<string name="send">Send</string> <string name="send">Send</string>
<string name="allow">Allow</string>
<string name="no_data">No data</string> <string name="no_data">No data</string>
<string name="ellipsis">…</string> <string name="ellipsis">…</string>
<string name="text_too_long">The entered text is too long</string> <string name="text_too_long">The entered text is too long</string>

4
briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -686,8 +686,8 @@ public class ConversationActivity extends BriarActivity
R.style.BriarDialogTheme); R.style.BriarDialogTheme);
builder.setTitle(getString(R.string.dialog_title_delete_contact)); builder.setTitle(getString(R.string.dialog_title_delete_contact));
builder.setMessage(getString(R.string.dialog_message_delete_contact)); builder.setMessage(getString(R.string.dialog_message_delete_contact));
builder.setPositiveButton(android.R.string.ok, okListener); builder.setNegativeButton(R.string.delete, okListener);
builder.setNegativeButton(android.R.string.cancel, null); builder.setPositiveButton(R.string.cancel, null);
builder.show(); builder.show();
} }

10
briar-android/src/org/briarproject/android/panic/PanicPreferencesFragment.java
View File

@@ -17,6 +17,7 @@ import android.support.v7.preference.PreferenceFragmentCompat;
import android.text.TextUtils; import android.text.TextUtils;
import org.briarproject.R; import org.briarproject.R;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -72,8 +73,8 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
} }
} }
ArrayList<CharSequence> entries = new ArrayList<CharSequence>(); ArrayList<CharSequence> entries = new ArrayList<>();
ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>(); ArrayList<CharSequence> entryValues = new ArrayList<>();
entries.add(0, getString(R.string.panic_app_setting_none)); entries.add(0, getString(R.string.panic_app_setting_none));
entryValues.add(0, Panic.PACKAGE_NAME_NONE); entryValues.add(0, Panic.PACKAGE_NAME_NONE);
@@ -245,11 +246,12 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
String text = String.format( String text = String.format(
getString(R.string.dialog_message_connect_panic_app), app); getString(R.string.dialog_message_connect_panic_app), app);
builder.setMessage(text); builder.setMessage(text);
builder.setPositiveButton(android.R.string.ok, okListener); builder.setNegativeButton(R.string.allow, okListener);
builder.setNegativeButton(android.R.string.cancel, cancelListener); builder.setPositiveButton(R.string.cancel, cancelListener);
builder.show(); builder.show();
} }
@Nullable
private String getCallingPackageName() { private String getCallingPackageName() {
ComponentName componentName = getActivity().getCallingActivity(); ComponentName componentName = getActivity().getCallingActivity();
String packageName = null; String packageName = null;

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

@@ -114,7 +114,7 @@ public class RevealContactsActivity extends ContactSelectorActivity
private void showOnboardingDialog() { private void showOnboardingDialog() {
new AlertDialog.Builder(this, R.style.BriarDialogTheme) new AlertDialog.Builder(this, R.style.BriarDialogTheme)
.setMessage(getString(R.string.groups_reveal_dialog_message)) .setMessage(getString(R.string.groups_reveal_dialog_message))
.setPositiveButton(R.string.ok, .setNeutralButton(R.string.ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, public void onClick(DialogInterface dialog,