From 9091c2224032c07a46988890a2767eecbb794634 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sun, 29 Jun 2014 13:59:51 +0200 Subject: Added new button style and converted account_settings and the select_secret_key_layout to use it --- .../remote/ui/AccountSettingsFragment.java | 7 ++-- .../keychain/ui/SelectSecretKeyLayoutFragment.java | 8 ++--- .../main/res/drawable-hdpi/ic_action_accounts.png | Bin 0 -> 641 bytes .../main/res/drawable-mdpi/ic_action_accounts.png | Bin 0 -> 506 bytes .../main/res/drawable-xhdpi/ic_action_accounts.png | Bin 0 -> 765 bytes .../res/drawable-xxhdpi/ic_action_accounts.png | Bin 0 -> 1093 bytes OpenKeychain/src/main/res/drawable/button_edgy.xml | 37 +++++++++++++++++++++ .../res/layout/api_account_settings_fragment.xml | 9 +++-- .../layout/select_secret_key_layout_fragment.xml | 9 +++-- 9 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable/button_edgy.xml (limited to 'OpenKeychain/src/main') 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/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/res/drawable-hdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png new file mode 100644 index 000000000..7cc407315 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png new file mode 100644 index 000000000..2bf88c183 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png new file mode 100644 index 000000000..f1ec295d2 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png new file mode 100644 index 000000000..da24654eb Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png differ 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..d296642b8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_edgy.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ - + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_accounts" + android:textSize="14dip"/> - + android:drawableLeft="@drawable/ic_action_accounts" + android:background="@drawable/button_edgy" + android:textSize="14dp"/>