Converted all other buttons

18 files changed, 28 insertions, 30 deletions

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