From e4e2d647c8cd8bf2d1e318c85d41173caf18adf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 26 Jan 2015 00:50:35 +0100 Subject: [PATCH] Material Design: Full screen dialogs --- Graphics/get-material-icons.sh | 8 +- .../remote/ui/AccountSettingsActivity.java | 16 ++- .../remote/ui/RemoteServiceActivity.java | 28 ++--- .../keychain/ui/BaseActivity.java | 80 +++++++++++++- .../keychain/ui/EditKeyFragment.java | 19 ++-- .../keychain/ui/LogDisplayActivity.java | 4 +- .../keychain/ui/QrCodeViewActivity.java | 4 +- .../keychain/ui/SelectPublicKeyActivity.java | 11 +- .../ui/SettingsKeyServerActivity.java | 11 +- .../keychain/ui/ViewKeyAdvancedActivity.java | 4 +- .../keychain/ui/adapter/SubkeysAdapter.java | 2 +- .../keychain/ui/util/ActionBarHelper.java | 99 ------------------ .../ui/widget/FoldableLinearLayout.java | 39 +++---- .../res/drawable-hdpi/ic_action_collapse.png | Bin 467 -> 0 bytes .../res/drawable-hdpi/ic_action_expand.png | Bin 415 -> 0 bytes .../res/drawable-hdpi/ic_check_white_24dp.png | Bin 0 -> 309 bytes .../res/drawable-hdpi/ic_close_white_24dp.png | Bin 0 -> 324 bytes .../ic_expand_less_black_24dp.png | Bin 0 -> 234 bytes .../ic_expand_more_black_24dp.png | Bin 0 -> 244 bytes .../drawable-hdpi/ic_refresh_white_24dp.png | Bin 0 -> 531 bytes .../res/drawable-mdpi/ic_action_collapse.png | Bin 404 -> 0 bytes .../res/drawable-mdpi/ic_action_expand.png | Bin 345 -> 0 bytes .../res/drawable-mdpi/ic_check_white_24dp.png | Bin 0 -> 243 bytes .../res/drawable-mdpi/ic_close_white_24dp.png | Bin 0 -> 279 bytes .../ic_expand_less_black_24dp.png | Bin 0 -> 206 bytes .../ic_expand_more_black_24dp.png | Bin 0 -> 206 bytes .../drawable-mdpi/ic_refresh_white_24dp.png | Bin 0 -> 346 bytes .../res/drawable-xhdpi/ic_action_collapse.png | Bin 631 -> 0 bytes .../res/drawable-xhdpi/ic_action_expand.png | Bin 582 -> 0 bytes .../drawable-xhdpi/ic_check_white_24dp.png | Bin 0 -> 363 bytes .../drawable-xhdpi/ic_close_white_24dp.png | Bin 0 -> 402 bytes .../ic_expand_less_black_24dp.png | Bin 0 -> 259 bytes .../ic_expand_more_black_24dp.png | Bin 0 -> 272 bytes .../drawable-xhdpi/ic_refresh_white_24dp.png | Bin 0 -> 637 bytes .../drawable-xxhdpi/ic_action_collapse.png | Bin 901 -> 0 bytes .../res/drawable-xxhdpi/ic_action_expand.png | Bin 974 -> 0 bytes .../drawable-xxhdpi/ic_check_white_24dp.png | Bin 0 -> 460 bytes .../drawable-xxhdpi/ic_close_white_24dp.png | Bin 0 -> 492 bytes .../ic_expand_less_black_24dp.png | Bin 0 -> 304 bytes .../ic_expand_more_black_24dp.png | Bin 0 -> 316 bytes .../drawable-xxhdpi/ic_refresh_white_24dp.png | Bin 0 -> 875 bytes .../drawable-xxxhdpi/ic_check_white_24dp.png | Bin 0 -> 587 bytes .../drawable-xxxhdpi/ic_close_white_24dp.png | Bin 0 -> 662 bytes .../ic_expand_less_black_24dp.png | Bin 0 -> 360 bytes .../ic_expand_more_black_24dp.png | Bin 0 -> 379 bytes .../ic_refresh_white_24dp.png | Bin 0 -> 1148 bytes .../res/layout/actionbar_custom_view_done.xml | 26 ----- .../actionbar_custom_view_done_cancel.xml | 28 ----- .../main/res/layout/foldable_linearlayout.xml | 2 +- .../main/res/layout/full_screen_dialog.xml | 10 ++ .../main/res/layout/full_screen_dialog_2.xml | 12 +++ ...=> full_screen_dialog_2_cancel_button.xml} | 20 +--- ...l => full_screen_dialog_2_done_button.xml} | 20 +--- .../layout/full_screen_dialog_done_button.xml | 25 +++++ .../res/layout/full_screen_dialog_old.xml | 10 ++ OpenKeychain/src/main/res/values/strings.xml | 2 +- OpenKeychain/src/main/res/values/themes.xml | 2 +- 57 files changed, 209 insertions(+), 273 deletions(-) delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ActionBarHelper.java delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog.xml create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml rename OpenKeychain/src/main/res/layout/{actionbar_include_cancel_button.xml => full_screen_dialog_2_cancel_button.xml} (56%) rename OpenKeychain/src/main/res/layout/{actionbar_include_done_button.xml => full_screen_dialog_2_done_button.xml} (55%) create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index 8e905ed69..0ebeb46af 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -1,3 +1,9 @@ +# https://google.github.io/material-design-icons/ cd ./android-icon-copier/ python copy OpenKeychain action white search 24 -python copy OpenKeychain navigation white arrow_back 24 \ No newline at end of file +python copy OpenKeychain navigation white arrow_back 24 +python copy OpenKeychain navigation white close 24 +python copy OpenKeychain navigation white check 24 +python copy OpenKeychain navigation black expand_less 24 +python copy OpenKeychain navigation black expand_more 24 +python copy OpenKeychain navigation white refresh 24 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java index 2751db370..e5edd6a0f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java @@ -27,7 +27,6 @@ import android.view.View; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.BaseActivity; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.AccountSettings; import org.sufficientlysecure.keychain.operations.results.OperationResult; @@ -45,14 +44,18 @@ public class AccountSettingsActivity extends BaseActivity { super.onCreate(savedInstanceState); // Inflate a "Done" custom action bar - ActionBarHelper.setOneButtonView(getSupportActionBar(), - R.string.api_settings_save, R.drawable.ic_action_done, + setFullScreenDialogDoneClose(R.string.api_settings_save, new View.OnClickListener() { @Override public void onClick(View v) { - // "Done" save(); } + }, + new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } }); @@ -129,9 +132,4 @@ public class AccountSettingsActivity extends BaseActivity { } } - @Override - public void onBackPressed() { - save(); - super.onBackPressed(); - } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java index 447f02b55..cbc593b0a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java @@ -40,7 +40,6 @@ import org.sufficientlysecure.keychain.remote.AccountSettings; import org.sufficientlysecure.keychain.remote.AppSettings; import org.sufficientlysecure.keychain.ui.BaseActivity; import org.sufficientlysecure.keychain.ui.SelectPublicKeyFragment; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.util.Log; @@ -123,8 +122,8 @@ public class RemoteServiceActivity extends BaseActivity { mAppSettingsFragment.setAppSettings(settings); // Inflate a "Done"/"Cancel" custom action bar view - ActionBarHelper.setTwoButtonView(getSupportActionBar(), - R.string.api_register_allow, R.drawable.ic_action_done, + setFullScreenDialogTwoButtons( + R.string.api_register_allow, R.drawable.ic_check_white_24dp, new View.OnClickListener() { @Override public void onClick(View v) { @@ -137,7 +136,7 @@ public class RemoteServiceActivity extends BaseActivity { RemoteServiceActivity.this.setResult(RESULT_OK, resultData); RemoteServiceActivity.this.finish(); } - }, R.string.api_register_disallow, R.drawable.ic_action_cancel, + }, R.string.api_register_disallow, R.drawable.ic_close_white_24dp, new View.OnClickListener() { @Override public void onClick(View v) { @@ -179,8 +178,7 @@ public class RemoteServiceActivity extends BaseActivity { mAccSettingsFragment.setAccSettings(settings); // Inflate a "Done"/"Cancel" custom action bar view - ActionBarHelper.setTwoButtonView(getSupportActionBar(), - R.string.api_settings_save, R.drawable.ic_action_done, + setFullScreenDialogDoneClose(R.string.api_settings_save, new View.OnClickListener() { @Override public void onClick(View v) { @@ -208,7 +206,7 @@ public class RemoteServiceActivity extends BaseActivity { RemoteServiceActivity.this.finish(); } } - }, R.string.api_settings_cancel, R.drawable.ic_action_cancel, + }, new View.OnClickListener() { @Override public void onClick(View v) { @@ -216,8 +214,7 @@ public class RemoteServiceActivity extends BaseActivity { RemoteServiceActivity.this.setResult(RESULT_CANCELED); RemoteServiceActivity.this.finish(); } - } - ); + }); break; } @@ -264,8 +261,7 @@ public class RemoteServiceActivity extends BaseActivity { initToolbar(); // Inflate a "Done"/"Cancel" custom action bar view - ActionBarHelper.setTwoButtonView(getSupportActionBar(), - R.string.btn_okay, R.drawable.ic_action_done, + setFullScreenDialogDoneClose(R.string.btn_okay, new View.OnClickListener() { @Override public void onClick(View v) { @@ -277,16 +273,15 @@ public class RemoteServiceActivity extends BaseActivity { RemoteServiceActivity.this.setResult(RESULT_OK, resultData); RemoteServiceActivity.this.finish(); } - }, R.string.btn_do_not_save, R.drawable.ic_action_cancel, new View.OnClickListener() { + }, + new View.OnClickListener() { @Override public void onClick(View v) { // cancel RemoteServiceActivity.this.setResult(RESULT_CANCELED); RemoteServiceActivity.this.finish(); } - } - ); - + }); // set text on view TextView textView = (TextView) findViewById(R.id.api_select_pub_keys_text); @@ -323,8 +318,7 @@ public class RemoteServiceActivity extends BaseActivity { initToolbar(); // Inflate a "Done" custom action bar view - ActionBarHelper.setOneButtonView(getSupportActionBar(), - R.string.btn_okay, R.drawable.ic_action_done, + setFullScreenDialogClose( new View.OnClickListener() { @Override diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java index c38d126d7..7423e6828 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java @@ -17,14 +17,21 @@ package org.sufficientlysecure.keychain.ui; +import android.app.Activity; import android.os.Bundle; +import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.support.v7.widget.Toolbar; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; import org.sufficientlysecure.keychain.R; /** - * Sets action bar + * Setups Toolbar */ public abstract class BaseActivity extends ActionBarActivity { protected Toolbar mToolbar; @@ -49,4 +56,75 @@ public abstract class BaseActivity extends ActionBarActivity { protected void setActionBarIcon(int iconRes) { mToolbar.setNavigationIcon(iconRes); } + + /** + * Inflate custom design to look like a full screen dialog, as specified in Material Design Guidelines + * see http://www.google.com/design/spec/components/dialogs.html#dialogs-full-screen-dialogs + */ + protected void setFullScreenDialogDoneClose(int doneText, View.OnClickListener doneOnClickListener, + View.OnClickListener cancelOnClickListener) { + setActionBarIcon(R.drawable.ic_close_white_24dp); + + // Inflate the custom action bar view + final LayoutInflater inflater = (LayoutInflater) getSupportActionBar().getThemedContext() + .getSystemService(Activity.LAYOUT_INFLATER_SERVICE); + final View customActionBarView = inflater.inflate(R.layout.full_screen_dialog, null); + + TextView firstTextView = ((TextView) customActionBarView.findViewById(R.id.full_screen_dialog_done_text)); + firstTextView.setText(doneText); + customActionBarView.findViewById(R.id.full_screen_dialog_done).setOnClickListener( + doneOnClickListener); + + getSupportActionBar().setDisplayShowCustomEnabled(true); + getSupportActionBar().setDisplayShowTitleEnabled(true); + getSupportActionBar().setCustomView(customActionBarView, new ActionBar.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, + Gravity.END)); + mToolbar.setNavigationOnClickListener(cancelOnClickListener); + } + + /** + * Close button only + */ + protected void setFullScreenDialogClose(View.OnClickListener cancelOnClickListener) { + setActionBarIcon(R.drawable.ic_close_white_24dp); + getSupportActionBar().setDisplayShowTitleEnabled(true); + mToolbar.setNavigationOnClickListener(cancelOnClickListener); + } + + /** + * Inflate custom design with two buttons using drawables. + * This does not conform to the Material Design Guidelines, but we deviate here as this is used + * to indicate "Allow access"/"Disallow access" to the API, which must be clearly indicated + */ + protected void setFullScreenDialogTwoButtons(int firstText, int firstDrawableId, View.OnClickListener firstOnClickListener, + int secondText, int secondDrawableId, View.OnClickListener secondOnClickListener) { + + // Inflate the custom action bar view + final LayoutInflater inflater = (LayoutInflater) getSupportActionBar().getThemedContext() + .getSystemService(Activity.LAYOUT_INFLATER_SERVICE); + final View customActionBarView = inflater.inflate( + R.layout.full_screen_dialog_2, null); + + TextView firstTextView = ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text)); + firstTextView.setText(firstText); + firstTextView.setCompoundDrawablesWithIntrinsicBounds(firstDrawableId, 0, 0, 0); + customActionBarView.findViewById(R.id.actionbar_done).setOnClickListener( + firstOnClickListener); + TextView secondTextView = ((TextView) customActionBarView.findViewById(R.id.actionbar_cancel_text)); + secondTextView.setText(secondText); + secondTextView.setCompoundDrawablesWithIntrinsicBounds(secondDrawableId, 0, 0, 0); + customActionBarView.findViewById(R.id.actionbar_cancel).setOnClickListener( + secondOnClickListener); + + // Show the custom action bar view and hide the normal Home icon and title. + getSupportActionBar().setDisplayShowTitleEnabled(false); + getSupportActionBar().setDisplayShowHomeEnabled(false); + getSupportActionBar().setDisplayHomeAsUpEnabled(false); + getSupportActionBar().setDisplayShowCustomEnabled(true); + getSupportActionBar().setCustomView(customActionBarView, new ActionBar.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); + } + + } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java index 2e2d26bf0..25ca6e8fd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -29,7 +29,6 @@ import android.os.Messenger; import android.support.v4.app.LoaderManager; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; -import android.support.v7.app.ActionBarActivity; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -66,7 +65,6 @@ import org.sufficientlysecure.keychain.ui.dialog.EditSubkeyDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.EditSubkeyExpiryDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.EditUserIdDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.util.Log; @@ -148,10 +146,8 @@ public class EditKeyFragment extends LoaderFragment implements @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - - // Inflate a "Done"/"Cancel" custom action bar view - ActionBarHelper.setTwoButtonView(((ActionBarActivity) getActivity()).getSupportActionBar(), - R.string.btn_save, R.drawable.ic_action_save, + ((EditKeyActivity) getActivity()).setFullScreenDialogDoneClose( + R.string.btn_save, new OnClickListener() { @Override public void onClick(View v) { @@ -162,16 +158,13 @@ public class EditKeyFragment extends LoaderFragment implements saveInDatabase(mCurrentPassphrase); } } - }, R.string.menu_key_edit_cancel, R.drawable.ic_action_cancel, - new OnClickListener() { + }, new OnClickListener() { @Override public void onClick(View v) { - // cancel getActivity().setResult(Activity.RESULT_CANCELED); getActivity().finish(); } - } - ); + }); Uri dataUri = getArguments().getParcelable(ARG_DATA_URI); SaveKeyringParcel saveKeyringParcel = getArguments().getParcelable(ARG_SAVE_KEYRING_PARCEL); @@ -393,8 +386,8 @@ public class EditKeyFragment extends LoaderFragment implements // cache new returned passphrase! mSaveKeyringParcel.mNewUnlock = new ChangeUnlockParcel( - data.getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE), - null + data.getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE), + null ); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayActivity.java index 21113fb2f..0de7bb391 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayActivity.java @@ -22,7 +22,6 @@ import android.os.Bundle; import android.view.View; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; public class LogDisplayActivity extends BaseActivity { @@ -31,8 +30,7 @@ public class LogDisplayActivity extends BaseActivity { super.onCreate(savedInstanceState); // Inflate a "Done" custom action bar - ActionBarHelper.setOneButtonView(getSupportActionBar(), - R.string.btn_okay, R.drawable.ic_action_done, + setFullScreenDialogClose( new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java index 74ca19106..ef1d797be 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java @@ -26,7 +26,6 @@ import android.widget.ImageView; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.ProviderHelper; @@ -44,8 +43,7 @@ public class QrCodeViewActivity extends BaseActivity { super.onCreate(savedInstanceState); // Inflate a "Done" custom action bar - ActionBarHelper.setOneButtonView(getSupportActionBar(), - R.string.btn_okay, R.drawable.ic_action_done, + setFullScreenDialogClose( new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java index 33c4abba3..0e3374833 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java @@ -24,7 +24,6 @@ import android.view.View; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; public class SelectPublicKeyActivity extends BaseActivity { @@ -46,21 +45,19 @@ public class SelectPublicKeyActivity extends BaseActivity { super.onCreate(savedInstanceState); // Inflate a "Done"/"Cancel" custom action bar view - ActionBarHelper.setTwoButtonView(getSupportActionBar(), R.string.btn_okay, R.drawable.ic_action_done, + setFullScreenDialogDoneClose(R.string.btn_okay, new View.OnClickListener() { @Override public void onClick(View v) { - // ok okClicked(); } - }, R.string.btn_do_not_save, R.drawable.ic_action_cancel, new View.OnClickListener() { + }, + new View.OnClickListener() { @Override public void onClick(View v) { - // cancel cancelClicked(); } - } - ); + }); setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyServerActivity.java index 60346c16d..080dc2495 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyServerActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyServerActivity.java @@ -27,7 +27,6 @@ import android.view.ViewGroup; import android.widget.TextView; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; import org.sufficientlysecure.keychain.ui.widget.Editor; import org.sufficientlysecure.keychain.ui.widget.Editor.EditorListener; import org.sufficientlysecure.keychain.ui.widget.KeyServerEditor; @@ -51,21 +50,19 @@ public class SettingsKeyServerActivity extends BaseActivity implements OnClickLi super.onCreate(savedInstanceState); // Inflate a "Done"/"Cancel" custom action bar view - ActionBarHelper.setTwoButtonView(getSupportActionBar(), R.string.btn_okay, R.drawable.ic_action_done, + setFullScreenDialogDoneClose(R.string.btn_save, new View.OnClickListener() { @Override public void onClick(View v) { - // ok okClicked(); } - }, R.string.btn_do_not_save, R.drawable.ic_action_cancel, new View.OnClickListener() { + }, + new View.OnClickListener() { @Override public void onClick(View v) { - // cancel cancelClicked(); } - } - ); + }); mInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedActivity.java index 4e3c6d2a6..471f55c47 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedActivity.java @@ -25,7 +25,6 @@ import android.view.View; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.provider.ProviderHelper; -import org.sufficientlysecure.keychain.ui.util.ActionBarHelper; import org.sufficientlysecure.keychain.util.ExportHelper; import org.sufficientlysecure.keychain.util.Log; @@ -42,8 +41,7 @@ public class ViewKeyAdvancedActivity extends BaseActivity { mProviderHelper = new ProviderHelper(this); // Inflate a "Done" custom action bar - ActionBarHelper.setOneButtonView(getSupportActionBar(), - R.string.btn_okay, R.drawable.ic_action_done, + setFullScreenDialogClose( new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java index 431cdc845..5ba09be7e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java @@ -164,7 +164,7 @@ public class SubkeysAdapter extends CursorAdapter { ? mSaveKeyringParcel.getSubkeyChange(keyId) : null; - if (change.mDummyStrip) { + if (change != null && change.mDummyStrip) { algorithmStr.append(", "); final SpannableString boldStripped = new SpannableString( context.getString(R.string.key_stripped) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ActionBarHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ActionBarHelper.java deleted file mode 100644 index edd12ec73..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ActionBarHelper.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (C) 2013-2014 Dominik Schürmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.ui.util; - -import android.app.Activity; -import android.support.v7.app.ActionBar; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.TextView; - -import org.sufficientlysecure.keychain.R; - -public class ActionBarHelper { - - /** - * Sets custom view on ActionBar for Done/Cancel activities - * - * @param actionBar - * @param firstText - * @param firstDrawableId - * @param firstOnClickListener - * @param secondText - * @param secondDrawableId - * @param secondOnClickListener - */ - public static void setTwoButtonView(ActionBar actionBar, - int firstText, int firstDrawableId, OnClickListener firstOnClickListener, - int secondText, int secondDrawableId, OnClickListener secondOnClickListener) { - - // Inflate the custom action bar view - final LayoutInflater inflater = (LayoutInflater) actionBar.getThemedContext() - .getSystemService(Activity.LAYOUT_INFLATER_SERVICE); - final View customActionBarView = inflater.inflate( - R.layout.actionbar_custom_view_done_cancel, null); - - TextView firstTextView = ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text)); - firstTextView.setText(firstText); - firstTextView.setCompoundDrawablesWithIntrinsicBounds(firstDrawableId, 0, 0, 0); - customActionBarView.findViewById(R.id.actionbar_done).setOnClickListener( - firstOnClickListener); - TextView secondTextView = ((TextView) customActionBarView.findViewById(R.id.actionbar_cancel_text)); - secondTextView.setText(secondText); - secondTextView.setCompoundDrawablesWithIntrinsicBounds(secondDrawableId, 0, 0, 0); - customActionBarView.findViewById(R.id.actionbar_cancel).setOnClickListener( - secondOnClickListener); - - // Show the custom action bar view and hide the normal Home icon and title. - actionBar.setDisplayShowTitleEnabled(false); - actionBar.setDisplayShowHomeEnabled(false); - actionBar.setDisplayShowCustomEnabled(true); - actionBar.setCustomView(customActionBarView, new ActionBar.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); - } - - /** - * Sets custom view on ActionBar for Done activities - * - * @param actionBar - * @param firstText - * @param firstOnClickListener - */ - public static void setOneButtonView(ActionBar actionBar, int firstText, int firstDrawableId, - OnClickListener firstOnClickListener) { - // Inflate a "Done" custom action bar view to serve as the "Up" affordance. - final LayoutInflater inflater = (LayoutInflater) actionBar.getThemedContext() - .getSystemService(Activity.LAYOUT_INFLATER_SERVICE); - final View customActionBarView = inflater - .inflate(R.layout.actionbar_custom_view_done, null); - - TextView firstTextView = ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text)); - firstTextView.setText(firstText); - firstTextView.setCompoundDrawablesWithIntrinsicBounds(firstDrawableId, 0, 0, 0); - customActionBarView.findViewById(R.id.actionbar_done).setOnClickListener( - firstOnClickListener); - - // Show the custom action bar view and hide the normal Home icon and title. - actionBar.setDisplayShowTitleEnabled(false); - actionBar.setDisplayShowHomeEnabled(false); - actionBar.setDisplayShowCustomEnabled(true); - actionBar.setCustomView(customActionBarView); - } -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java index b456b61ab..34e7b639a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java @@ -33,17 +33,16 @@ import org.sufficientlysecure.keychain.R; /** * Class representing a LinearLayout that can fold and hide it's content when pressed * To use just add the following to your xml layout - - - - - - - + *

