From bd445165766f35561a2b8aeeac2b8a16f0abb6ef Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sat, 28 Jun 2014 21:12:56 +0200 Subject: Added button_rounded style converted decrypt_file_fragment to new style --- .../keychain/ui/DecryptFileFragment.java | 6 ++-- .../src/main/res/drawable/button_rounded.xml | 40 ++++++++++++++++++++++ .../src/main/res/layout/decrypt_file_fragment.xml | 12 +++++-- 3 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable/button_rounded.xml 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/res/drawable/button_rounded.xml b/OpenKeychain/src/main/res/drawable/button_rounded.xml new file mode 100644 index 000000000..501758287 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_rounded.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index d1db1c782..45aaee80f 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 @@ @@ -43,7 +42,7 @@ android:minLines="2" android:scrollbars="vertical" /> - + bootstrapbutton:bb_type="default" />--> + Date: Sun, 29 Jun 2014 12:33:02 +0200 Subject: Improved button style centered buttons removed commented-out button --- OpenKeychain/src/main/res/drawable/button_rounded.xml | 12 ++++++------ OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml | 12 ++---------- OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml | 9 ++++----- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/OpenKeychain/src/main/res/drawable/button_rounded.xml b/OpenKeychain/src/main/res/drawable/button_rounded.xml index 501758287..f547b8cdb 100644 --- a/OpenKeychain/src/main/res/drawable/button_rounded.xml +++ b/OpenKeychain/src/main/res/drawable/button_rounded.xml @@ -8,8 +8,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> - - + + @@ -20,8 +20,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> - - + + @@ -32,8 +32,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> - - + + diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index 45aaee80f..098aaaea1 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml @@ -42,22 +42,14 @@ android:minLines="2" android:scrollbars="vertical" /> - + android:background="@drawable/button_rounded" + android:layout_gravity="center_vertical"/> - + android:layout_gravity="center_vertical" + android:src="@drawable/ic_action_collection" + android:background="@drawable/button_rounded"/> Date: Sun, 29 Jun 2014 13:21:33 +0200 Subject: Updated file_dialog to use the new buttons --- .../org/sufficientlysecure/keychain/ui/EncryptFileFragment.java | 6 +++--- .../keychain/ui/dialog/FileDialogFragment.java | 7 +++---- OpenKeychain/src/main/res/layout/file_dialog.xml | 9 +++------ 3 files changed, 9 insertions(+), 13 deletions(-) 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/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/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 @@ - + android:background="@drawable/button_rounded" + android:src="@drawable/ic_action_collection"/> 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 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"/> Date: Sun, 29 Jun 2014 15:28:24 +0200 Subject: Converted AsymetricKeyFragment to new button style --- .../sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | 7 +++---- OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml | 8 +++----- 2 files changed, 6 insertions(+), 9 deletions(-) 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..45bf3f57f 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); 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 @@ - + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_person" /> \ No newline at end of file -- cgit v1.2.3 From 24068428471addfe9bad99a96b7fb1acda33018c Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sun, 29 Jun 2014 22:31:37 +0200 Subject: Ported even more buttons to use new design (Key and User editor) Added drawables for them --- .../keychain/ui/EditKeyActivity.java | 6 ++-- .../keychain/ui/widget/KeyEditor.java | 5 +-- .../keychain/ui/widget/SectionView.java | 7 ++-- .../keychain/ui/widget/UserIdEditor.java | 7 ++-- OpenKeychain/src/main/res/drawable-mdpi/minus.png | Bin 0 -> 263 bytes OpenKeychain/src/main/res/drawable-mdpi/plus.png | Bin 0 -> 231 bytes OpenKeychain/src/main/res/drawable-xhdpi/minus.png | Bin 0 -> 323 bytes OpenKeychain/src/main/res/drawable-xhdpi/plus.png | Bin 0 -> 281 bytes .../src/main/res/drawable-xxhdpi/minus.png | Bin 0 -> 447 bytes OpenKeychain/src/main/res/drawable-xxhdpi/plus.png | Bin 0 -> 493 bytes OpenKeychain/src/main/res/drawable/button_edgy.xml | 6 ++-- .../src/main/res/drawable/button_rounded_green.xml | 37 +++++++++++++++++++++ .../src/main/res/drawable/button_rounded_red.xml | 37 +++++++++++++++++++++ .../src/main/res/layout/edit_key_activity.xml | 6 ++-- .../src/main/res/layout/edit_key_key_item.xml | 8 ++--- .../src/main/res/layout/edit_key_section.xml | 9 ++--- .../src/main/res/layout/edit_key_user_id_item.xml | 11 +++--- 17 files changed, 102 insertions(+), 37 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/minus.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/plus.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/minus.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/plus.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/minus.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/plus.png create mode 100644 OpenKeychain/src/main/res/drawable/button_rounded_green.xml create mode 100644 OpenKeychain/src/main/res/drawable/button_rounded_red.xml 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/widget/KeyEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java index 40fe7665c..776788d51 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,6 +31,7 @@ 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; @@ -54,7 +55,7 @@ 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; @@ -124,7 +125,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener { mCreationDate = (TextView) findViewById(R.id.creation); mExpiryDateButton = (BootstrapButton) 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/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 9781dd213..bc1c84271 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-mdpi/minus.png b/OpenKeychain/src/main/res/drawable-mdpi/minus.png new file mode 100644 index 000000000..d59e4a3e1 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/minus.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/plus.png b/OpenKeychain/src/main/res/drawable-mdpi/plus.png new file mode 100644 index 000000000..88ee823af Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/plus.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png new file mode 100644 index 000000000..8a98ea967 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png new file mode 100644 index 000000000..def608491 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png new file mode 100644 index 000000000..c46bf00de Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png new file mode 100644 index 000000000..e1f6e841f Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png differ diff --git a/OpenKeychain/src/main/res/drawable/button_edgy.xml b/OpenKeychain/src/main/res/drawable/button_edgy.xml index d296642b8..fdb94d40e 100644 --- a/OpenKeychain/src/main/res/drawable/button_edgy.xml +++ b/OpenKeychain/src/main/res/drawable/button_edgy.xml @@ -8,8 +8,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> + - @@ -19,8 +19,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> - + @@ -30,8 +30,8 @@ android:left="6dip" android:right="6dip" android:top="6dip" /> - + \ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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" /> - + android:drawableLeft="@drawable/ic_action_edit" + android:background="@drawable/button_edgy" /> - + android:src="@drawable/minus" + android:background="@drawable/button_rounded_red"/> @@ -23,15 +22,13 @@ android:singleLine="true" android:text="Section Name" /> - + android:src="@drawable/plus" + android:background="@drawable/button_rounded_green"/> @@ -76,18 +75,16 @@ - + android:src="@drawable/minus" + android:background="@drawable/button_rounded_red" /> Date: Mon, 30 Jun 2014 19:09:13 +0200 Subject: Converted all other buttons --- .../keychain/ui/DecryptFragment.java | 7 +++---- .../keychain/ui/KeyListFragment.java | 10 +++++----- .../keychain/ui/widget/FoldableLinearLayout.java | 19 ++++++------------- .../keychain/ui/widget/KeyEditor.java | 7 +++---- .../keychain/ui/widget/KeyServerEditor.java | 7 +++---- .../main/res/drawable-hdpi/ic_action_collapse.png | Bin 0 -> 467 bytes .../src/main/res/drawable-hdpi/ic_action_expand.png | Bin 0 -> 415 bytes .../main/res/drawable-hdpi/ic_action_new_account.png | Bin 0 -> 556 bytes .../main/res/drawable-mdpi/ic_action_collapse.png | Bin 0 -> 404 bytes .../src/main/res/drawable-mdpi/ic_action_expand.png | Bin 0 -> 345 bytes .../main/res/drawable-mdpi/ic_action_new_account.png | Bin 0 -> 424 bytes .../main/res/drawable-xhdpi/ic_action_collapse.png | Bin 0 -> 631 bytes .../src/main/res/drawable-xhdpi/ic_action_expand.png | Bin 0 -> 582 bytes .../res/drawable-xhdpi/ic_action_new_account.png | Bin 0 -> 701 bytes .../main/res/drawable-xxhdpi/ic_action_collapse.png | Bin 0 -> 901 bytes .../main/res/drawable-xxhdpi/ic_action_expand.png | Bin 0 -> 974 bytes .../res/drawable-xxhdpi/ic_action_new_account.png | Bin 0 -> 855 bytes .../src/main/res/drawable/button_no_style.xml | 5 +++++ .../src/main/res/layout/decrypt_result_include.xml | 10 ++++------ .../src/main/res/layout/foldable_linearlayout.xml | 10 +++++----- .../src/main/res/layout/key_list_fragment.xml | 15 ++++++++------- .../src/main/res/layout/key_server_editor.xml | 9 +++------ .../src/main/res/layout/key_server_preference.xml | 9 +++------ 23 files changed, 48 insertions(+), 60 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png create mode 100644 OpenKeychain/src/main/res/drawable/button_no_style.xml 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/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/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 776788d51..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 @@ -36,8 +36,7 @@ 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; @@ -59,7 +58,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener { TextView mAlgorithm; TextView mKeyId; TextView mCreationDate; - BootstrapButton mExpiryDateButton; + Button mExpiryDateButton; Calendar mCreatedDate; Calendar mExpiryDate; Calendar mOriginalExpiryDate = null; @@ -123,7 +122,7 @@ 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 = (ImageButton) findViewById(R.id.delete); mDeleteButton.setOnClickListener(this); 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/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png new file mode 100644 index 000000000..e9d2dcb46 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png new file mode 100644 index 000000000..29f4de211 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png differ 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 new file mode 100644 index 000000000..790af372d Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png new file mode 100644 index 000000000..4ac28f270 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png new file mode 100644 index 000000000..bb46bb315 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png differ 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 new file mode 100644 index 000000000..69c801dcc Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png new file mode 100644 index 000000000..60ac6b066 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png new file mode 100644 index 000000000..76937f57a Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png differ 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 new file mode 100644 index 000000000..c6dfd0bcb Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png new file mode 100644 index 000000000..76ec594dc Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png new file mode 100644 index 000000000..22003198b Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png differ 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 new file mode 100644 index 000000000..38589ba0e Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png differ 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 @@ + + + + + \ No newline at end of file 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 @@ - + android:layout_centerVertical="true" + android:background="@drawable/button_edgy"/> diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index 2b863d52b..fa31d4a6c 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -12,21 +12,21 @@ android:orientation="horizontal" android:clickable="true"> - + android:src="@drawable/ic_action_expand" + android:background="@drawable/button_no_style"/> 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 @@ @@ -49,14 +48,15 @@ android:text="@string/key_list_empty_text2" android:textAppearance="?android:attr/textAppearanceSmall" /> - + android:drawableLeft="@drawable/ic_action_new_account" + android:background="@drawable/button_edgy"/> - + android:drawableLeft="@drawable/ic_action_download" + android:background="@drawable/button_edgy" /> 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 @@ @@ -18,17 +17,15 @@ android:layout_weight="1" android:inputType="textUri" /> - + android:background="@drawable/button_rounded_red" + android:src="@drawable/minus" /> @@ -42,7 +41,7 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> - + android:src="@drawable/plus" + android:background="@drawable/button_rounded_green"/> Date: Mon, 30 Jun 2014 19:13:09 +0200 Subject: Fixed, issue #702 --- .../org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 45bf3f57f..51963e963 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -203,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)); } -- cgit v1.2.3 From f3b68a99321da3369dd5c729c209915d7d7c8077 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 30 Jun 2014 19:18:20 +0200 Subject: Deprecated Android Bootstrap, thus fixing #597 --- OpenKeychain/build.gradle | 1 - settings.gradle | 1 - 2 files changed, 2 deletions(-) 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/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' -- cgit v1.2.3 From cc095a2098fce5477484e6c12a3dfd2d72505a99 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 30 Jun 2014 21:24:31 +0200 Subject: (should have) fixed Travis builds --- OpenKeychain/src/main/res/layout/edit_key_key_item.xml | 6 ++---- OpenKeychain/src/main/res/layout/foldable_linearlayout.xml | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) 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 2d2fe51ab..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 @@ @@ -80,13 +79,12 @@ android:paddingRight="10dip" android:text="@string/label_expiry" /> - + android:background="@drawable/button_edgy" /> @@ -27,8 +26,6 @@ android:layout_height="wrap_content" android:text="@string/none" android:layout_gravity="center_vertical" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" android:textColor="@color/emphasis"/> -- cgit v1.2.3 From 5dcbc07af9a144dac7d8f03887127f912e8b5ee3 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 30 Jun 2014 21:32:40 +0200 Subject: Fixed Bootstrap resource --- .../main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); -- cgit v1.2.3