Use flat buttons where appropriate

12 files changed, 67 insertions, 26 deletions

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 000000000..1f3d06519
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png
new file mode 100644
index 000000000..b53640176
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png
new file mode 100644
index 000000000..c2ead0cef
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png
new file mode 100644
index 000000000..5bef3ca81
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png
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 000000000..38a3aeea6
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_download.png
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 000000000..27af9a43c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_upload.png
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 000000000..ef7785a48
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_download.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png
new file mode 100644
index 000000000..48a0cd149
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_upload.png
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 6fd047187..bb43fa805 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -135,22 +135,37 @@
             android:text="@string/label_send_key" />
 
         <Spinner
-            android:id="@+id/sign_key_keyserver"
+            android:id="@+id/upload_key_keyserver"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="4dp"
             android:enabled="false" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_actions"
+            android:layout_weight="1" />
+
+        <TextView
             android:id="@+id/sign_key_sign_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/btn_certify"
-            bootstrapbutton:bb_icon_left="fa-pencil"
-            bootstrapbutton:bb_type="info" />
+            android:layout_height="match_parent"
+            android:text="@string/key_view_action_certify"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_good"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem" />
+
     </LinearLayout>
 
 </ScrollView>
\ 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" />
 
         <LinearLayout
             android:id="@+id/edit_key_container"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index eb1333704..876374700 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -25,15 +25,26 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
             android:id="@+id/import_import"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
+            android:layout_height="match_parent"
             android:text="@string/import_import"
-            bootstrapbutton:bb_icon_left="fa-download"
-            bootstrapbutton:bb_type="info" />
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_download"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/key_server_export.xml b/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 @@
 <ScrollView 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:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <TextView
             style="@style/SectionHeader"
@@ -18,23 +18,38 @@
             android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
             android:text="@string/section_key_server" />
-        
+
         <Spinner
-            android:id="@+id/sign_key_keyserver"
+            android:id="@+id/upload_key_keyserver"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="4dp" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/btn_export_to_server"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginBottom="4dp"
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginTop="14dp"
+            android:text="@string/section_actions"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/upload_key_action_upload"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:text="@string/btn_export_to_server"
-            bootstrapbutton:bb_icon_left="fa-upload"
-            bootstrapbutton:bb_type="info" />
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_upload"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem" />
+
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file