From 33cad382f96b673587e841932ea322a1dd6fa23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 8 May 2014 15:46:57 +0200 Subject: [PATCH] Use flat buttons where appropriate --- .../keychain/ui/CertifyKeyActivity.java | 10 ++--- .../keychain/ui/ImportKeysActivity.java | 4 +- .../keychain/ui/UploadKeyActivity.java | 10 ++--- .../res/drawable-hdpi/ic_action_download.png | Bin 0 -> 398 bytes .../res/drawable-hdpi/ic_action_upload.png | Bin 0 -> 356 bytes .../res/drawable-mdpi/ic_action_download.png | Bin 0 -> 324 bytes .../res/drawable-mdpi/ic_action_upload.png | Bin 0 -> 291 bytes .../res/drawable-xhdpi/ic_action_download.png | Bin 0 -> 552 bytes .../res/drawable-xhdpi/ic_action_upload.png | Bin 0 -> 477 bytes .../drawable-xxhdpi/ic_action_download.png | Bin 0 -> 650 bytes .../res/drawable-xxhdpi/ic_action_upload.png | Bin 0 -> 588 bytes .../main/res/layout/certify_key_activity.xml | 33 +++++++++++----- .../src/main/res/layout/edit_key_activity.xml | 2 +- .../main/res/layout/import_keys_activity.xml | 25 ++++++++---- ...ver_export.xml => upload_key_activity.xml} | 37 ++++++++++++------ 15 files changed, 79 insertions(+), 42 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png rename OpenKeychain/src/main/res/layout/{key_server_export.xml => upload_key_activity.xml} (52%) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java index 29969ca55..bd12a3b52 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java @@ -29,7 +29,6 @@ import android.support.v4.app.LoaderManager; import android.support.v4.app.NavUtils; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; -import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.view.MenuItem; import android.view.View; @@ -42,7 +41,6 @@ import android.widget.ListView; import android.widget.Spinner; import android.widget.TextView; -import com.beardedhen.androidbootstrap.BootstrapButton; import com.devspark.appmsg.AppMsg; import org.spongycastle.openpgp.PGPPublicKeyRing; @@ -68,7 +66,7 @@ import java.util.ArrayList; */ public class CertifyKeyActivity extends ActionBarActivity implements SelectSecretKeyLayoutFragment.SelectSecretKeyCallback, LoaderManager.LoaderCallbacks { - private BootstrapButton mSignButton; + private View mSignButton; private CheckBox mUploadKeyCheckbox; private Spinner mSelectKeyserverSpinner; @@ -95,7 +93,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements mSelectKeyFragment.setCallback(this); mSelectKeyFragment.setFilterCertify(true); - mSelectKeyserverSpinner = (Spinner) findViewById(R.id.sign_key_keyserver); + mSelectKeyserverSpinner = (Spinner) findViewById(R.id.upload_key_keyserver); ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, Preferences.getPreferences(this) .getKeyServers() @@ -122,7 +120,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements } }); - mSignButton = (BootstrapButton) findViewById(R.id.sign_key_sign_button); + mSignButton = findViewById(R.id.sign_key_sign_button); mSignButton.setOnClickListener(new OnClickListener() { @Override @@ -350,7 +348,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements // fill values for this action Bundle data = new Bundle(); - Spinner keyServer = (Spinner) findViewById(R.id.sign_key_keyserver); + Spinner keyServer = (Spinner) findViewById(R.id.upload_key_keyserver); String server = (String) keyServer.getSelectedItem(); data.putString(KeychainIntentService.UPLOAD_KEY_SERVER, server); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index f71ef6d46..bb5d2e922 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -86,7 +86,7 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O private ImportKeysListFragment mListFragment; private String[] mNavigationStrings; private Fragment mCurrentFragment; - private BootstrapButton mImportButton; + private View mImportButton; private static final Class[] NAVIGATION_CLASSES = new Class[]{ ImportKeysServerFragment.class, @@ -111,7 +111,7 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O setContentView(R.layout.import_keys_activity); - mImportButton = (BootstrapButton) findViewById(R.id.import_import); + mImportButton = findViewById(R.id.import_import); mImportButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java index 90783aa8b..dbd1b7507 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java @@ -32,8 +32,6 @@ import android.widget.ArrayAdapter; import android.widget.Spinner; import android.widget.Toast; -import com.beardedhen.androidbootstrap.BootstrapButton; - import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.Preferences; @@ -46,7 +44,7 @@ import org.sufficientlysecure.keychain.util.Log; * Sends the selected public key to a keyserver */ public class UploadKeyActivity extends ActionBarActivity { - private BootstrapButton mUploadButton; + private View mUploadButton; private Spinner mKeyServerSpinner; private Uri mDataUri; @@ -55,10 +53,10 @@ public class UploadKeyActivity extends ActionBarActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.key_server_export); + setContentView(R.layout.upload_key_activity); - mUploadButton = (BootstrapButton) findViewById(R.id.btn_export_to_server); - mKeyServerSpinner = (Spinner) findViewById(R.id.sign_key_keyserver); + mUploadButton = findViewById(R.id.upload_key_action_upload); + mKeyServerSpinner = (Spinner) findViewById(R.id.upload_key_keyserver); ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, Preferences.getPreferences(this) diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png new file mode 100644 index 0000000000000000000000000000000000000000..1f3d06519272f0cd18cf3aeffba641eddf59726f GIT binary patch literal 398 zcmV;90df9`P)XnUiaJo0Scf13ZMWA_-_GHl~`2WVdnM#ZCo(K&$+ilg}ybl zp(nWk7qpo$x(bub?}Lo-(k>(xUpE|{pt-UxWXetuMbXu=tUE48HHR*-0f`nt3`2J4 z!Wu(dj5+I;g;H0l;?GARSg$l%F&@%)wkp%8sd6&JLxOlnQ?p(0$_hebtqU0p^w8z` zw~uF`>h;>H#MyWVg|P29N{IBhee(NFTSp1At%(s2G2)?*%RL004DzFNN=} zhuH=@esKBd@#*Qwot!D4+2xTd{a-&*!{osK%e%jIC;=^E*pZy}`C;ZPF{h5`*z4)h z?>%(7rk9*pk@-r$$>>0n>HKZK51wgAd&sXc^Hh_8gVXljgu?-j$=d6AHyrqL^^DJ4 z{?4U4-Y0wd{XCaUZcgO~uQ=^zVoP8Ep?|j- z3VdxI{J&-y;yg8Z^~F1r`D2qrnLv(zQ6!$g@Tpw8F6XV59>^ax@tm8*>3E z8Dz1uXV2au$1D~y9S*X*7)>ml9D|q!ItoS|FzNsn60)8wkm7`LWwFSsA#vXVv*lZA zXG2abSq~Y&qNK!8qDb6G0^f=G|vUl#I+Dj_!|~6>ZSp-^zZ_h9zYe65>#j@&|z2U<^ZT8t^yrl z0AyYRTE2zm}1B}lL?P7n!T=;`g<=`cgcc!oxav!FnGU=o8d z>pu3#9EKyCf`Wql=h@f)Ysyn(*b>9*VX4e{l=*1O%SQ|ubJ7=aCJQf)+bgpG*;GM=AWOt-RKr?c3E6edy3?Icbq^CU4x%g!Jf|Yw+ zdlvSHJZVZw*|<6V{4#zQM;Akh(gQ1)BTiiT&eBoc?mD|^;tU%<*9+V_`gy#+OdL-C ms5QDZL6&tfgDeA!1jFkc3g1pFno|k%5QC?ypUXO@geCxz!DuT0 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png new file mode 100644 index 0000000000000000000000000000000000000000..38a3aeea63080bc6fc13bd85c28b8b579a64a223 GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7*Bb+IEGZ*dNXsO|6vD_W7chl6xtMg4LTA%{dgM>ep=rs z%f!gkoLc6wY}Of{HOm$)nh?+|!F0I%q-o@dU3b0Sm%XixFS?nUoBzG8_WirN(dHjw zVwn^eP|$~<-)8kb92butzqzY=kw#UfE<@^{uWi+9m~MQwW#MRGKt?v9#}9PAXOIt9 zo&I~(+RH1R{Pv$CqJC~Zo8d`Tg)bLmLu3}c*-~+Ni9m&$ceYGE%Z81eol+|~QX{_! zw zH}TJvFHd^HTd!6r9DbP8eLP6Qe#=Dm2+eM0Cq53@UYP|QzpZUPUzK9ua^m6Gq;=aMz?xL+uP`Y&VyzJu-lWb=k`tfm{+Q!ZG?GIV+e`w+_iBDZ85HPQjfzd)~ZPx^W zqz$Qh@0;$GOwzhL>Bht~x%ZQ{XnE*#7xP}Yyr*&7S>~?W3XB2_C}_>K^$g4mpPcIa Ui}pp`0!BT9r>mdKI;Vst05IU;fdBvi literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png new file mode 100644 index 0000000000000000000000000000000000000000..27af9a43c8a88ceec0c0fa09131339548d0f20f5 GIT binary patch literal 477 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+80$S<978H@y_u<)f5<`P_~|xDw!jeKoU=ThqMIW&+&HT{ zV`lBv+Gf?mZ;l+9W?&s?YTSI_&E6+0iVo|dPZwUlufKD`lx=r@-~WHFTGx{aXe$sb zU#ig+<97bJjGhhK`bPbfGtrt2ym77)-4e<1lXraC^2?aF=5@fl)SK>+)9f!=JAB_; z<5SMJS~zcUdBffB{ALege?4lNx8s3r8v6^aMO+`uyb+J$Fk_vB4>vWl_4s!bKY!6kG~Yy#)&Q`aNUZ#CIxdQq!fdec6&y|t2m zPAMwNo%%D&f8VQl`Nt0zA9%d6xX18&Zl#PJw*UhpGK%v0eq{f5-N%}Y4aEmvwszF+ zt`?5S(LXjLHP*90L7Cr&VYz+i3+5NhcOqCNZfh}uL#g5KA1(uiR$+&S9+AIoK|-Fc KelF{r5}E)>Gs5!# literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png new file mode 100644 index 0000000000000000000000000000000000000000..ef7785a48e8706f0b59222ee957bfb8a88eb5c21 GIT binary patch literal 650 zcmV;50(Jd~P)$@2P0000000000003yJtq^w7T6-Z6mwEmtj^n!!KHE+p2g;#r?Iw1>HYWiBAOH{m z0e}Dq00ck)AOHdY0T2KPfB--M1ONgc092>eFXgSZHzwP6y$62FBgy!8oj8u)>#9NB zU&;?;yOwRQg4fOxY_HDZJ5il)J|2%hTdmfM$@!C$6&XqKdmDcZkRl|$6V}Nc^<53u zfJnnmNGCi?C!EUD{WZPig9JZe6*PA-^hajZ`o8N79q_jcKBNm?<>`5aZ<9#zAGr@$ zd_5S+!?42hzN+GDy%BROleB`@?MlE?Z67w$wnH;Z(=*w2S9QN3#UCg<*z^V9LwJ)A zzU1l23SKUi;&-%;BGk@;{1H29%6dPz0DjNgvXwb+yHP```2$9pcg|lA+?xHWz`qZr z_O~>!q;x_eop5ZjkEHK4E;)njfC8fm_2>QII$-YpVA<$e z#fZ779q`}iTK$qU=nk0aghiukH6!N6cEFPBfvOR6qdUNN!R+W--H5sI0r(Im5`z0O z|H%bn0002;DE!+{YwfK(98tm_Y0(i#ncs%G;DppvnIIuE7zFiHFd zbiuoH!3Q1SpB>$)%laT;r3B!4zc06?%mOcgB=~^Xqw7Rb@ehxf`=ajXT2lvf-R}pz9wbUe zf8k-v=}Ohnb*!NHV;m!^Il4|pF22hVb8jJNIJzFY1Iozlh`G0QXY8ZvSrmZ!*`U?- z)EM&+!e - + android:text="@string/section_actions" + android:layout_weight="1" /> + + + \ 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 fc4422cf0..1ce5c096f 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml @@ -33,7 +33,7 @@ android:padding="4dp" android:text="@string/btn_set_passphrase" bootstrapbutton:bb_icon_left="fa-pencil" - bootstrapbutton:bb_type="info" /> + bootstrapbutton:bb_type="default" /> - + + + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_action_download" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/layout/key_server_export.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml similarity index 52% rename from OpenKeychain/src/main/res/layout/key_server_export.xml rename to OpenKeychain/src/main/res/layout/upload_key_activity.xml index 6031bf7c7..5a6f732d5 100644 --- a/OpenKeychain/src/main/res/layout/key_server_export.xml +++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml @@ -2,14 +2,14 @@ + android:layout_height="match_parent"> + android:orientation="vertical"> - + - + + + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_action_upload" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" /> + \ No newline at end of file