From bd445165766f35561a2b8aeeac2b8a16f0abb6ef Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sat, 28 Jun 2014 21:12:56 +0200 Subject: [PATCH 01/11] Added button_rounded style converted decrypt_file_fragment to new style --- .../keychain/ui/DecryptFileFragment.java | 6 +-- .../src/main/res/drawable/button_rounded.xml | 40 +++++++++++++++++++ .../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: [PATCH 02/11] Improved button style centered buttons removed commented-out button --- .../src/main/res/drawable/button_rounded.xml | 12 ++++++------ .../src/main/res/layout/decrypt_file_fragment.xml | 12 ++---------- .../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: [PATCH 03/11] Updated file_dialog to use the new buttons --- .../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: [PATCH 04/11] Added new button style and converted account_settings and the select_secret_key_layout to use it --- .../remote/ui/AccountSettingsFragment.java | 7 ++-- .../ui/SelectSecretKeyLayoutFragment.java | 8 ++-- .../res/drawable-hdpi/ic_action_accounts.png | Bin 0 -> 641 bytes .../res/drawable-mdpi/ic_action_accounts.png | Bin 0 -> 506 bytes .../res/drawable-xhdpi/ic_action_accounts.png | Bin 0 -> 765 bytes .../drawable-xxhdpi/ic_action_accounts.png | Bin 0 -> 1093 bytes .../src/main/res/drawable/button_edgy.xml | 37 ++++++++++++++++++ .../layout/api_account_settings_fragment.xml | 9 ++--- .../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 0000000000000000000000000000000000000000..7cc40731552e74f577b5b492903e34c3ba7af493 GIT binary patch literal 641 zcmV-{0)G98P)92pja zY0{Z$%tUKvH#^&YkJ;MwgH+eFN$s$ZFf&t8vx&WzJQ6~#z|nhGNba9pNGRprk9+Uk zdnbgImDQl-bp7LWIt}3xz;H{qQyhoG;is1XV6+F97{;t(cvT3p1(02D0Kj-OeBNNV z3}gc!DHp)FrSWfYd4_SX`2GhNPrmP;@;uLO0zk&ku9yR%CjgNF#J6sMQ46<`8K01Q zsOXhqNUQD|0(LI(>2;B1;2F$9%a(D0&n#eknp%NaV%VmfA}Ki63iHi$uRbU0h${^*lySQdTkS%b>pWzDBYP0jW|a;WfV5=-NQ_jYSpGrqZ9e z-NXBT*{e~kePEn50|d06xU4Hct8l_*1nYUt5V)$5j+JO^Xvmc?Z$}+EGIoeoEhTnR zI1%l{L7yO$k5x)16X6AzBaMXWq&C2qvOl_PaL%=#kbpeu3#z}l)UmNaID%Q+5Myot z^lgftsKuV5924vS+z>_pI3XNiSQHbFrCTpG@zEF)#sMTitA<9u7Gfm&uiDyad~55# z&x;l_scBa+CjKBE5?wv9&h~Owa;JsrxzP|@$O4$uR<##*`u0UB+sF=pzhniYm6g@N b^)J8xOs3Mz)bL2i00000NkvXXu0mjf%Yhh( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2bf88c183e3c35572a0b92c6d9a17090f7d5671a GIT binary patch literal 506 zcmVEtx7@7|rC zpA!UUJF$g6e@fF-V@TKy+-6y3CI^7TOAKqcZkV?4Er9GN0f6L>7*-xJKH;wbQjGyH z6DB94EP-Fc<$^o~!+Zs69f~%f*iF6Cx084KBfs?DAcuESuv{dC=StZ>9 zD-<>(0>JV*7DR>h`7wlOJGOlAB@qh|i3vm{=@6YZyM$k3?H6K{A}JIvh=YhJ z2H=30*K|brfCz&L4BJA)z4O_Q*&luYHy+VwicDyA4&R~eq$M{FCrX+>MF$2c;jzs2 wUD45$+0p7BJ{=`XJNY->+u&^f#eM}C01U~LRuO8By#N3J07*qoM6N<$g7z}lkN^Mx literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f1ec295d2bf32c778e4fffd6f358a017868f1556 GIT binary patch literal 765 zcmVW_I@5ln+@K1G8BXO3|(1i%N%J|z&!N}3x5nNdUsWZgcK5h2PmdZUF z0M1H=;f$9FCB%pa9vVC+I8z6l3iS|!uVh2y)DnnQ&2GL8l|sEjcgr>wE)181P)QB=h7mC z&;|tUo**3gfJ0REb?XG7o#)GN=AFW`P7rbdfD=Cqp=;~7`ri=Byc(nBFtc@RWi3p< zQ*0N#ky_W76>?_J(a_0J?tTc){WBm_!W z(h%Cx04SU(tX2LVqLJkw4nP`$696P3I0HZmf>Qt_AOy-$aiMisZR)h!bL|e!0!V@K zWO|Eisd{S8^+jU=XhWzo04)eXl}D%f|B7_}xNm9%sHQIg51{S<;zk2Na-*)&qVmUK vLuUtS$t6cDrk1|)^78WX^71;=uK)u8tXCQ`kE7W?00000NkvXXu0mjfVUku% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..da24654ebd28c91cc64eee94a735dd9f5b593125 GIT binary patch literal 1093 zcmV-L1iJf)P)QPebce0RQg z{{N+?RFh}>?sxC`z4Q5^2!bF8f*=TjAP9mW$eAjxFWBvN8}!pAYl$7p?^;W;C$d=n zUQDOcB>?2_^!H>Pvc>_YNXX`7cLZYr0O>ovz0vWe#NIF_5HkSS-SKt$8IbiX-aC83 zNPBpySm=Bn?Vrf%j@rNwZUNxA^ZWF3RX{s99NiFzL>qvr!Os6I@xBP1l3g^L&7Z5) z>UZe?NayzoZp(>A2uFs(PS2C}a6R$0G#(%i+>f5MsX<;)Aum`24M0-OA=#T0hjUds zA^Rce^p#3j{iGI(SeB+O)sU1BgbyV4pMaf^=lO? zhY1>~vEfR2tva8Zu5lmYLpV*knW{>qV>mR8Ew!&7Toxn~Yx_oQEFGIxx8gCzAINmS zz0f=$&FIfGQ6?3vt*qrTGyrMh^&t~vwqkW#yjDK|X-JyJ)IDowI}{H{+mME5opc@w zfR@29we49p0i2Z$KtqbGEJdA7wL$@KoZ;B3G%27Q(}_x|OqDQImRTp>Iy^B(cE3GE z%wdQAou>;vxM(O{Yfks@=o^5VgKO|y&pYby#YU>xE+8{G_R#}sj;>ReFjLx4W9k{8 zb_Ig3>xr@gc*2-17C@}Doy$-FXbnMeC;+ss%UlEjKwhvU3IWVQ@c`CbTl}Yi6Nd!g zP8ooS&o`GDfaKF!9>z&<07PRY0KBhT4qBG7TCE;rgexU$@w=1V}EzYIJ{Gvwj2s;G?_aSJl8%0@>ci|}a2O2z@ zcvML!I)NuR2CxO;t%A(RD+tEE5#xrCP52#f?pHP;ZbG3XP`L{yOI|#PF zl; zmz4lOv9kW{0|309&;Q;3+9m`5@Bjh?K@bE%5ClOG1VNA^{SjaQ%;%M0wGhv900000 LNkvXXu0mjf;9J%w literal 0 HcmV?d00001 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: [PATCH 05/11] Converted AsymetricKeyFragment to new button style --- .../keychain/ui/EncryptAsymmetricFragment.java | 7 +++---- .../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 From 24068428471addfe9bad99a96b7fb1acda33018c Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sun, 29 Jun 2014 22:31:37 +0200 Subject: [PATCH 06/11] 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 ++-- .../src/main/res/drawable-mdpi/minus.png | Bin 0 -> 263 bytes .../src/main/res/drawable-mdpi/plus.png | Bin 0 -> 231 bytes .../src/main/res/drawable-xhdpi/minus.png | Bin 0 -> 323 bytes .../src/main/res/drawable-xhdpi/plus.png | Bin 0 -> 281 bytes .../src/main/res/drawable-xxhdpi/minus.png | Bin 0 -> 447 bytes .../src/main/res/drawable-xxhdpi/plus.png | Bin 0 -> 493 bytes .../src/main/res/drawable/button_edgy.xml | 6 +-- .../res/drawable/button_rounded_green.xml | 37 ++++++++++++++++++ .../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 ++--- .../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 0000000000000000000000000000000000000000..d59e4a3e117ac70e7a1f18e68cb8b991ec7d3322 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(7+c~RQ4*YAT9lm1;E|tG6`YY@QmjyBpl7LPp=W5MpsP?`Uapq` zlqm+u=%u6rg*2Qs74kB(Q&UqFg7ec#$`gw~qDBUWCjUX;%$YM_+-2rzaN$g+g!(R^ zMN$xpAgUPx5;OBk^!!{y6v~YCO!W*6-9I~-gH(CCIEGmGCrhw4v;I*RcG$|#&Fprt dfr*WcA$<0IMeC}wvw*4?JYD@<);T3K0RXL6PyYY_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..88ee823afa776349d3f104cc4a3068210624dfae GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KviL$E{-7<{&&w9@-Z0lFggDJf0^%SXVOBerKdbZ1TBh>zS|a%vt}yS z(PL37kr+Px@%ui9+hr`g5uq*G)w?wai4kK^%y8FeWwA=tgjS#p44$rjF6*2Ung9)_ BOhy0z literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8a98ea9677018516cba5da2a483c541a1d38b7de GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r)EAj~ML;ne^Xj4g4EC<)FlElN&h@W{`p3eLzcDOM;m(6iLD&@(hr&{ZfeFW1We z$`pfS^iooRLK@DR3VE5?si~<7!TD(=<%vZgQ6mFGlm8%a=FAx|?lSW;KiJC{o`NYWIoDGDFT>@l Uudi2M2HL>j>FVdQ&MBb@0H8~5@c;k- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..def608491eab48e6604d0208af7e989aeb9785ad GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r)EAj~ML;ne^XlqzwJC<)F_D=AMbN@WO0%*-p%^K%VRC^ObG)iX47|LkNAR5jJp z#W5tp{p~qJE@npoX2<{kFTcLx*jcuvte}a@O<~4$%je4@?j11-*)lVtt;5 zBuTAXK03~>vpZ8)WEgMc5zSSbws6r|xT4F?3$4#HgW&(~2e#u^i)P?cU!C`s>&^YG Wi(RfilgR}-kipZ{&t;ucLK6T`v}7az literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c46bf00de94d6cf8911f9aac641bc10ac2037092 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~!PpYlh?3y^(xT*429Nxls^EFNs9H{D&r;B4qMcmW#8+i{n@EktyX8)Jv zh0YDa9c=3itZU!zHR)BA@-~^4p>r`}(MFf#&SOG^1de_^9A}gMcZ2x(Nc%TOi?8ul of1E?EkVq!+_JUnzeeXN7@MHhFyL&JC1AWKf>FVdQ&MBb@0Pq8{7ytkO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e1f6e841f5f64c28f537876a711ae9ea869965e1 GIT binary patch literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KZ#fq^m8 z)5S5QBJOFwB9}`b&yjzB_5WVG!gIv;+Lp!+H=Zxm@8^m=RyB+h0uraTU09~(c2n%u zl_MIroo3IHNR7@27G9jgotu?3C3m5(Z_g&(Eh{?%x3!v?QbFS(y)<=VX9U!{F)a=d#Wzp$P!m2Gx=P literal 0 HcmV?d00001 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: [PATCH 07/11] Converted all other buttons --- .../keychain/ui/DecryptFragment.java | 7 +++---- .../keychain/ui/KeyListFragment.java | 10 ++++----- .../ui/widget/FoldableLinearLayout.java | 19 ++++++------------ .../keychain/ui/widget/KeyEditor.java | 7 +++---- .../keychain/ui/widget/KeyServerEditor.java | 7 +++---- .../res/drawable-hdpi/ic_action_collapse.png | Bin 0 -> 467 bytes .../res/drawable-hdpi/ic_action_expand.png | Bin 0 -> 415 bytes .../drawable-hdpi/ic_action_new_account.png | Bin 0 -> 556 bytes .../res/drawable-mdpi/ic_action_collapse.png | Bin 0 -> 404 bytes .../res/drawable-mdpi/ic_action_expand.png | Bin 0 -> 345 bytes .../drawable-mdpi/ic_action_new_account.png | Bin 0 -> 424 bytes .../res/drawable-xhdpi/ic_action_collapse.png | Bin 0 -> 631 bytes .../res/drawable-xhdpi/ic_action_expand.png | Bin 0 -> 582 bytes .../drawable-xhdpi/ic_action_new_account.png | Bin 0 -> 701 bytes .../drawable-xxhdpi/ic_action_collapse.png | Bin 0 -> 901 bytes .../res/drawable-xxhdpi/ic_action_expand.png | Bin 0 -> 974 bytes .../drawable-xxhdpi/ic_action_new_account.png | Bin 0 -> 855 bytes .../src/main/res/drawable/button_no_style.xml | 5 +++++ .../res/layout/decrypt_result_include.xml | 10 ++++----- .../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 +++------ .../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 0000000000000000000000000000000000000000..e9d2dcb46a4a56b580856cc6a64b463c01e05228 GIT binary patch literal 467 zcmV;^0WAKBP)jn> z3~dDwNoxfl_^|{(Fbv5>#G!Qp5c~|?>zTvX5D~UU0D^x(_pC7;(`BTw?IB`!a{&lm zz4e(P_&|R91`#1dtZyPfQ)x;As}g!`h3eO=G^W(p6mOnk9^`-VzWxj9QVdoC-HSQ8+Vdz#=cDvu@QHkYq<*mw$I(kFCtv;Q_LI@#*kTU)R7yzMQmAaDZiB13j002ov JPDHLkV1fxF#%urp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..29f4de2117134c34dbfe9abe8a76aeba382d9322 GIT binary patch literal 415 zcmV;Q0bu@#P)Y31*WF4 zV6n{3?m=d;!(zdrQF{R_8avH3xh16B(mz{k_$SHj1poj50002^S2EW> z=6SxPsitx7y6zD}4CN?j+R|t!NAL2?!Xth~V@;!^L}di=I%df^s#z<*!3*POU4@J5 zN?9stOmXgnKogr zde0`Fj&U|DUW#+^X%bmL+1FflY3sDM_W`va@Gq zmY_H>bCy~3?0yWh%iLkl-t6?5k=*34EJ0zJnAvMm5<(8>c=TQgeM!^OLi>H~d+mE= zVN6^Wnt&!Sa{`v^0X)xJLUzf@Ns^>v_isu9y@G5F$v@G2g!DcZ8B+rI5VDQHtBgnt zL`uwf7bAmzgzR4M^=nACuIql}dHzdo!~ouJQJG5EOdoivgxN=+$}SZ4v_FHoY*~Wx zwpPCZ@(w8h0B{GH-SJ8az_aQB%4`*iItl6(SoO3!4Z?P#Zb^L(^Z{_Vf$#bAQ=|Px z*@LVmT}EzGt5AXbKBXq`h5SCFCh&>;{zy$A#DK^6MQ8$ickvOn6O*~qNbpSWU$D-c zB?)}Sw??OB)(-%DPZrP!fMF6XU=)mkQ9uDOHa3<8 zVM@$kro?g}RRqMAQc_aaoGeZ&kyBm105j(bi@T>&159fVo*?L0Nv(vNaB~#P< z0~(9vA7-)GVfhF2)DkonJv+^n+>+9CE!~EDm%MaoUhmy|y;UiJKp+r!P?lwmNEe(> zHHR-J@fF8%LiC7p*L6c|ah}h3{^iQscsPy-O`?U=p-vp)Yo1NXrD6r#5M$S$Za`f8 zP`qI0K>;MqI70IZT97tYo-SM&Te|24dHpOC zIt-;nY>n*);>z#6Rs6}~LE|Qo&USUFLep7I07dNBvD3IHevjcxWKGga{9lY>Rbr~0)b!w-U18&cCAc{Ykp0@00000NkvXXu0mjfX=gKn&g%%w}hqMUzay zGk`^7(O6yqEEX(wSS(XZuwcPrhvjQ>V!7OnvRwH|)}%Suy8HUydR|NaPHCFXzBJCN`|-|{@xPNIZ!VaHK1Okgo7*OgYFta+!0<{}Y-(;Kp92?fSXxeJog ztp^a}siEn$qxh?{rQfHg00RKlw_rBS SPnmT90000dd;NaDz10ao;2tjLvg-jZ1K2$hvDmr)i*b&6>8{+tt+X~PT*EH<3V@OULmC(yw1*pUy+_)l5^|4J!DG_m=%x_7N$CUUeZcu3)d^8ZFn9_2 z3br5OCOh~P^driAAg4lYiB(9O9K&Y<-=BYz00b|kdlAydvSSYj{>}6(IT9nlxwb=b zg^Q;XVw^-0+ysJ;qV#Le^oVDN*b|}zJzgl>P<_962e2_kZI3Lm7p>F)7I(S`k5AglNG5OpvW^$L|JnAxNq=KdMKKfP-8za1A%qY@2qA*C9jcNenUx5Nv}*F3ZMZeZt7-d%P%!zAqW*I(9!AAC#nGjeaNKlsmRCWFB} z*Yfr8s?6&i9!b{{H2IOfh5PSIp>O6J{y((}-`etVn%4gQk2QAlUHRgU$jepy;rgvT z{pUHa9|=*#&i73-S6j9{$lb>(oX|2&a^ClcFASVM7^UAgPzk>ONUu@0eV17Ky$O?c z<}bbe^_~gO?1SelUg|Y8ZFYDl$QaGu=Fzz8&w9-n=ns3-{3*SQrFLp? z?o4wE+jMF6Imvsj+odvUy~J#!=7=sMfX|s|H=u;YdtN_F0fg${~+s)o!Vb=@`LSf zZ%TU={IXxE;V@rdXY9**S?hPHS4x`&rv6MdH)M0i#IRtrMFKOJ&@Sm5%kjE zsiEm=-NMZI%RgzZWSI7M->WI{$Bt9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c6dfd0bcb0920916a39f61aa9bc8416f44648dae GIT binary patch literal 701 zcmV;u0z&z5~_6nGw&@93ae0Jl9Q*>--5y?ZPhF&1SQ*+wCIf0DyTu;x8KJw@|)B zV5}t|L;xYid_FIS2{6={_LF1a6W|`9w50#@`0r)ADFD7k+ksg3@)GKw>Lc0C<{;S8g!KyMmf}qi zq>T36iKSsBfW79%hqt}Yb9ZWb34EI96f z%>K?P1gLH-0bxEsUi(ug&I1gXKjZ~4`djM(7%6A2R^>B!_cAUXhD^UNYu%545>0Ir+A3P2IeUko6_d?+O>+q{BVZU7WU zevEy;Ck{e;;v?#nnP+I)W9wFWU82JEG|cx?%+C#<0T`3c3}~dJy))*hs;uN900@0d zTn3;M16EKz65oBBN>i-^AdaHqqAdYiek3)_Xy!}j2Py-hyjk)r7=$|0zeLSCOi|t} zmHsVY!wlfpXXA`EJ!uyjih!J^*qIoh7$*ko_tF&g7h|*$A^-${01yBIKpP?JC1;{B jBauiX5{ZPN9{~mcZ63bu)#~)v00000NkvXXu0mjf;P5wv literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..76ec594dce9114cac7442da5fabcfc607ce3bbcd GIT binary patch literal 901 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAJU9978H@y_vNz|8{^t`&+xIEj%U(T_OfTK|-3k9CDJ9 zk{XgX4zPJ~xqTDonIe*t&@9QTrz@oqxkPNqf+Y(kPx92(eBp5NUG8+SA3Fs)WsD)`7pO+?%%7OJ?EPbK4@bQ zQT`__d3L6K>?w;CQ38*;I`4;k%>Hlr)UCN7a;oW0uFm_D4&P(?X#3h|n^fEHbrJ*R(H z6mq1RE=;m4ompL^9~|JdyjbVZcOjN7**q_fhgzy^SNdqaWo?4s{{WX)`qn4!U$ons z;pKIx&1%WQ`<~@?46jP=omwH?{Ved(1-p%E1=y=cl_H#>;&zy71b>_v&UYc1`Gi8It z`qj?6w6r+ZDSWI=teJEuEiF&e|7J+HbC&qi36BmOI=|1#=Sj&ThO?WeoZb6iz18Cb zkD_y*1qv;n{Bc)V&v{u#>B_?cNOnSd-|{E5z`&l?Y~~^UmI5P zsH82>HDI>Y+X;Wx-QW-09J7G+&Z_fuE9B~BLVH%q1qI(049A&HW$HK$7`!JYbC)m8 Qas#DgPgg&ebxsLQ0A`Yuu>b%7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..22003198b45cb61d51ccb07748599367d02d9c17 GIT binary patch literal 974 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mISYMOPHFEhAj~2P%cWqfFY(UWA*#@Pz45&8 z&xvOi>CSYW-q^MNvHhIS6X%BZ+n-B(mg2}n|(Lyj=NIW5v0D-3s3sN-dRESk2wF zbH3{mzD$MM_IXFwpL|?#EUj98SIj=)kJgU20|Y<0rEleWJ)uQC%64DQs<+|#Mt%CC z|3i+v7k{L%%)5)@*Hx{Bb4ueU*r~p}eLAvc>m+~KT`xF)l*TRpY4JQE_HOH?ZHxa~ zv~M&Kzmf7jPxo8Mr_SUD;bEU1i+0_gRp>CsTJXv5^PjGz9d>8>@<8eI>9x9^k+MN| z&7NPh?^?e|-m+`G=#Pu-W^qCZo)R;B*QVb2bL!cIY1>u;gY;lp*3nvlkNbaIIvUNS zma}TL^R4(}Ko45R9eVktChL(YqcGpf!ejv{FyJGSd9rgMYSaJ6Ixw-sy0r9@lP} z>8Jjyw%?x5@R|je%x*ioh)us;IsBFvh#G|Q+8z&|JK67f@r#eF^BKIG?kRrNyMmH+?% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..38589ba0e9689db8bccd3ddcf69157cbb17a3dce GIT binary patch literal 855 zcmV-d1E~CoP)pn-CGtp@~RNBz&pqH*1=jV|eiro)NHr_)_aX)V$fkmj^FmhJfwiORdiu z+Pw4+_tp}UfWyzU*=Z7U3BADE{H7T+(7c_#fEvQjeYy2D`=bR!z&OdBeFV#LLZUGv?S(VzqZJ}O- z6&n^0`2{$4QE~lWdtL*q6`;*j)B@hMAn^RiW!)B_wXbRo%y#S}-4XI2=3l_u8n%(@ z)$=C7pLVU^_DT0$_mFY@8@IUWHr4QlI9c`*Y1F^+x|q&3h&f{cE?M=xM$zE9iyuzD<+1Qz~{!LFx1 z{M)E6#0^;dhCI z@H;Mm@C^kJzM%lZHxxklh5`-_q(^S2 zk^q_@`Tzs~ov=yA-JK_5fB*yl0uTTQKmZ^B0e}Dm00K^ee#Gbg + + + + \ 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: [PATCH 08/11] Fixed, issue #702 --- .../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)); } From f3b68a99321da3369dd5c729c209915d7d7c8077 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 30 Jun 2014 19:18:20 +0200 Subject: [PATCH 09/11] 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' From cc095a2098fce5477484e6c12a3dfd2d72505a99 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 30 Jun 2014 21:24:31 +0200 Subject: [PATCH 10/11] (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"/> From 5dcbc07af9a144dac7d8f03887127f912e8b5ee3 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 30 Jun 2014 21:32:40 +0200 Subject: [PATCH 11/11] Fixed Bootstrap resource --- .../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));