diff options
72 files changed, 359 insertions, 205 deletions
diff --git a/.gitmodules b/.gitmodules index 4eab2e4eb..b7b0e1173 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "extern/StickyListHeaders"] path = extern/StickyListHeaders url = https://github.com/open-keychain/StickyListHeaders.git -[submodule "extern/AndroidBootstrap"] - path = extern/AndroidBootstrap - url = https://github.com/open-keychain/Android-Bootstrap.git [submodule "extern/zxing-android-integration"] path = extern/zxing-android-integration url = https://github.com/open-keychain/zxing-android-integration.git diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index fd0c4c6ba..f419141b4 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -10,7 +10,6 @@ dependencies { compile project(':extern:openkeychain-api-lib') compile project(':extern:html-textview') compile project(':extern:StickyListHeaders:library') - compile project(':extern:AndroidBootstrap:AndroidBootstrap') compile project(':extern:zxing-qr-code') compile project(':extern:zxing-android-integration') compile project(':extern:spongycastle:core') diff --git a/OpenKeychain/src/main/assets/fontawesome-webfont.ttf b/OpenKeychain/src/main/assets/fontawesome-webfont.ttf Binary files differdeleted file mode 100644 index 7ec2e1de8..000000000 --- a/OpenKeychain/src/main/assets/fontawesome-webfont.ttf +++ /dev/null diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 28495d51d..b5609a327 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -405,7 +405,11 @@ public class ProviderHelper { // classify and order user ids. primary are moved to the front, revoked to the back, // otherwise the order in the keyfile is preserved. - log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, trustedKeys.size()); + if (trustedKeys.size() == 0) { + log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING_ZERO); + } else { + log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, trustedKeys.size()); + } mIndent += 1; List<UserIdItem> uids = new ArrayList<UserIdItem>(); for (String userId : new IterableIterator<String>( diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java index cb58f8734..e49c11e08 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java @@ -28,8 +28,7 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.Spinner; import android.widget.TextView; - -import com.beardedhen.androidbootstrap.BootstrapButton; +import android.widget.Button; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; @@ -57,7 +56,7 @@ public class AccountSettingsFragment extends Fragment implements private Spinner mCompression; private SelectSecretKeyLayoutFragment mSelectKeyFragment; - private BootstrapButton mCreateKeyButton; + private Button mCreateKeyButton; KeyValueSpinnerAdapter mEncryptionAdapter; KeyValueSpinnerAdapter mHashAdapter; @@ -107,7 +106,7 @@ public class AccountSettingsFragment extends Fragment implements .findViewById(R.id.api_account_settings_encryption_algorithm); mHashAlgorithm = (Spinner) view.findViewById(R.id.api_account_settings_hash_algorithm); mCompression = (Spinner) view.findViewById(R.id.api_account_settings_compression); - mCreateKeyButton = (BootstrapButton) view.findViewById(R.id.api_account_settings_create_key); + mCreateKeyButton = (Button) view.findViewById(R.id.api_account_settings_create_key); mCreateKeyButton.setOnClickListener(new View.OnClickListener() { @Override diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java index f5d5b8f97..6bf6b655d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -165,6 +165,7 @@ public class OperationResultParcel implements Parcelable { MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error), MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good), MSG_IP_UID_CERTS_UNKNOWN (R.plurals.msg_ip_uid_certs_unknown), + MSG_IP_UID_CLASSIFYING_ZERO (R.string.msg_ip_uid_classifying_zero), MSG_IP_UID_CLASSIFYING (R.plurals.msg_ip_uid_classifying), MSG_IP_UID_REORDER(R.string.msg_ip_uid_reorder), MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing), diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java index e5d06ccbb..fd3d4ed00 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java @@ -80,7 +80,7 @@ public abstract class OperationResults { } }; - public void displayToast(final Activity activity) { + public void displayNotify(final Activity activity) { int resultType = getResult(); @@ -130,6 +130,7 @@ public abstract class OperationResults { } } + // TODO: externalize into Notify class? boolean button = getLog() != null && !getLog().isEmpty(); SuperCardToast toast = new SuperCardToast(activity, button ? SuperToast.Type.BUTTON : SuperToast.Type.STANDARD, diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java index 28a465436..c12b5b7be 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java @@ -32,8 +32,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.EditText; +import android.widget.ImageButton; -import com.beardedhen.androidbootstrap.BootstrapButton; import com.devspark.appmsg.AppMsg; import org.sufficientlysecure.keychain.Constants; @@ -57,7 +57,7 @@ public class DecryptFileFragment extends DecryptFragment { // view private EditText mFilename; private CheckBox mDeleteAfter; - private BootstrapButton mBrowse; + private ImageButton mBrowse; private View mDecryptButton; private String mInputFilename = null; @@ -75,7 +75,7 @@ public class DecryptFileFragment extends DecryptFragment { View view = inflater.inflate(R.layout.decrypt_file_fragment, container, false); mFilename = (EditText) view.findViewById(R.id.decrypt_file_filename); - mBrowse = (BootstrapButton) view.findViewById(R.id.decrypt_file_browse); + mBrowse = (ImageButton) view.findViewById(R.id.decrypt_file_browse); mDeleteAfter = (CheckBox) view.findViewById(R.id.decrypt_file_delete_after_decryption); mDecryptButton = view.findViewById(R.id.decrypt_file_action_decrypt); mBrowse.setOnClickListener(new View.OnClickListener() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index f67e54cf3..6b8358538 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -29,8 +29,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; - -import com.beardedhen.androidbootstrap.BootstrapButton; +import android.widget.Button; import org.openintents.openpgp.OpenPgpSignatureResult; import org.sufficientlysecure.keychain.R; @@ -52,7 +51,7 @@ public class DecryptFragment extends Fragment { protected TextView mUserId; protected TextView mUserIdRest; - protected BootstrapButton mLookupKey; + protected Button mLookupKey; @Override @@ -65,7 +64,7 @@ public class DecryptFragment extends Fragment { mSignatureStatusImage = (ImageView) getView().findViewById(R.id.ic_signature_status); mUserId = (TextView) getView().findViewById(R.id.mainUserId); mUserIdRest = (TextView) getView().findViewById(R.id.mainUserIdRest); - mLookupKey = (BootstrapButton) getView().findViewById(R.id.lookup_key); + mLookupKey = (Button) getView().findViewById(R.id.lookup_key); mLookupKey.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 4309e3505..d734c31db 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -34,13 +34,13 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.LinearLayout; import android.widget.Toast; -import com.beardedhen.androidbootstrap.BootstrapButton; import com.devspark.appmsg.AppMsg; import org.sufficientlysecure.keychain.Constants; @@ -97,7 +97,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener private boolean mNeedsSaving; private boolean mIsBrandNewKeyring = false; - private BootstrapButton mChangePassphrase; + private Button mChangePassphrase; private CheckBox mNoPassphrase; @@ -372,7 +372,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener setContentView(R.layout.edit_key_activity); // find views - mChangePassphrase = (BootstrapButton) findViewById(R.id.edit_key_btn_change_passphrase); + mChangePassphrase = (Button) findViewById(R.id.edit_key_btn_change_passphrase); mNoPassphrase = (CheckBox) findViewById(R.id.edit_key_no_passphrase); // Build layout based on given userIds and keys 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 3f330ee94..b6a95a517 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -17,6 +17,8 @@ package org.sufficientlysecure.keychain.ui; +import android.app.ProgressDialog; +import android.content.Intent; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; @@ -27,7 +29,6 @@ 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.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -43,12 +44,17 @@ import org.sufficientlysecure.keychain.helper.ActionBarHelper; import org.sufficientlysecure.keychain.pgp.WrappedSecretKeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.ProviderHelper; +import org.sufficientlysecure.keychain.service.KeychainIntentService; +import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; +import org.sufficientlysecure.keychain.service.OperationResults; +import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter; import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter; import org.sufficientlysecure.keychain.ui.adapter.UserIdsArrayAdapter; import org.sufficientlysecure.keychain.ui.dialog.AddUserIdDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.EditUserIdDialogFragment; +import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment; import org.sufficientlysecure.keychain.util.Log; @@ -260,8 +266,6 @@ public class EditKeyFragment extends LoaderFragment implements String newPassphrase = data .getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE); -// updatePassphraseButtonText(); -// somethingChanged(); mSaveKeyringParcel.newPassphrase = newPassphrase; } } @@ -270,14 +274,6 @@ public class EditKeyFragment extends LoaderFragment implements // Create a new Messenger for the communication back Messenger messenger = new Messenger(returnHandler); - // set title based on isPassphraseSet() -// int title; -// if (isPassphraseSet()) { -// title = R.string.title_change_passphrase; -// } else { -// title = R.string.title_set_passphrase; -// } - SetPassphraseDialogFragment setPassphraseDialog = SetPassphraseDialogFragment.newInstance( messenger, R.string.title_change_passphrase); @@ -356,8 +352,73 @@ public class EditKeyFragment extends LoaderFragment implements } private void save() { - getActivity().finish(); - // TODO + String passphrase = PassphraseCacheService.getCachedPassphrase(getActivity(), + mSaveKeyringParcel.mMasterKeyId); + if (passphrase == null) { + PassphraseDialogFragment.show(getActivity(), mSaveKeyringParcel.mMasterKeyId, + new Handler() { + @Override + public void handleMessage(Message message) { + if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) { + saveFinal(); + } + } + } + ); + + } + } -} + private void saveFinal() { + // Message is received after importing is done in KeychainIntentService + KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler( + getActivity(), + getString(R.string.progress_saving), + ProgressDialog.STYLE_HORIZONTAL) { + public void handleMessage(Message message) { + // handle messages by standard KeychainIntentServiceHandler first + super.handleMessage(message); + + if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { + // get returned data bundle + Bundle returnData = message.getData(); + if (returnData == null) { + return; + } + final OperationResults.SaveKeyringResult result = + returnData.getParcelable(KeychainIntentService.RESULT); + if (result == null) { + return; + } + + // if good -> finish, return result to showkey and display there! + // if bad -> display here! + +// result.displayNotify(ImportKeysActivity.this); + +// getActivity().finish(); + } + } + }; + + // Send all information needed to service to import key in other thread + Intent intent = new Intent(getActivity(), KeychainIntentService.class); + intent.setAction(KeychainIntentService.ACTION_SAVE_KEYRING); + + // fill values for this action + Bundle data = new Bundle(); + data.putParcelable(KeychainIntentService.SAVE_KEYRING_PARCEL, mSaveKeyringParcel); + intent.putExtra(KeychainIntentService.EXTRA_DATA, data); + + // Create a new Messenger for the communication back + Messenger messenger = new Messenger(saveHandler); + intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger); + + // show progress dialog + saveHandler.showProgressDialog(getActivity()); + + // start service with intent + getActivity().startService(intent); + } +}
\ No newline at end of file diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java index e4ba6ebd0..51963e963 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -27,8 +27,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.TextView; - -import com.beardedhen.androidbootstrap.BootstrapButton; +import android.widget.Button; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; @@ -52,7 +51,7 @@ public class EncryptAsymmetricFragment extends Fragment { OnAsymmetricKeySelection mKeySelectionListener; // view - private BootstrapButton mSelectKeysButton; + private Button mSelectKeysButton; private CheckBox mSign; private TextView mMainUserId; private TextView mMainUserIdRest; @@ -99,7 +98,7 @@ public class EncryptAsymmetricFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.encrypt_asymmetric_fragment, container, false); - mSelectKeysButton = (BootstrapButton) view.findViewById(R.id.btn_selectEncryptKeys); + mSelectKeysButton = (Button) view.findViewById(R.id.btn_selectEncryptKeys); mSign = (CheckBox) view.findViewById(R.id.sign); mMainUserId = (TextView) view.findViewById(R.id.mainUserId); mMainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest); @@ -204,7 +203,7 @@ public class EncryptAsymmetricFragment extends Fragment { userId = null; } if (userId != null && userId[0] != null) { - mMainUserId.setText(userId[0]); + mMainUserId.setText(String.format("%#16x", Long.parseLong(userId[0]))); } else { mMainUserId.setText(getResources().getString(R.string.user_id_no_name)); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java index 2671e0d40..f5d89d186 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java @@ -34,9 +34,9 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.CheckBox; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.Spinner; -import com.beardedhen.androidbootstrap.BootstrapButton; import com.devspark.appmsg.AppMsg; import org.sufficientlysecure.keychain.Constants; @@ -68,7 +68,7 @@ public class EncryptFileFragment extends Fragment { private EditText mFilename = null; private CheckBox mDeleteAfter = null; private CheckBox mShareAfter = null; - private BootstrapButton mBrowse = null; + private ImageButton mBrowse = null; private View mEncryptFile; private FileDialogFragment mFileDialog; @@ -105,7 +105,7 @@ public class EncryptFileFragment extends Fragment { }); mFilename = (EditText) view.findViewById(R.id.filename); - mBrowse = (BootstrapButton) view.findViewById(R.id.btn_browse); + mBrowse = (ImageButton) view.findViewById(R.id.btn_browse); mBrowse.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { if (Constants.KITKAT) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 0d8c8233a..3ff3b56bf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -18,7 +18,6 @@ package org.sufficientlysecure.keychain.ui; import android.annotation.TargetApi; -import android.app.Activity; import android.app.ProgressDialog; import android.content.Intent; import android.net.Uri; @@ -37,11 +36,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; -import com.github.johnpersano.supertoasts.SuperCardToast; -import com.github.johnpersano.supertoasts.SuperToast; -import com.github.johnpersano.supertoasts.util.OnClickWrapper; -import com.github.johnpersano.supertoasts.util.Style; - import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.OtherHelper; @@ -55,6 +49,7 @@ import org.sufficientlysecure.keychain.service.OperationResults.ImportResult; import org.sufficientlysecure.keychain.ui.adapter.PagerTabStripAdapter; import org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout; import org.sufficientlysecure.keychain.util.Log; +import org.sufficientlysecure.keychain.util.Notify; import java.util.ArrayList; import java.util.Locale; @@ -382,11 +377,7 @@ public class ImportKeysActivity extends ActionBarActivity { private boolean isFingerprintValid(String fingerprint) { if (fingerprint == null || fingerprint.length() < 40) { - SuperCardToast toast = SuperCardToast.create(this, - getString(R.string.import_qr_code_too_short_fingerprint), - SuperToast.Duration.LONG); - toast.setBackground(SuperToast.Background.RED); - toast.show(); + Notify.showNotify(this, R.string.import_qr_code_too_short_fingerprint, Notify.Style.ERROR); return false; } else { return true; @@ -460,7 +451,7 @@ public class ImportKeysActivity extends ActionBarActivity { return; } - result.displayToast(ImportKeysActivity.this); + result.displayNotify(ImportKeysActivity.this); } } }; @@ -546,11 +537,7 @@ public class ImportKeysActivity extends ActionBarActivity { startService(intent); } else { - SuperCardToast toast = SuperCardToast.create(this, - getString(R.string.error_nothing_import), - SuperToast.Duration.LONG); - toast.setBackground(SuperToast.Background.RED); - toast.show(); + Notify.showNotify(this, R.string.error_nothing_import, Notify.Style.ERROR); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index 5eb8ecb8d..d2cb5283d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -51,8 +51,8 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import android.widget.Button; -import com.beardedhen.androidbootstrap.BootstrapButton; import com.devspark.appmsg.AppMsg; import org.sufficientlysecure.keychain.Constants; @@ -85,8 +85,8 @@ public class KeyListFragment extends LoaderFragment private String mQuery; private SearchView mSearchView; // empty list layout - private BootstrapButton mButtonEmptyCreate; - private BootstrapButton mButtonEmptyImport; + private Button mButtonEmptyCreate; + private Button mButtonEmptyImport; /** @@ -101,7 +101,7 @@ public class KeyListFragment extends LoaderFragment mStickyList.setOnItemClickListener(this); // empty view - mButtonEmptyCreate = (BootstrapButton) view.findViewById(R.id.key_list_empty_button_create); + mButtonEmptyCreate = (Button) view.findViewById(R.id.key_list_empty_button_create); mButtonEmptyCreate.setOnClickListener(new OnClickListener() { @Override @@ -113,7 +113,7 @@ public class KeyListFragment extends LoaderFragment startActivityForResult(intent, 0); } }); - mButtonEmptyImport = (BootstrapButton) view.findViewById(R.id.key_list_empty_button_import); + mButtonEmptyImport = (Button) view.findViewById(R.id.key_list_empty_button_import); mButtonEmptyImport.setOnClickListener(new OnClickListener() { @Override diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java index b36270981..e156b8b9c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java @@ -30,10 +30,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.widget.Button; import android.widget.TextView; -import com.beardedhen.androidbootstrap.BootstrapButton; - import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; @@ -45,7 +44,7 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan private TextView mKeyUserIdRest; private TextView mKeyMasterKeyIdHex; private TextView mNoKeySelected; - private BootstrapButton mSelectKeyButton; + private Button mSelectKeyButton; private Boolean mFilterCertify, mFilterSign; private Uri mReceivedUri = null; @@ -117,8 +116,7 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan mKeyUserId = (TextView) view.findViewById(R.id.select_secret_key_user_id); mKeyUserIdRest = (TextView) view.findViewById(R.id.select_secret_key_user_id_rest); mKeyMasterKeyIdHex = (TextView) view.findViewById(R.id.select_secret_key_master_key_hex); - mSelectKeyButton = (BootstrapButton) view - .findViewById(R.id.select_secret_key_select_key_button); + mSelectKeyButton = (Button) view.findViewById(R.id.select_secret_key_select_key_button); mFilterCertify = false; mFilterSign = false; mSelectKeyButton.setOnClickListener(new OnClickListener() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java index d9be88d68..c7fffe263 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java @@ -152,7 +152,7 @@ public class ViewCertActivity extends ActionBarActivity sig.init(signerRing.getSubkey()); if (sig.verifySignature(signeeRing.getSubkey(), signeeUid)) { mStatus.setText(R.string.cert_verify_ok); - mStatus.setTextColor(getResources().getColor(R.color.bbutton_success)); + mStatus.setTextColor(getResources().getColor(R.color.result_green)); } else { mStatus.setText(R.string.cert_verify_failed); mStatus.setTextColor(getResources().getColor(R.color.alert)); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 8cc587b10..a9cd0976b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui; import android.annotation.TargetApi; import android.app.Activity; -import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.net.Uri; @@ -358,7 +357,7 @@ public class ViewKeyActivity extends ActionBarActivity implements if (resultCode == Activity.RESULT_OK) { ImportResult result = data.getParcelableExtra(ImportKeysActivity.EXTRA_RESULT); if (result != null) { - result.displayToast(this); + result.displayNotify(this); } } break; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java index 10a24ddf0..448787ee2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java @@ -35,10 +35,9 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.CheckBox; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.TextView; -import com.beardedhen.androidbootstrap.BootstrapButton; - import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.FileHelper; @@ -60,7 +59,7 @@ public class FileDialogFragment extends DialogFragment { private Messenger mMessenger; private EditText mFilename; - private BootstrapButton mBrowse; + private ImageButton mBrowse; private CheckBox mCheckBox; private TextView mMessageTextView; @@ -114,7 +113,7 @@ public class FileDialogFragment extends DialogFragment { mFilename = (EditText) view.findViewById(R.id.input); mFilename.setText(mOutputFilename); - mBrowse = (BootstrapButton) view.findViewById(R.id.btn_browse); + mBrowse = (ImageButton) view.findViewById(R.id.btn_browse); mBrowse.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { // only .asc or .gpg files 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 24641a9cc..a29c17d37 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 @@ -26,8 +26,7 @@ import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.widget.LinearLayout; import android.widget.TextView; - -import com.beardedhen.androidbootstrap.FontAwesomeText; +import android.widget.ImageButton; import org.sufficientlysecure.keychain.R; @@ -50,7 +49,7 @@ import org.sufficientlysecure.keychain.R; */ public class FoldableLinearLayout extends LinearLayout { - private FontAwesomeText mFoldableIcon; + private ImageButton mFoldableIcon; private boolean mFolded; private boolean mHasMigrated = false; private Integer mShortAnimationDuration = null; @@ -58,8 +57,6 @@ public class FoldableLinearLayout extends LinearLayout { private LinearLayout mFoldableContainer = null; private View mFoldableLayout = null; - private String mFoldedIconName; - private String mUnFoldedIconName; private String mFoldedLabel; private String mUnFoldedLabel; @@ -87,15 +84,11 @@ public class FoldableLinearLayout extends LinearLayout { if (attrs != null) { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FoldableLinearLayout, 0, 0); - mFoldedIconName = a.getString(R.styleable.FoldableLinearLayout_foldedIcon); - mUnFoldedIconName = a.getString(R.styleable.FoldableLinearLayout_unFoldedIcon); mFoldedLabel = a.getString(R.styleable.FoldableLinearLayout_foldedLabel); mUnFoldedLabel = a.getString(R.styleable.FoldableLinearLayout_unFoldedLabel); a.recycle(); } // If any attribute isn't found then set a default one - mFoldedIconName = (mFoldedIconName == null) ? "fa-chevron-right" : mFoldedIconName; - mUnFoldedIconName = (mUnFoldedIconName == null) ? "fa-chevron-down" : mUnFoldedIconName; mFoldedLabel = (mFoldedLabel == null) ? context.getString(R.id.none) : mFoldedLabel; mUnFoldedLabel = (mUnFoldedLabel == null) ? context.getString(R.id.none) : mUnFoldedLabel; } @@ -146,8 +139,8 @@ public class FoldableLinearLayout extends LinearLayout { } private void initialiseInnerViews() { - mFoldableIcon = (FontAwesomeText) mFoldableLayout.findViewById(R.id.foldableIcon); - mFoldableIcon.setIcon(mFoldedIconName); + mFoldableIcon = (ImageButton) mFoldableLayout.findViewById(R.id.foldableIcon); + mFoldableIcon.setImageResource(R.drawable.ic_action_expand); mFoldableTextView = (TextView) mFoldableLayout.findViewById(R.id.foldableText); mFoldableTextView.setText(mFoldedLabel); @@ -160,7 +153,7 @@ public class FoldableLinearLayout extends LinearLayout { public void onClick(View view) { mFolded = !mFolded; if (mFolded) { - mFoldableIcon.setIcon(mUnFoldedIconName); + mFoldableIcon.setImageResource(R.drawable.ic_action_collapse); mFoldableContainer.setVisibility(View.VISIBLE); AlphaAnimation animation = new AlphaAnimation(0f, 1f); animation.setDuration(mShortAnimationDuration); @@ -168,7 +161,7 @@ public class FoldableLinearLayout extends LinearLayout { mFoldableTextView.setText(mUnFoldedLabel); } else { - mFoldableIcon.setIcon(mFoldedIconName); + mFoldableIcon.setImageResource(R.drawable.ic_action_expand); AlphaAnimation animation = new AlphaAnimation(1f, 0f); animation.setDuration(mShortAnimationDuration); animation.setAnimationListener(new Animation.AnimationListener() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java index 40fe7665c..c23b4c3ff 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java @@ -31,12 +31,12 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.DatePicker; +import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; - -import com.beardedhen.androidbootstrap.BootstrapButton; +import android.widget.Button; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; @@ -54,11 +54,11 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener { private EditorListener mEditorListener = null; private boolean mIsMasterKey; - BootstrapButton mDeleteButton; + ImageButton mDeleteButton; TextView mAlgorithm; TextView mKeyId; TextView mCreationDate; - BootstrapButton mExpiryDateButton; + Button mExpiryDateButton; Calendar mCreatedDate; Calendar mExpiryDate; Calendar mOriginalExpiryDate = null; @@ -122,9 +122,9 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener { mAlgorithm = (TextView) findViewById(R.id.algorithm); mKeyId = (TextView) findViewById(R.id.keyId); mCreationDate = (TextView) findViewById(R.id.creation); - mExpiryDateButton = (BootstrapButton) findViewById(R.id.expiry); + mExpiryDateButton = (Button) findViewById(R.id.expiry); - mDeleteButton = (BootstrapButton) findViewById(R.id.delete); + mDeleteButton = (ImageButton) findViewById(R.id.delete); mDeleteButton.setOnClickListener(this); mChkCertify = (CheckBox) findViewById(R.id.chkCertify); mChkCertify.setOnCheckedChangeListener(mCheckChanged); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java index dc4c13b1a..3fd01958a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java @@ -22,17 +22,16 @@ import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; -import com.beardedhen.androidbootstrap.BootstrapButton; - import org.sufficientlysecure.keychain.R; public class KeyServerEditor extends LinearLayout implements Editor, OnClickListener { private EditorListener mEditorListener = null; - BootstrapButton mDeleteButton; + ImageButton mDeleteButton; TextView mServer; public KeyServerEditor(Context context) { @@ -50,7 +49,7 @@ public class KeyServerEditor extends LinearLayout implements Editor, OnClickList mServer = (TextView) findViewById(R.id.server); - mDeleteButton = (BootstrapButton) findViewById(R.id.delete); + mDeleteButton = (ImageButton) findViewById(R.id.delete); mDeleteButton.setOnClickListener(this); super.onFinishInflate(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java index b7336318f..4ecc96cee 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java @@ -32,8 +32,7 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; - -import com.beardedhen.androidbootstrap.BootstrapButton; +import android.widget.ImageButton; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.PgpConversionHelper; @@ -52,7 +51,7 @@ import java.util.Vector; public class SectionView extends LinearLayout implements OnClickListener, EditorListener, Editor { private LayoutInflater mInflater; - private BootstrapButton mPlusButton; + private ImageButton mPlusButton; private ViewGroup mEditors; private TextView mTitle; private int mType = 0; @@ -126,7 +125,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor setDrawingCacheEnabled(true); setAlwaysDrawnWithCacheEnabled(true); - mPlusButton = (BootstrapButton) findViewById(R.id.plusbutton); + mPlusButton = (ImageButton) findViewById(R.id.plusbutton); mPlusButton.setOnClickListener(this); mEditors = (ViewGroup) findViewById(R.id.editors); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java index 04d4ca5b6..9b561f819 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java @@ -31,8 +31,7 @@ import android.widget.AutoCompleteTextView; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.RadioButton; - -import com.beardedhen.androidbootstrap.BootstrapButton; +import android.widget.ImageButton; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.ContactHelper; @@ -43,7 +42,7 @@ import java.util.regex.Matcher; public class UserIdEditor extends LinearLayout implements Editor, OnClickListener { private EditorListener mEditorListener = null; - private BootstrapButton mDeleteButton; + private ImageButton mDeleteButton; private RadioButton mIsMainUserId; private String mOriginalID; private EditText mName; @@ -103,7 +102,7 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene setDrawingCacheEnabled(true); setAlwaysDrawnWithCacheEnabled(true); - mDeleteButton = (BootstrapButton) findViewById(R.id.delete); + mDeleteButton = (ImageButton) findViewById(R.id.delete); mDeleteButton.setOnClickListener(this); mIsMainUserId = (RadioButton) findViewById(R.id.isMainUserId); mIsMainUserId.setOnClickListener(this); diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png Binary files differnew file mode 100644 index 000000000..7cc407315 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png Binary files differnew file mode 100644 index 000000000..e9d2dcb46 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png Binary files differnew file mode 100644 index 000000000..29f4de211 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png Binary files differnew file mode 100644 index 000000000..790af372d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png Binary files differnew file mode 100644 index 000000000..2bf88c183 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png Binary files differnew file mode 100644 index 000000000..4ac28f270 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png Binary files differnew file mode 100644 index 000000000..bb46bb315 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png Binary files differnew file mode 100644 index 000000000..69c801dcc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/minus.png b/OpenKeychain/src/main/res/drawable-mdpi/minus.png Binary files differnew file mode 100644 index 000000000..d59e4a3e1 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/minus.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/plus.png b/OpenKeychain/src/main/res/drawable-mdpi/plus.png Binary files differnew file mode 100644 index 000000000..88ee823af --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/plus.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png Binary files differnew file mode 100644 index 000000000..f1ec295d2 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png Binary files differnew file mode 100644 index 000000000..60ac6b066 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png Binary files differnew file mode 100644 index 000000000..76937f57a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png Binary files differnew file mode 100644 index 000000000..c6dfd0bcb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png Binary files differnew file mode 100644 index 000000000..8a98ea967 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png Binary files differnew file mode 100644 index 000000000..def608491 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png Binary files differnew file mode 100644 index 000000000..da24654eb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png Binary files differnew file mode 100644 index 000000000..76ec594dc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png Binary files differnew file mode 100644 index 000000000..22003198b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png Binary files differnew file mode 100644 index 000000000..38589ba0e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png Binary files differnew file mode 100644 index 000000000..c46bf00de --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png Binary files differnew file mode 100644 index 000000000..e1f6e841f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png diff --git a/OpenKeychain/src/main/res/drawable/button_edgy.xml b/OpenKeychain/src/main/res/drawable/button_edgy.xml new file mode 100644 index 000000000..fdb94d40e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_edgy.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <solid android:color="#ebebeb" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <solid android:color="#ebebeb"/> + <stroke android:color="#cccccc" android:width="1.5dip" /> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <solid android:color="#ffffff" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/button_no_style.xml b/OpenKeychain/src/main/res/drawable/button_no_style.xml new file mode 100644 index 000000000..e9571c2b0 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_no_style.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/button_rounded.xml b/OpenKeychain/src/main/res/drawable/button_rounded.xml new file mode 100644 index 000000000..f547b8cdb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_rounded.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + <stroke android:color="#ebebeb" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + <solid android:color="#ebebeb"/> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <stroke android:color="#cccccc" android:width="1.5dip" /> + <solid android:color="#ffffff" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_green.xml b/OpenKeychain/src/main/res/drawable/button_rounded_green.xml new file mode 100644 index 000000000..fc12fdf05 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_rounded_green.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#47a447" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#47a447"/> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#5cb85c" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_red.xml b/OpenKeychain/src/main/res/drawable/button_rounded_red.xml new file mode 100644 index 000000000..330e83939 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_rounded_red.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#d2322d" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#d2322d"/> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="6dip" + android:left="6dip" + android:right="6dip" + android:top="6dip" /> + <corners android:radius="6dip" /> + <solid android:color="#d9534f" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml index 32843eb29..7bb861547 100644 --- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" @@ -43,7 +42,7 @@ android:layout_height="wrap_content" tools:layout="@layout/select_secret_key_layout_fragment" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/api_account_settings_create_key" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -52,9 +51,9 @@ android:layout_marginRight="4dp" android:layout_marginTop="4dp" android:text="@string/api_settings_create_key" - bootstrapbutton:bb_icon_left="fa-key" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_accounts" + android:textSize="14dip"/> <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml index 866857143..ff75f20ee 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/notification_area"/> + <include layout="@layout/notify_area"/> <android.support.v4.view.ViewPager android:id="@+id/decrypt_pager" diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index d1db1c782..098aaaea1 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true"> @@ -43,15 +42,14 @@ android:minLines="2" android:scrollbars="vertical" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/decrypt_file_browse" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" - bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:src="@drawable/ic_action_collection" + android:background="@drawable/button_rounded" + android:layout_gravity="center_vertical"/> </LinearLayout> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 3bc78d325..05877656b 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/result" android:orientation="vertical" android:layout_width="match_parent" @@ -83,16 +82,15 @@ android:layout_toRightOf="@+id/result_signature_image" android:textColor="@color/white" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/lookup_key" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/btn_lookup_key" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="info" - bootstrapbutton:bb_size="small" + android:drawableRight="@drawable/ic_action_download" android:layout_alignParentRight="true" - android:layout_centerVertical="true" /> + android:layout_centerVertical="true" + android:background="@drawable/button_edgy"/> </RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml index 1ce5c096f..b6c5a1c9a 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml @@ -26,14 +26,14 @@ android:layout_height="wrap_content" android:text="@string/label_no_passphrase" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/edit_key_btn_change_passphrase" android:layout_width="match_parent" android:layout_height="60dp" android:padding="4dp" android:text="@string/btn_set_passphrase" - bootstrapbutton:bb_icon_left="fa-pencil" - bootstrapbutton:bb_type="default" /> + android:drawableLeft="@drawable/ic_action_edit" + android:background="@drawable/button_edgy" /> <LinearLayout android:id="@+id/edit_key_container" diff --git a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml index 090115d62..81fb643ab 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -80,13 +79,12 @@ android:paddingRight="10dip" android:text="@string/label_expiry" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/expiry" android:layout_width="match_parent" android:layout_height="40dp" android:text="@string/none" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_edgy" /> </TableRow> <TableRow @@ -155,15 +153,13 @@ </TableRow> </TableLayout> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/delete" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="10dp" - bootstrapbutton:bb_icon_left="fa-minus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="danger" /> + android:src="@drawable/minus" + android:background="@drawable/button_rounded_red"/> </LinearLayout> <View diff --git a/OpenKeychain/src/main/res/layout/edit_key_section.xml b/OpenKeychain/src/main/res/layout/edit_key_section.xml index 9f10ff8c1..6cfe18bd6 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_section.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_section.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -23,15 +22,13 @@ android:singleLine="true" android:text="Section Name" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/plusbutton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="10dp" - bootstrapbutton:bb_icon_left="fa-plus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="success" /> + android:src="@drawable/plus" + android:background="@drawable/button_rounded_green"/> </LinearLayout> <LinearLayout diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml index a8d1dc674..3454d3668 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -76,18 +75,16 @@ </TableRow> </TableLayout> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/delete" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_margin="10dp" + android:layout_margin="10dip" android:layout_marginLeft="4dip" android:layout_marginRight="6dip" - bootstrapbutton:bb_icon_left="fa-minus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="danger" /> + android:src="@drawable/minus" + android:background="@drawable/button_rounded_red" /> </LinearLayout> <View diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index fa1b03889..cde92b477 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -65,15 +64,14 @@ android:text="@string/label_select_public_keys" android:textAppearance="?android:attr/textAppearanceMedium" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/btn_selectEncryptKeys" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_margin="4dp" android:text="@string/select_keys_button_default" - bootstrapbutton:bb_icon_left="fa-user" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_person" /> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml index c8aaf77b8..4142b3de6 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml @@ -31,15 +31,14 @@ android:minLines="2" android:scrollbars="vertical" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/btn_browse" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" - bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:layout_gravity="center_vertical" + android:src="@drawable/ic_action_collection" + android:background="@drawable/button_rounded"/> </LinearLayout> <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout diff --git a/OpenKeychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml index 83d697001..dcf711679 100644 --- a/OpenKeychain/src/main/res/layout/file_dialog.xml +++ b/OpenKeychain/src/main/res/layout/file_dialog.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -31,17 +30,15 @@ android:minLines="2" android:scrollbars="vertical" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/btn_browse" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_margin="4dp" android:contentDescription="@string/filemanager_title_open" - bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:background="@drawable/button_rounded" + android:src="@drawable/ic_action_collection"/> </LinearLayout> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index 2b863d52b..3d2fb688b 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -12,23 +11,21 @@ android:orientation="horizontal" android:clickable="true"> - <com.beardedhen.androidbootstrap.FontAwesomeText + <ImageButton android:id="@+id/foldableIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_marginRight="10dp" - android:textSize="12sp" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" - fontawesometext:fa_icon="fa-chevron-right"/> + android:src="@drawable/ic_action_expand" + android:background="@drawable/button_no_style"/> <TextView android:id="@+id/foldableText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/none" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" + android:layout_gravity="center_vertical" android:textColor="@color/emphasis"/> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index b076debfe..81aa6d792 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <LinearLayout - android:id="@+id/card_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> + <include layout="@layout/notify_area"/> <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout android:id="@+id/import_sliding_tab_layout" diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index c02854668..32b77baac 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> @@ -49,14 +48,15 @@ android:text="@string/key_list_empty_text2" android:textAppearance="?android:attr/textAppearanceSmall" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/key_list_empty_button_create" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" + android:textSize="14sp" android:text="@string/key_list_empty_button_create" - bootstrapbutton:bb_icon_left="fa-plus" - bootstrapbutton:bb_type="default" /> + android:drawableLeft="@drawable/ic_action_new_account" + android:background="@drawable/button_edgy"/> <TextView android:layout_width="wrap_content" @@ -66,14 +66,15 @@ android:text="@string/key_list_empty_text3" android:textAppearance="?android:attr/textAppearanceSmall" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/key_list_empty_button_import" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="4dp" + android:textSize="14sp" android:text="@string/key_list_empty_button_import" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="default" /> + android:drawableLeft="@drawable/ic_action_download" + android:background="@drawable/button_edgy" /> </LinearLayout> </FrameLayout> diff --git a/OpenKeychain/src/main/res/layout/key_server_editor.xml b/OpenKeychain/src/main/res/layout/key_server_editor.xml index 950978a0e..b07fdc50c 100644 --- a/OpenKeychain/src/main/res/layout/key_server_editor.xml +++ b/OpenKeychain/src/main/res/layout/key_server_editor.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.KeyServerEditor xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -18,17 +17,15 @@ android:layout_weight="1" android:inputType="textUri" /> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/delete" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_margin="10dp" android:layout_marginRight="3dip" - bootstrapbutton:bb_icon_left="fa-minus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="danger" /> + android:background="@drawable/button_rounded_red" + android:src="@drawable/minus" /> </LinearLayout> <View diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index b8897a7b3..baf7111af 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > @@ -42,7 +41,7 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> </RelativeLayout> - <com.beardedhen.androidbootstrap.BootstrapButton + <ImageButton android:id="@+id/add" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -50,10 +49,8 @@ android:layout_margin="10dp" android:layout_marginLeft="4dip" android:layout_marginRight="6dip" - bootstrapbutton:bb_icon_left="fa-plus" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="small" - bootstrapbutton:bb_type="success" /> + android:src="@drawable/plus" + android:background="@drawable/button_rounded_green"/> </LinearLayout> <View diff --git a/OpenKeychain/src/main/res/layout/notification_area.xml b/OpenKeychain/src/main/res/layout/notify_area.xml index d1ba265a5..d1ba265a5 100644 --- a/OpenKeychain/src/main/res/layout/notification_area.xml +++ b/OpenKeychain/src/main/res/layout/notify_area.xml diff --git a/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml index cc2ab0cac..63eeb8eaf 100644 --- a/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml +++ b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - <com.beardedhen.androidbootstrap.BootstrapButton + <Button android:id="@+id/select_secret_key_select_key_button" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -14,9 +13,9 @@ android:layout_marginRight="4dp" android:layout_marginTop="4dp" android:text="@string/api_settings_select_key" - bootstrapbutton:bb_icon_left="fa-key" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> + android:drawableLeft="@drawable/ic_action_accounts" + android:background="@drawable/button_edgy" + android:textSize="14dp"/> <LinearLayout android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d91707567..be4892e96 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -546,8 +546,8 @@ <item quantity="one">Ignoring one certificate issued by an unknown public key</item> <item quantity="other">Ignoring %s certificates issued by unknown public keys</item> </plurals> + <string name="msg_ip_uid_classifying_zero">Classifying user ids (no trusted keys available)</string> <plurals name="msg_ip_uid_classifying"> - <item quantity="zero">Classifying user ids (no trusted keys available)</item> <item quantity="one">Classifying user ids (using one trusted key)</item> <item quantity="other">Classifying user ids (using %s trusted keys)</item> </plurals> diff --git a/extern/AndroidBootstrap b/extern/AndroidBootstrap deleted file mode 160000 -Subproject 02f02391e3eee9331e07d7690d3b533a8b0f69e diff --git a/settings.gradle b/settings.gradle index 4776ae5ee..d8802320c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,6 @@ include ':extern:openpgp-api-lib' include ':extern:openkeychain-api-lib' include ':extern:html-textview' include ':extern:StickyListHeaders:library' -include ':extern:AndroidBootstrap:AndroidBootstrap' include ':extern:zxing-qr-code' include ':extern:zxing-android-integration' include ':extern:spongycastle:core' |
