From 1e9789f5b4e536f79df0ab948b8618c0d7235ad0 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 30 Jun 2014 19:09:13 +0200 Subject: [PATCH] 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"/>