From 0403cbf11ac0b5ada7624578b7a0c398c3fa6904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 27 Jul 2014 18:12:14 +0200
Subject: [PATCH] Prettify buttons

---
 .../keychain/ui/FirstTimeActivity.java        |  13 ++-
 .../main/res/layout/first_time_activity.xml   | 102 ++++++++++++------
 2 files changed, 75 insertions(+), 40 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
index a764d78c2..5f3f170a1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
@@ -22,7 +22,6 @@ import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 import android.view.Window;
-import android.widget.Button;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
@@ -31,9 +30,9 @@ import org.sufficientlysecure.keychain.util.Log;
 
 public class FirstTimeActivity extends ActionBarActivity {
 
-    Button mCreateKey;
-    Button mImportKey;
-    Button mSkipSetup;
+    View mCreateKey;
+    View mImportKey;
+    View mSkipSetup;
 
     public static final int REQUEST_CODE_CREATE_OR_IMPORT_KEY = 0x00007012;
 
@@ -45,9 +44,9 @@ public class FirstTimeActivity extends ActionBarActivity {
 
         setContentView(R.layout.first_time_activity);
 
-        mCreateKey = (Button) findViewById(R.id.first_time_create_key);
-        mImportKey = (Button) findViewById(R.id.first_time_import_key);
-        mSkipSetup = (Button) findViewById(R.id.first_time_cancel);
+        mCreateKey = findViewById(R.id.first_time_create_key);
+        mImportKey = findViewById(R.id.first_time_import_key);
+        mSkipSetup = findViewById(R.id.first_time_cancel);
 
         mSkipSetup.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 37bad7c9b..e1a67a077 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -2,50 +2,86 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingTop="16dp"
-    android:paddingBottom="8dp">
-
-    <Button
-        android:id="@+id/first_time_cancel"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:text="@string/first_time_skip"
-        android:background="@drawable/button_edgy" />
+    android:paddingTop="16dp">
 
     <LinearLayout
         android:id="@+id/first_time_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/first_time_cancel"
-        android:orientation="horizontal">
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical">
 
-        <Button
-            android:id="@+id/first_time_create_key"
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="4dp"
-            android:text="@string/first_time_create_key"
-            android:background="@drawable/button_edgy"
-            android:drawableLeft="@drawable/ic_action_new_account" />
+            android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/first_time_import_key"
+            <TextView
+                android:id="@+id/first_time_create_key"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/first_time_create_key"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:drawableRight="@drawable/ic_action_new_account"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:clickable="true"
+                style="@style/SelectableItem" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:id="@+id/first_time_import_key"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/first_time_import_key"
+                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>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/first_time_cancel"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="8dp"
-            android:text="@string/first_time_import_key"
-            android:background="@drawable/button_edgy"
-            android:drawableLeft="@drawable/ic_action_download" />
+            android:text="@string/first_time_skip"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:gravity="center"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:layout_gravity="center_horizontal" />
+
     </LinearLayout>
 
     <LinearLayout