Converted all other buttons

23 files changed, 48 insertions, 60 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
index f67e54cf3..6b8358538 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -29,8 +29,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-
-import com.beardedhen.androidbootstrap.BootstrapButton;
+import android.widget.Button;
 
 import org.openintents.openpgp.OpenPgpSignatureResult;
 import org.sufficientlysecure.keychain.R;
@@ -52,7 +51,7 @@ public class DecryptFragment extends Fragment {
     protected TextView mUserId;
     protected TextView mUserIdRest;
 
-    protected BootstrapButton mLookupKey;
+    protected Button mLookupKey;
 
 
     @Override
@@ -65,7 +64,7 @@ public class DecryptFragment extends Fragment {
         mSignatureStatusImage = (ImageView) getView().findViewById(R.id.ic_signature_status);
         mUserId = (TextView) getView().findViewById(R.id.mainUserId);
         mUserIdRest = (TextView) getView().findViewById(R.id.mainUserIdRest);
-        mLookupKey = (BootstrapButton) getView().findViewById(R.id.lookup_key);
+        mLookupKey = (Button) getView().findViewById(R.id.lookup_key);
         mLookupKey.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 5eb8ecb8d..d2cb5283d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -51,8 +51,8 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Button;
 
-import com.beardedhen.androidbootstrap.BootstrapButton;
 import com.devspark.appmsg.AppMsg;
 
 import org.sufficientlysecure.keychain.Constants;
@@ -85,8 +85,8 @@ public class KeyListFragment extends LoaderFragment
     private String mQuery;
     private SearchView mSearchView;
     // empty list layout
-    private BootstrapButton mButtonEmptyCreate;
-    private BootstrapButton mButtonEmptyImport;
+    private Button mButtonEmptyCreate;
+    private Button mButtonEmptyImport;
 
 
     /**
@@ -101,7 +101,7 @@ public class KeyListFragment extends LoaderFragment
         mStickyList.setOnItemClickListener(this);
 
         // empty view
-        mButtonEmptyCreate = (BootstrapButton) view.findViewById(R.id.key_list_empty_button_create);
+        mButtonEmptyCreate = (Button) view.findViewById(R.id.key_list_empty_button_create);
         mButtonEmptyCreate.setOnClickListener(new OnClickListener() {
 
             @Override
@@ -113,7 +113,7 @@ public class KeyListFragment extends LoaderFragment
                 startActivityForResult(intent, 0);
             }
         });
-        mButtonEmptyImport = (BootstrapButton) view.findViewById(R.id.key_list_empty_button_import);
+        mButtonEmptyImport = (Button) view.findViewById(R.id.key_list_empty_button_import);
         mButtonEmptyImport.setOnClickListener(new OnClickListener() {
 
             @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java
index 24641a9cc..a29c17d37 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java
@@ -26,8 +26,7 @@ import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
-import com.beardedhen.androidbootstrap.FontAwesomeText;
+import android.widget.ImageButton;
 
 import org.sufficientlysecure.keychain.R;
 
@@ -50,7 +49,7 @@ import org.sufficientlysecure.keychain.R;
  */
 public class FoldableLinearLayout extends LinearLayout {
 
-    private FontAwesomeText mFoldableIcon;
+    private ImageButton mFoldableIcon;
     private boolean mFolded;
     private boolean mHasMigrated = false;
     private Integer mShortAnimationDuration = null;
@@ -58,8 +57,6 @@ public class FoldableLinearLayout extends LinearLayout {
     private LinearLayout mFoldableContainer = null;
     private View mFoldableLayout = null;
 
-    private String mFoldedIconName;
-    private String mUnFoldedIconName;
     private String mFoldedLabel;
     private String mUnFoldedLabel;
 
@@ -87,15 +84,11 @@ public class FoldableLinearLayout extends LinearLayout {
         if (attrs != null) {
             TypedArray a = context.obtainStyledAttributes(attrs,
                     R.styleable.FoldableLinearLayout, 0, 0);
-            mFoldedIconName = a.getString(R.styleable.FoldableLinearLayout_foldedIcon);
-            mUnFoldedIconName = a.getString(R.styleable.FoldableLinearLayout_unFoldedIcon);
             mFoldedLabel = a.getString(R.styleable.FoldableLinearLayout_foldedLabel);
             mUnFoldedLabel = a.getString(R.styleable.FoldableLinearLayout_unFoldedLabel);
             a.recycle();
         }
         // If any attribute isn't found then set a default one
-        mFoldedIconName = (mFoldedIconName == null) ? "fa-chevron-right" : mFoldedIconName;
-        mUnFoldedIconName = (mUnFoldedIconName == null) ? "fa-chevron-down" : mUnFoldedIconName;
         mFoldedLabel = (mFoldedLabel == null) ? context.getString(R.id.none) : mFoldedLabel;
         mUnFoldedLabel = (mUnFoldedLabel == null) ? context.getString(R.id.none) : mUnFoldedLabel;
     }
@@ -146,8 +139,8 @@ public class FoldableLinearLayout extends LinearLayout {
     }
 
     private void initialiseInnerViews() {
-        mFoldableIcon = (FontAwesomeText) mFoldableLayout.findViewById(R.id.foldableIcon);
-        mFoldableIcon.setIcon(mFoldedIconName);
+        mFoldableIcon = (ImageButton) mFoldableLayout.findViewById(R.id.foldableIcon);
+        mFoldableIcon.setImageResource(R.drawable.ic_action_expand);
         mFoldableTextView = (TextView) mFoldableLayout.findViewById(R.id.foldableText);
         mFoldableTextView.setText(mFoldedLabel);
 
@@ -160,7 +153,7 @@ public class FoldableLinearLayout extends LinearLayout {
             public void onClick(View view) {
                 mFolded = !mFolded;
                 if (mFolded) {
-                    mFoldableIcon.setIcon(mUnFoldedIconName);
+                    mFoldableIcon.setImageResource(R.drawable.ic_action_collapse);
                     mFoldableContainer.setVisibility(View.VISIBLE);
                     AlphaAnimation animation = new AlphaAnimation(0f, 1f);
                     animation.setDuration(mShortAnimationDuration);
@@ -168,7 +161,7 @@ public class FoldableLinearLayout extends LinearLayout {
                     mFoldableTextView.setText(mUnFoldedLabel);
 
                 } else {
-                    mFoldableIcon.setIcon(mFoldedIconName);
+                    mFoldableIcon.setImageResource(R.drawable.ic_action_expand);
                     AlphaAnimation animation = new AlphaAnimation(1f, 0f);
                     animation.setDuration(mShortAnimationDuration);
                     animation.setAnimationListener(new Animation.AnimationListener() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
index 776788d51..c23b4c3ff 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
@@ -36,8 +36,7 @@ import android.widget.LinearLayout;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
-
-import com.beardedhen.androidbootstrap.BootstrapButton;
+import android.widget.Button;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
@@ -59,7 +58,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
     TextView mAlgorithm;
     TextView mKeyId;
     TextView mCreationDate;
-    BootstrapButton mExpiryDateButton;
+    Button mExpiryDateButton;
     Calendar mCreatedDate;
     Calendar mExpiryDate;
     Calendar mOriginalExpiryDate = null;
@@ -123,7 +122,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
         mAlgorithm = (TextView) findViewById(R.id.algorithm);
         mKeyId = (TextView) findViewById(R.id.keyId);
         mCreationDate = (TextView) findViewById(R.id.creation);
-        mExpiryDateButton = (BootstrapButton) findViewById(R.id.expiry);
+        mExpiryDateButton = (Button) findViewById(R.id.expiry);
 
         mDeleteButton = (ImageButton) findViewById(R.id.delete);
         mDeleteButton.setOnClickListener(this);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
index dc4c13b1a..3fd01958a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
@@ -22,17 +22,16 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.beardedhen.androidbootstrap.BootstrapButton;
-
 import org.sufficientlysecure.keychain.R;
 
 public class KeyServerEditor extends LinearLayout implements Editor, OnClickListener {
     private EditorListener mEditorListener = null;
 
-    BootstrapButton mDeleteButton;
+    ImageButton mDeleteButton;
     TextView mServer;
 
     public KeyServerEditor(Context context) {
@@ -50,7 +49,7 @@ public class KeyServerEditor extends LinearLayout implements Editor, OnClickList
 
         mServer = (TextView) findViewById(R.id.server);
 
-        mDeleteButton = (BootstrapButton) findViewById(R.id.delete);
+        mDeleteButton = (ImageButton) findViewById(R.id.delete);
         mDeleteButton.setOnClickListener(this);
 
         super.onFinishInflate();
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png
new file mode 100644
index 000000000..e9d2dcb46
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png
new file mode 100644
index 000000000..29f4de211
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png
new file mode 100644
index 000000000..790af372d
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_new_account.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png
new file mode 100644
index 000000000..4ac28f270
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png
new file mode 100644
index 000000000..bb46bb315
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png
new file mode 100644
index 000000000..69c801dcc
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_new_account.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png
new file mode 100644
index 000000000..60ac6b066
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png
new file mode 100644
index 000000000..76937f57a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png
new file mode 100644
index 000000000..c6dfd0bcb
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_new_account.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png
new file mode 100644
index 000000000..76ec594dc
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png
new file mode 100644
index 000000000..22003198b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png
new file mode 100644
index 000000000..38589ba0e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_new_account.png
diff --git a/OpenKeychain/src/main/res/drawable/button_no_style.xml b/OpenKeychain/src/main/res/drawable/button_no_style.xml
new file mode 100644
index 000000000..e9571c2b0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/button_no_style.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:id="@+id/result"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -83,16 +82,15 @@
             android:layout_toRightOf="@+id/result_signature_image"
             android:textColor="@color/white" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <Button
             android:id="@+id/lookup_key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/btn_lookup_key"
-            bootstrapbutton:bb_icon_left="fa-download"
-            bootstrapbutton:bb_type="info"
-            bootstrapbutton:bb_size="small"
+            android:drawableRight="@drawable/ic_action_download"
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
+            android:layout_centerVertical="true"
+            android:background="@drawable/button_edgy"/>
 
     </RelativeLayout>
 
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">
 
-        <com.beardedhen.androidbootstrap.FontAwesomeText
+        <ImageButton
                 android:id="@+id/foldableIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:layout_marginRight="10dp"
-                android:textSize="12sp"
-                android:paddingTop="@dimen/padding_medium"
-                android:paddingBottom="@dimen/padding_medium"
-                fontawesometext:fa_icon="fa-chevron-right"/>
+                android:src="@drawable/ic_action_expand"
+                android:background="@drawable/button_no_style"/>
 
         <TextView
                 android:id="@+id/foldableText"
                 android:layout_width="wrap_content"
                 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"/>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -49,14 +48,15 @@
             android:text="@string/key_list_empty_text2"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <Button
             android:id="@+id/key_list_empty_button_create"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="4dp"
+            android:textSize="14sp"
             android:text="@string/key_list_empty_button_create"
-            bootstrapbutton:bb_icon_left="fa-plus"
-            bootstrapbutton:bb_type="default" />
+            android:drawableLeft="@drawable/ic_action_new_account"
+            android:background="@drawable/button_edgy"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -66,14 +66,15 @@
             android:text="@string/key_list_empty_text3"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <Button
             android:id="@+id/key_list_empty_button_import"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="4dp"
+            android:textSize="14sp"
             android:text="@string/key_list_empty_button_import"
-            bootstrapbutton:bb_icon_left="fa-download"
-            bootstrapbutton:bb_type="default" />
+            android:drawableLeft="@drawable/ic_action_download"
+            android:background="@drawable/button_edgy" />
     </LinearLayout>
 
 </FrameLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.sufficientlysecure.keychain.ui.widget.KeyServerEditor xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -18,17 +17,15 @@
             android:layout_weight="1"
             android:inputType="textUri" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <ImageButton
             android:id="@+id/delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_margin="10dp"
             android:layout_marginRight="3dip"
-            bootstrapbutton:bb_icon_left="fa-minus"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="small"
-            bootstrapbutton:bb_type="danger" />
+            android:background="@drawable/button_rounded_red"
+            android:src="@drawable/minus" />
     </LinearLayout>
 
     <View
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml
index b8897a7b3..baf7111af 100644
--- a/OpenKeychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -42,7 +41,7 @@
                 android:textAppearance="?android:attr/textAppearanceSmall" />
         </RelativeLayout>
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <ImageButton
             android:id="@+id/add"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -50,10 +49,8 @@
             android:layout_margin="10dp"
             android:layout_marginLeft="4dip"
             android:layout_marginRight="6dip"
-            bootstrapbutton:bb_icon_left="fa-plus"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="small"
-            bootstrapbutton:bb_type="success" />
+            android:src="@drawable/plus"
+            android:background="@drawable/button_rounded_green"/>
     </LinearLayout>
 
     <View