From 24068428471addfe9bad99a96b7fb1acda33018c Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sun, 29 Jun 2014 22:31:37 +0200 Subject: [PATCH] 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" />