From 8ae245e6dfaeb911bc3b96d5bc7c324cd25e98c6 Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Thu, 2 Jun 2016 01:34:29 +0200
Subject: [PATCH] ImportKeys: Use Toolbar for Import button

---
 .../ic_file_download_white_24dp.png           | Bin 0 -> 163 bytes
 .../ic_file_download_white_24dp.png           | Bin 0 -> 116 bytes
 .../ic_file_download_white_24dp.png           | Bin 0 -> 157 bytes
 .../ic_file_download_white_24dp.png           | Bin 0 -> 197 bytes
 .../ic_file_download_white_24dp.png           | Bin 0 -> 233 bytes
 .../main/res/layout/import_keys_activity.xml  |  54 +++++++-----------
 .../res/layout/import_keys_list_fragment.xml  |   5 +-
 7 files changed, 24 insertions(+), 35 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8a2039c583803eab552eb2ad15248ad4f306b14
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8mZytjh{y4_Q*ZMgP~c#YJsK$U
z)~(q1m-m)lF^^vy&zFBx;@>#sNTW$&#91{bH;=%sZG7QZ>uQBcw?@Ce|ClF7G156^
z#Rt_}Q9HRs{l8sYa>)1&$3+cMLFMTJXY2PZ*sH$V@BeR?lj;@>g(qYZ*L3k@0BvRP
MboFyt=akR{0D4_J0ssI2

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d400472fd64b0a90998ce6c5eab813b7c8eeec12
GIT binary patch
literal 116
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Yfl%)5R22v2@+fn?1dz*HZ0um
z&|dF?!>nm+mvS-{o;0&fnzA@EQ^BmzWWo}eRZ9~msAiWq$nrXiF)+AFy^vQr>(2u;
OhQZU-&t;ucLK6V({vp)>

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f53cc0c62c228828d73c90f681eda0835179b0b0
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D6i*k&kch)?FYe|&V8Fv1*n95m
zR5e$DAHp{l&A!8XfIV8!#r>2YP$7e#!c^^(-Y0%@RoZ*qi`F<)`EKq{{v+@Hw5*sR
zFA(}!c2Utj$B^^;IgbBnE;xI?rFh=CsojiM7+vgNGclA;TJ|n(&Igb&p00i_>zopr
E0CTxJ1ONa4

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..78aa591668242095017c9d5e96f7a9873fe1fbc8
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawdOTemLo)8Yz3#}@pdi5FIM2@h
zcsF};z`+CWBzDIKG_pEry11Auz9p#O(7?dR#KIx4z`kMCt2a+vCtcS%nf>^QsrM(T
z{K~l&Yj@SA9If=c^vXIaY>wlkMR7)vg;t&u=kNuYJa3$GaHnEwp`ORgIc%D<i<K-3
u_*BHt`4v49xOmI{PX^FnB_*X_A=2{#|5qp~zWe}m7lWs(pUXO@geCyry-4r?

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ded5652e406a8bb0788402b1ea2034968a241ead
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=J@dWsUxB}__Fko@OdIgZrQWE4B
z%<!L~;lbvM;Xr<er;B4q1>@VZ8#xa<@HhnOS1viNAnEC})a|0sJS72xJ-2)f?&QaR
z?3aFfZT$|bN3Ya!ZWwgOIdJDMXyKo5=w(d|$6F^2ai?7ZNyM@uS}y1~X^1JRa37T8
i%D!pbm~%M(0r%^vOJ5j@by@-4#Ng@b=d#Wzp$Pz$!&MXj

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 6602c4b8f..8409ed94f 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <include
         android:id="@+id/toolbar_include"
@@ -13,22 +12,21 @@
         https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
     -->
     <LinearLayout
-        android:layout_below="@id/toolbar_include"
-        android:fitsSystemWindows="true"
-        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_below="@id/toolbar_include"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
         <include layout="@layout/notify_area" />
 
         <LinearLayout
+            android:id="@+id/import_keys_top_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:id="@+id/import_keys_top_layout"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:visibility="gone">
 
             <FrameLayout
                 android:id="@+id/import_keys_top_container"
@@ -46,39 +44,29 @@
         <FrameLayout
             android:id="@+id/import_keys_list_container"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:orientation="vertical"
+            android:layout_height="match_parent"
             android:layout_weight="1" />
 
-        <RelativeLayout
+        <android.support.v7.widget.Toolbar
             android:id="@+id/import_footer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <View
-                android:id="@+id/import_divider"
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider" />
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:elevation="4dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
             <TextView
                 android:id="@+id/import_import"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+                style="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_below="@id/import_divider"
-                android:text="@string/import_import"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_file_download_grey_24dp"
+                android:layout_height="match_parent"
                 android:drawablePadding="8dp"
+                android:drawableRight="@drawable/ic_file_download_white_24dp"
                 android:gravity="center_vertical"
-                android:clickable="true"
-                android:background="?android:selectableItemBackground" />
+                android:text="@string/import_import"
+                android:textColor="#ffffffff" />
 
             <RelativeLayout
                 android:id="@+id/import_snackbar"
@@ -86,6 +74,8 @@
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@id/import_import" />
 
-        </RelativeLayout>
+        </android.support.v7.widget.Toolbar>
+
     </LinearLayout>
+
 </RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
index 8634e3728..d309a5da9 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/md_grey_100">
 
     <ProgressBar
         android:id="@+id/progress_view"
@@ -14,10 +15,8 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="4dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-        android:paddingTop="4dp"
         android:scrollbars="vertical"
         android:visibility="gone" />
 </FrameLayout>