+ * + *

+ * + *

+ * */ public class FoldableLinearLayout extends LinearLayout { @@ -75,6 +74,7 @@ public class FoldableLinearLayout extends LinearLayout { /** * Load given attributes to inner variables, + * * @param context * @param attrs */ @@ -87,8 +87,8 @@ public class FoldableLinearLayout extends LinearLayout { a.recycle(); } // If any attribute isn't found then set a default one - mFoldedLabel = (mFoldedLabel == null) ? context.getString(R.id.none) : mFoldedLabel; - mUnFoldedLabel = (mUnFoldedLabel == null) ? context.getString(R.id.none) : mUnFoldedLabel; + mFoldedLabel = (mFoldedLabel == null) ? context.getString(R.string.none) : mFoldedLabel; + mUnFoldedLabel = (mUnFoldedLabel == null) ? context.getString(R.string.none) : mUnFoldedLabel; } @Override @@ -138,7 +138,7 @@ public class FoldableLinearLayout extends LinearLayout { private void initialiseInnerViews() { mFoldableIcon = (ImageView) mFoldableLayout.findViewById(R.id.foldableIcon); - mFoldableIcon.setImageResource(R.drawable.ic_action_expand); + mFoldableIcon.setImageResource(R.drawable.ic_expand_more_black_24dp); mFoldableTextView = (TextView) mFoldableLayout.findViewById(R.id.foldableText); mFoldableTextView.setText(mFoldedLabel); @@ -151,7 +151,7 @@ public class FoldableLinearLayout extends LinearLayout { public void onClick(View view) { mFolded = !mFolded; if (mFolded) { - mFoldableIcon.setImageResource(R.drawable.ic_action_collapse); + mFoldableIcon.setImageResource(R.drawable.ic_expand_less_black_24dp); mFoldableContainer.setVisibility(View.VISIBLE); AlphaAnimation animation = new AlphaAnimation(0f, 1f); animation.setDuration(mShortAnimationDuration); @@ -159,12 +159,13 @@ public class FoldableLinearLayout extends LinearLayout { mFoldableTextView.setText(mUnFoldedLabel); } else { - mFoldableIcon.setImageResource(R.drawable.ic_action_expand); + mFoldableIcon.setImageResource(R.drawable.ic_expand_more_black_24dp); AlphaAnimation animation = new AlphaAnimation(1f, 0f); animation.setDuration(mShortAnimationDuration); animation.setAnimationListener(new Animation.AnimationListener() { @Override - public void onAnimationStart(Animation animation) { } + public void onAnimationStart(Animation animation) { + } @Override public void onAnimationEnd(Animation animation) { @@ -173,7 +174,8 @@ public class FoldableLinearLayout extends LinearLayout { } @Override - public void onAnimationRepeat(Animation animation) { } + public void onAnimationRepeat(Animation animation) { + } }); mFoldableContainer.startAnimation(animation); mFoldableTextView.setText(mFoldedLabel); @@ -185,6 +187,7 @@ public class FoldableLinearLayout extends LinearLayout { /** * Adds provided child view to foldableContainer View + * * @param child */ @Override diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png deleted file mode 100644 index e9d2dcb46a4a56b580856cc6a64b463c01e05228..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmV;^0WAKBP)jn> z3~dDwNoxfl_^|{(Fbv5>#G!Qp5c~|?>zTvX5D~UU0D^x(_pC7;(`BTw?IB`!a{&lm zz4e(P_&|R91`#1dtZyPfQ)x;As}g!`h3eO=G^W(p6mOnk9^`-VzWxj9QVdoC-HSQ8+Vdz#=cDvu@QHkYq<*mw$I(kFCtv;Q_LI@#*kTU)R7yzMQmAaDZiB13j002ov JPDHLkV1fxF#%urp diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png deleted file mode 100644 index 29f4de2117134c34dbfe9abe8a76aeba382d9322..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 415 zcmV;Q0bu@#P)Y31*WF4 zV6n{3?m=d;!(zdrQF{R_8avH3xh16B(mz{k_$SHj1poj50002^S2EW> z=6SxPsitx7y6zD}4CN?j+R|t!NAL2?!Xth~V@;!^L}di=I%df^s#z<*!3*POU4@J5 zN?9stOmXgnKogr zde0`Fj&U|DUW#+^X%bmL+1FflY3sDM|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?*3dSx!+o4)i+%gQu&X%Q~loCIC4@ BZ2tfN literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0fd15563a263e138b1f419e02a807ff8c40f2554 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?IB4!nj``h|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?P`4@q;fo z;7>^Eosi_1DTb0aoh3IXyFFMrkMTgzu_cogR|+}@ir&)m@n8GhyjNoJH1+sd9o<2% an)y7uo!)z>2P^{G#^CAd=d#Wzp$P!dB}y9r literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ed993f35de5fa2f7058213f07e49a818960715ca GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?UMB)pOcz?=DeCsuS~P3z3btd5q-JW1CS+xG8=8uyoSWj3 kA9F8}&+CV=#BXow*q6@cuId*|f%YXP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00E0hL_t(Y$L*H8N&`U@hX07hLJ8QYpqOmZ*^79od;tp^ zb%|K|0D_Rp=xbQncq^;|UIV^E2ncpc1O*Y)CMNkT9HN`dY$94Hc&1o(=bUfn%$f5u z5%e?Gp?}b?040^tsY)uVqFbFQBQG$Y4ZL9=9tTuuv?@EqjmHLjj<93Wyx_7Y77&}z z8nk9YYUJ?o=%SMZKF4*~iFt;C(#EO4Skv4zSAo@qfIO4b89mmd`?zTjv~O0^<0!&r zdn-y(1!|V0J}T7~C<8#wfyp*i&bA9ge9pQ2f VFoeR4ydnSq002ovPDHLkV1j|y+zbE! literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png deleted file mode 100644 index 4ac28f270fa5dd48b6f0ec7e0157dcf126606774..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 404 zcmV;F0c-w=P)F6XU=)mkQ9uDOHa3<8 zVM@$kro?g}RRqMAQc_aaoGeZ&kyBm105j(bi@T>&159fVo*?L0Nv(vNaB~#P< z0~(9vA7-)GVfhF2)DkonJv+^n+>+9CE!~EDm%MaoUhmy|y;UiJKp+r!P?lwmNEe(> zHHR-J@fF8%LiC7p*L6c|ah}h3{^iQscsPy-O`?U=p-vp)Yo1NXrD6r#5M$S$Za`f8 zP`qI0K>;MqI70IZT97tYo-SM&Te|24dHpOC zIt-;nY>n*);>z#6Rs6}~LE|Qo&USUFLep7I07dNBvD3IHevjcxWKGga{9lY>Rbr~0)b!w-U18&cCAc{Ykp0@00000NkvXXu0mjfXO=~G=WkL6 z?djqeVsZNE<(-@d40s#@#Us@px5&h~olfyS=r7punEB+o-do=f3RwsoQ}Yp7lkDg+ z@t?w?3-T#<__^M(if(Ua^FMg#?7Pn*ISoY>fBvg5PPzQ-CtrS1zqO?&j77u@O1TaS?83{1OTdXQaAtr literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e80681aeb7305ab08c1f55df7edd35fc9d0eb171 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkL+ z@9E+gVsZNEWNV?r3OuY&?=Z?L&Ho)f{7Mm9$xa9H@#qTmGi6+RV TUAFrSbQ*)FtDnm{r-UW|v%+BV literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ab2c5d3e5114b04db552f267403ebd00824bce GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkM1 z=IP=XVsSb-L4vhe(u6_L^VEOlL}txX{}~h~Mme0SH*PU(5nj%^OopZ70#l$I*K^@3 sml#6inv|F>1+|~&(^YbDJE*|GkjN-|?y+u31kgkVPgg&ebxsLQ02ih;>;M1& literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..73fc3b4223188ffb3368825c73353e31705488bb GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkM1 z=IP=XVsSb-L4vhe@P&|K6N{AOKLeKq9WKnSQU%!=2|xHl1UeV}vA5%05!DgUcR|Q? tO;L;3qN#_sOjsbZXlbHJFK-$H!%H67Ur|ws^MNKZc)I$ztaD0e0sw?SIamMy literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..235c84f1e5ae02090f7d9e606ab025ac421791d3 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkKx z$X}z-W_$b!{UqMfxgg+Y2*GnN7D4e#B!a-54~*{Z!wwfd3NoTilU2CuZ0B6Z_UsBP`#&E m+Is1!bIblNdm{hmW&YvE^KNo&|F$0JI|ffzKbLh*2~7YK7l&a0 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png deleted file mode 100644 index 60ac6b066f200e6929d205c473aa6b9d119d5d4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP)dd;NaDz10ao;2tjLvg-jZ1K2$hvDmr)i*b&6>8{+tt+X~PT*EH<3V@OULmC(yw1*pUy+_)l5^|4J!DG_m=%x_7N$CUUeZcu3)d^8ZFn9_2 z3br5OCOh~P^driAAg4lYiB(9O9K&Y<-=BYz00b|kdlAydvSSYj{>}6(IT9nlxwb=b zg^Q;XVw^-0+ysJ;qV#Le^oVDN*b|}zJzgl>P<_962e2_kZI3Lm7p>F)7I(S`k5AglNG5OpvW^$L|JnAxNq=KdMKKfP-8za1A%qY@2qA*C9jcNenUx5Nv}*F3ZMZeZt7-d%P%!zAqW*I(9!AAC#nGjeaNKlsmRCWFB} z*Yfr8s?6&i9!b{{H2IOfh5PSIp>O6J{y((}-`etVn%4gQk2QAlUHRgU$jepy;rgvT z{pUHa9|=*#&i73-S6j9{$lb>(oX|2&a^ClcFASVM7^UAgPzk>ONUu@0eV17Ky$O?c z<}bbe^_~gO?1SelUg|Y8ZFYDl$QaGu=Fzz8&w9-n=ns3-{3*SQrFLp? z?o4wE+jMF6Imvsj+odvUy~J#!=7=sMfX|s|H=u;YdtN_F0fg${~+s)o!Vb=@`LSf zZ%TU={IXxE;V@rdXY9**S?hPHS4x`&rv6MdH)M0i#IRtrMFKOJ&@Sm5%kjE zsiEm=-NMZI%RgzZWSI7M->WI{$Bt9 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e5024472a2a23e2bc0dba3616a45af725d0ee701 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq zAA7nuhD02Gd)=F_$v~v_VUo|B85?BeOOnsMTi0QoVA;iO;nySbYu|R+jIPdRp?~}n z%q}@zy<0Z*H*bama~=PMS82Tq@3=o^ZMe30>E|0lOYGlJRm!Dr)-hSfD z?Qn+?wG?C$wW<_AyxmJ6P|!{gJx$_;8aeqL~i?wC2B|NN8Igy+fL zte&4gZtY0004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_009a~L_t(o!|m5g4uUWgh2e{kxIvTw;NDPC;}$JB4lqhd zALpV>OkoK9KLVwJ46^RFS-GEp1SB8;6w*sYS86#*?l}h6Uf>SEpn?#4jRC*~x$CHV z$Q9$p5DkXc*(V;TVMyYWH`wz4OGNX2fFas<{^84qfEYpL!$622^D)3j947f)xWLTv zIibiiz?@L!Ilv}9`H~sS0aHSi=K-6b^H{iCXR@WwrLTXmZjnL#%Uje;9<9+4+I(rv zD1y-D=aV){#PY3k-YW<`Z@;xPu`I73{Q3BrLlI2gzuptXH+hP159`UiO>{hv;}-f- wa1v+DhnFD7naqzw=gvd2^p}}{1pEQ;1dp!cmVSGKY5)KL07*qoM6N<$f)#I~?f?J) literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..47c7b52a10ab497ef984a7fc340db983a77376a6 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq zt36#DLn02poodb1;K0NBJnYrcBW`z;SBpnbP0l+XkKZ(>^a literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..45d30d999c244a24e085092a57a98a7268466b68 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq zJ3L(+Ln02pof62^pdi3{f341kB*(A|t=)VZYF#3tI9>@InVmn=@kVTefD^~hIdZw5 zdR?clp05}o%-PM`q#3R+uqH#O>ZJFa#_uiHxsOe004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00H$$L_t(o!|j(%ZxT@yh7oM#OB;7Zi7_}Pu8cndb<-t~ zYFzM7gw|H5E=*jYR5pz+OkDLxXiCzi!L==Zpkg#GG&D?`Jl$MwX2NjqolzE=IkSPx zd*5g7aL&1h2$AVtkq{69{ujV$Zm~|A@7NsigKb*e=8T83;vaCC76ZIuz%wkDwhI0L z2_ABYDs0w>3-uEC16aJpBs%1Xuq?hA1Fq3`n7m_!JQ-$*G0%1Ce01FH)0CeL0hYsl zj{?y##YxJ1@z{?MAVEhi*dRG^muJ}w2B=GUO_O6$cKrh^Z29!MBwh}(gQk4a6+h+iscd#ng}h73 z$bOEVSnIcIL}S$4s-a-l_0ZeZtOt!jvX!p z9e(4~SA3Fs)WsD)`7pO+?%%7OJ?EPbK4@bQ zQT`__d3L6K>?w;CQ38*;I`4;k%>Hlr)UCN7a;oW0uFm_D4&P(?X#3h|n^fEHbrJ*R(H z6mq1RE=;m4ompL^9~|JdyjbVZcOjN7**q_fhgzy^SNdqaWo?4s{{WX)`qn4!U$ons z;pKIx&1%WQ`<~@?46jP=omwH?{Ved(1-p%E1=y=cl_H#>;&zy71b>_v&UYc1`Gi8It z`qj?6w6r+ZDSWI=teJEuEiF&e|7J+HbC&qi36BmOI=|1#=Sj&ThO?WeoZb6iz18Cb zkD_y*1qv;n{Bc)V&v{u#>B_?cNOnSd-|{E5z`&l?Y~~^UmI5P zsH82>HDI>Y+X;Wx-QW-09J7G+&Z_fuE9B~BLVH%q1qI(049A&HW$HK$7`!JYbC)m8 Qas#DgPgg&ebxsLQ0A`Yuu>b%7 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png deleted file mode 100644 index 22003198b45cb61d51ccb07748599367d02d9c17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 974 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mISYMOPHFEhAj~2P%cWqfFY(UWA*#@Pz45&8 z&xvOi>CSYW-q^MNvHhIS6X%BZ+n-B(mg2}n|(Lyj=NIW5v0D-3s3sN-dRESk2wF zbH3{mzD$MM_IXFwpL|?#EUj98SIj=)kJgU20|Y<0rEleWJ)uQC%64DQs<+|#Mt%CC z|3i+v7k{L%%)5)@*Hx{Bb4ueU*r~p}eLAvc>m+~KT`xF)l*TRpY4JQE_HOH?ZHxa~ zv~M&Kzmf7jPxo8Mr_SUD;bEU1i+0_gRp>CsTJXv5^PjGz9d>8>@<8eI>9x9^k+MN| z&7NPh?^?e|-m+`G=#Pu-W^qCZo)R;B*QVb2bL!cIY1>u;gY;lp*3nvlkNbaIIvUNS zma}TL^R4(}Ko45R9eVktChL(YqcGpf!ejv{FyJGSd9rgMYSaJ6Ixw-sy0r9@lP} z>8Jjyw%?x5@R|je%x*ioh)us;IsBFvh#G|Q+8z&|JK67f@r#eF^BKIG?kRrNyMmH+?% diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6e03d54cf42955e7a3169bcfbe4649277e729727 GIT binary patch literal 460 zcmV;-0W004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00BfvL_t(&-tF2=Zo)7S1z>|X00$@}3oghF=4R~?*z?m$ zJ;-ChqA1{a#>}&kIuj`yN71L)@jOLYAiY;DdjkR#pa2D^Hy}U(3ef)mt=|hYrbCkK zC|VyQegFXSe7qMYOX|nTkXo*xF@2?>cvZKj(|O92oK~Pg%V`4|@U7*v0GT*^kdea% znK@ig1&0Z$;_yI~92TgW!vPJr)N&Z0mpJ~Q7di8w9X|2VmNN(1;TOQsKyu*ZK{pNz zBo|H&^v3~!lY->L$$|Eho0mviFHU~S#6WW7%q{9i(uU8Of9*9SXHIEjERozf<(+y; zI^U5998K%UktiHpFMCEJakS0#kwoI?yZw|z;#lH`wBXqCknlOyfF^8?JuwQGQxjo@ z$*IfK!s8&VDn8B0-Pyes@gqTi0u-PC1t>rPYFk(0+Vf$3g+;3X0000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Cr4L_t(&-tF2!a>F1D1yH3Md^D1r)vXtGlB0R|yYM1S zLX6OtJ4{Eg^@ukHjKuf=>8pK6fC3bt00k&O0Sb`FSw>0JID<@*RZpVc&sYF_BSDOP zzzx8HTz^)}0YO?h0I=Z5g6CRb6Cl2(9$2K>T9ytIoa-f8nAiZ*`@3I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6kOry;uw-~@9mX9zC#K;4T*jaIIm1z^?2T^NRcG5n+aa>wfoyR*GredRNm%R44U&6y*d+5On% z*U^)6b3FfB99tsSr?_(ZXGPnsoI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6x`zJ;uw-~@9hOop+gEHt{1m6$2y(}TD&g!tlxb%J-uueP%U(n>gp4 z{pzOrExuZ3I#oj-9GNgD&(xyYQ`EBBW2$BJl67|Jy(vc`l_ZM}sRa9Vq@0OVpII=? zGi{E+$tj=xjh>(J^ewPkl4ijl6fC0z241;LC0RV%-B){y1KrQy>FVdQ&MBb@06LI! A^Z)<= literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..72128fe69086bd90233bd2f16ca25cd52f423326 GIT binary patch literal 875 zcmV-x1C;!UP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00QGlL_t(&-tE~>NRwe4!0}CTo{HE;x%AM%xu62Y4l4=5 zL)5J>sA)kGC5fenLhzE>F|ZsdL3A_fP}i9R5)?rwRM%VObYIzLi4$aA zihqXFZWXpZqu8**g`zoKtYlnHjrybG@8@_{Ip!(53P$agM%M4?utis$x-&H*Dp zk8kE-)f!b=q{JT%hI7$0*Sxmp~@O40KeOUgyh7>7%-wczKq z66Ym5OSRWg$yI5pEZi39rJ}T(FFuBgtmZFq1JB0n26^b_)jEaWHD1u2f6Y^>?Wt{? zI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`%Ie)5S5Q;?~<62YnAa2(&(YZe3)xfY-r`(UWmy8}l;$UkwFpRtto796snVt@G{O zxpU{T}khKzBh04cV}Q^5pX~y7SxtmJX{%jfG_>d13~B64Tka#9RcbI zr}%}kSk8QAZu!M9{pakKTMVavo@JQy`85;Ar);Kv-0_06dqd}x6jnU_P$tv!hN9t z6??G_$8G(7tkbvW+i=`?-G{ctGXiw%*$kdB3kY*PYiA7JHzmNto@K^!Z;sZ_+ZnI_ z_%ofK;k|{6aM$zpx<*ER?)%4tcs?Ee&uF>uIQKiR=f`bYuW`87{Cs|VFZ(6Vw4WRE zADJ{I*8Pdqn3phXe$mWmwVDS8$`a3)-*r38^7+q|*I&#ID%#h|MW~m^{hZX8)_bAy z$!WDssZ2JXmMW*p98`$66K>~J`)TR?*X*E%eZKZaKZDcfV^`}4^L+mN-Dx_@<(l53 z*XAV5S-*MaY>sC?qgEfC_+Y~N?b5RU?9MXX;ll`Pj`RAy8-Fs!Uw)wgjAI5*S3j3^ HP6I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s zRKe%z;uunK>+Nmdyh8>8ZHbpxdC!t-6PsA@Az*9tuW|{ks)qI5Is(2vHs8$WDV#^lJw82zHADRtFfbG4gHTD`+TfU|z#4lOX$m0W5We-Q=O=n$W0Q z7uuIr=%3ieCeN^Mqu4w1{aY=VZaj|LHa}+~drgvrS>g%y26IV8{rSEYPrErM{n4Mp z-(4_IUuB8@=dO*4!X_uX5V?1HO6%{pS+`z&G2gTLp@3D==llE%%bt1rs9!l7u5jhta^Z@fm-)T; zCa)Lby!CVS3D2o+7tZl>>|*&_lj_u46Y4a##?>iv-;*-e)&&#g_eX{(Tsaf22-92i zY5URsj82yB8m)tB^F214S}yqJlPAmR8ZO1!mEx^`EEYazmfF+*$++&iuhN^1PniD+ zMf^-|Qi!h-vl5)~^Epf4zCTt50yloDHyPMJ_qvm?e1g3|Ri@pcL;t;BGO)*dw>VHG ulVHoYL5@A5pLxx3#%qrmUhk|rpuh24@WsQ^%4LDcg~8L+&t;ucLK6To`3n{R literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..08ae54533bec72882cb1e8424fcdb18c58526a35 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6nx<6;uunK>+RK>yoU?~Tm!`!Y@OtF-t{ikEl61?Aeg>U`B`tt`9F)xMJEDngMtlf zXPo=`Cw$k7>V3Cc>h_&(d0117jA<{?gsA)u%i!e`Dyht=coHcnC;&j?h|1bZlt~qKc)ZF7nat| pFWB@$Ox}FPd|^IDm^&Hr_Au_ry_>G@wc`;;%+uA+Wt~$(697udjrITl literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..228b2a982cca4ed080585cd4333571e8143edbc1 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6#VSz;uunK>+Owbu4V%Pw}+7q-LrGbFG}y&vh6~wul$k~rpGc=W;TA-b@hi~CBPJMSrRUVqvL z`*_!^rshntjCdfYQ1;r>{RZwlw$uye)j@%>8KzS^s{u?EJZX z7W=L*ER#Q97Cv)szJCRukk9#eKLdOFc@L86bQEp=XMOCF^eZs7w>|jg&lZ-;pQj6- zIp43oV}||wf{$NbT>UlA-nYQKe$IoUy7>>v>ZU)avV%E%!wc@}HTT4GgJ%nZggjmS KT-G@yGywqdZ004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Z<%L_t(|+U=TeNS#$2$M3zGqNy_{Ehs`}tygo=h7qGz zTgG09vD#iO3ihTKU8nAafz+mwnnmGQAvHEC{}jZ8jScoksFgd%gF0e$R0aoO9k?p8GxD&%Nh4=RCjX8zB!&24 z{Qv=8<4>g860an%9}qwWCy;LM-kVCz%I5(9WYd?_$`swisi2f1vdAExQua{8SIi{+ zUKg2~{Qv;6xR}tw93AXTx>xL`lUoVD|C8Y}VSpHC6AV5YG z?$SbTS~{EglvVoxuNsFKrOeY(u$L*j08bis+;7P9yc9pe6?*_NzBkB!Ow89_p2K-t z0B;z?KM^OgW~q};^lzUJrJQ<`)%69 z0rb~~hvWcqnN!4<*&%9wx3<V-!G`{#e4a4kQJ3NwDUaHO zv5!;1rxr6gm#_>t&q>OS39Ntc%Q=}O}VINOWOg0a&iEX?< z9X*D<&*HxKb_j4 zImqB^A;(zoWPX7LAG^3{^f-??hSM@XOx(YDIe@kP3?K00x - - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml deleted file mode 100644 index e9047e759..000000000 --- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index 13cf7c225..d6165c1e0 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginRight="10dp" - android:src="@drawable/ic_action_expand"/> + android:src="@drawable/ic_expand_more_black_24dp"/> + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml new file mode 100644 index 000000000..b1d5efe76 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml similarity index 56% rename from OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml rename to OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml index ec27e394a..7c2c2a62d 100644 --- a/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml @@ -1,19 +1,3 @@ - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml similarity index 55% rename from OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml rename to OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml index 2590f272c..cd24a1e6d 100644 --- a/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml @@ -1,19 +1,3 @@ - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml new file mode 100644 index 000000000..49018fee1 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml new file mode 100644 index 000000000..ed375094f --- /dev/null +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 95e224672..459bdf99c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -20,7 +20,7 @@ "Settings" "Cloud Search Preferences" "Apps" - "Keyserver Preference" + "Keyservers" "Change Passphrase" "Share fingerprint with…" "Share key with…" diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 602c85247..deab168d3 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -18,7 +18,7 @@ - + @drawable/ic_close_white_24dp