From 2b609b8144c093b1034c2845a8110ac84eecc414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 24 Feb 2015 13:43:24 +0100
Subject: [PATCH] Fix QR Code, design experiments for key view

---
 .../drawable-hdpi/ic_qrcode_white_24dp.png    | Bin 0 -> 427 bytes
 .../drawable-mdpi/ic_qrcode_white_24dp.png    | Bin 0 -> 231 bytes
 .../drawable-xhdpi/ic_qrcode_white_24dp.png   | Bin 0 -> 284 bytes
 .../drawable-xxhdpi/ic_qrcode_white_24dp.png  | Bin 0 -> 352 bytes
 .../drawable-xxxhdpi/ic_qrcode_white_24dp.png | Bin 0 -> 414 bytes
 OpenKeychain/src/main/res/drawable/qrcode.xml |   8 --
 .../src/main/res/layout/key_list_fragment.xml |   2 +-
 .../src/main/res/layout/view_key_activity.xml | 111 +++++++++++++-----
 OpenKeychain/src/main/res/menu/key_view.xml   |   7 +-
 9 files changed, 91 insertions(+), 37 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable/qrcode.xml

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..261f4a5ab27e7317436b33eb312f54f90262b6af
GIT binary patch
literal 427
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6U4S$Y{B+)352QE?JR*yM
zv<Dcwoy@ia36>Q&rUPlPeufHm>3#+VMl(+r$B>A_Z^Iq=nhXTyn5xuu&i><7!}vqH
z>a+K}Yt0JWnYr6Va)i|t6;o#FS^G#foN-_{aK^O3Tjh9jhmV(>LGkI2FVv2S*es9t
z-r|-jEz9tDr@qT94Y_D%X2HArHX0O5UkDKK7o2obeS-4b*aa<Z%Rd#EGN_4v{jgtn
zcIBx_Jo(G-9RGad<%)`ZW-czw4T-OVvn#qLtVw&e`uV;I??XlU*Dg%6*{0N`9({5N
z_m&CkJdb{E7j{>53q32?X}Cizdb+M#`<Kp-nr0`B-}ueB9@D$AnSEW=+fwPS2|j*G
zo=HcF4o~@{o7HhbW|BneABpDLe9hO4Gd8I-+ZncbD94I@iT~DUX4vNC?6P)+=KK9R
zR)*_hUfyC@I%T)|F}6cfC!4HZ78}HLB4U%R(Bjim*KPge)1$vu;Be9D|F2#GgOkD2
L)z4*}Q$iB}u5P6>

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cf552b138902ab895191aa1ff98ec243612024b
GIT binary patch
literal 231
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}6TtKSPDj(q%wSk*AAeh{y4(A&z_p6gad`|NEa>HuK~r2F=bD
zUpibh6B?5^7*?zbN||W#e^ppPwCKNwp=Umv7M;QWg8SQ~j{Rk9%yId)E`PRi8P%r$
ze9HAJxl7#jqg<THxwU_6?JZYz1b*tB|I&44uGQu4J(7_>|L%Rkc(E!%^OEYajX>KO
NJYD@<);T3K0RZ;>P&ohq

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2c6ade61c90713dcaef765c2bfb2d098f4ff878
GIT binary patch
literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&m
z?E%JaC$sH9f@KAc=|CE+pW)oQo^T*%xu=U`NXEUlGahm^DDbqz{`j|kPaUh0ht%xn
z7i;%-J$bZi=B^+Xv1+|Lcb!|$uGxG3(te};=lD_>d}VE4WdG>BD%F2!xxWM3g)283
zYkAjQE0|_i%VgA$R>kLXy=Dr8ZNa|i`}@dWUpP-R2r!*CtX;VN@yq{CMh(wq?3-}z
z$eIh%7R&UPls1S~G2i~>6j`nOizS8O?6!RuURfFat^;x${>+u`{}hny9U5W{bTWgd
LtDnm{r-UW|wf}6K

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4f2f57c9e289b21469d4d7abb2c5362d411d676
GIT binary patch
literal 352
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE<hRxemd{22U45`9+AaB
z8myGT?PRtcNU*HHF&!>=uJQvbkn`Hp#WAGf*4ta&T!$P492}MJ{XbRs`p^fZV`n5*
zm34W1mdLO#-py#gWshCN^-@`*Bb#*I&zqk(?{^2|zfK3o1quNI8aChdWMrSNd9`9~
z$uk>2pa6#m3l~#sY;?})Yho5zr_UJl3xh;h8=D*+uGTfnik@qU5J|i)CjIsQ6`s!)
zju7KGSQw_4uC(sjUm-ugxe01V%&Wddw`G~ZCbKpkTKZ1om!4SzRMMx`y|67_YA)C{
qASJ=~18rXIzGwc~8g6FK7Z$hZfbLI^sv?2jX7F_Nb6Mw<&;$Tya&}(;

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e795f80a5ea8f01ce028353ae6e38207d0368735
GIT binary patch
literal 414
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}8pX7+2iB`GtXjQPb1KF{I+w+dF5unj9n?0(<ZMpPGB$N%GP<
z`{z2{uewhk=rFy^av=EZeSV$Oo31#o<+C~e`PS#~+5bcNzmzZ?Vd>x$5LQrg@M*YF
z{e?C9_lJ1dz5VvL|AYZWW-u5sCP9=)@8i3%X)C{7m3-aSpKFn2gcY{^E<JGb`_J^*
z_qpJPfwdmK&Y1rH@87G>wlhJE0ow$0euI5+T)>}y>speLT`=Qw6Px}0|1J4$$QBgG
zU3gIQj{Qy#!ZpGQWxGE&t^2lHQ5)=ZxI^#0+p}Qtd-peg|Dw8)fk8=r@%Mnu%UX^<
Q09w!B>FVdQ&MBb@0QmEm1poj5

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable/qrcode.xml b/OpenKeychain/src/main/res/drawable/qrcode.xml
deleted file mode 100644
index 87eb7d485..000000000
--- a/OpenKeychain/src/main/res/drawable/qrcode.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/qrcode.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M5,5H7V7H5V5M1,1H11V11H1V1M3,3V9H9V3H3M5,17H7V19H5V17M1,13H11V23H1V13M3,15V21H9V15H3M17,5H19V7H17V5M13,1H23V11H13V1M15,3V9H21V3H15M13,13H17V15H19V13H23V15H19V17H23V23H19V21H15V23H13V21H15V19H13V13M21,21V19H19V21H21M19,17H17V15H15V19H19V17Z" />
-</vector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index c918ace37..3c46b4f9c 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -66,7 +66,7 @@
             android:id="@+id/fab_add_qr_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            fab:fab_icon="@drawable/qrcode"
+            fab:fab_icon="@drawable/ic_qrcode_white_24dp"
             fab:fab_colorNormal="@color/primary"
             fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Scan QR Code"
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 25115eb2f..f9c23f065 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -1,44 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar_include"
+    <RelativeLayout
+        android:id="@+id/toolbar_big"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="@dimen/big_toolbar"
+        android:elevation="4dp"
+        android:background="?attr/colorPrimary"
+        android:orientation="horizontal">
 
-        <include layout="@layout/notify_area" />
+        <ImageView
+            android:id="@+id/status_bar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/statusbar_height"
+            android:background="?attr/colorPrimary" />
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_below="@+id/status_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:overScrollMode="always"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            tools:ignore="UnusedAttribute"
+            android:transitionGroup="false"
+            android:touchscreenBlocksFocus="false" />
 
         <LinearLayout
-            android:id="@+id/view_key_status_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:orientation="horizontal">
+            android:layout_below="@+id/toolbar"
+            android:layout_marginLeft="48dp"
+            android:layout_marginRight="72dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-            <ImageView
-                android:id="@+id/view_key_status_image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                android:id="@+id/view_key_status_text"
+            <LinearLayout
+                android:id="@+id/view_key_status_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="8dp" />
+                android:layout_gravity="center"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:orientation="horizontal">
 
+                <ImageView
+                    android:id="@+id/view_key_status_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/view_key_status_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="8dp" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/api_app_settings_app_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Name (set in-code)longlong"
+                android:textColor="@color/icons"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:paddingLeft="8dp"
+                android:layout_gravity="center_vertical" />
         </LinearLayout>
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/body"
+        android:layout_below="@id/toolbar_big"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <View
             android:layout_width="match_parent"
@@ -59,6 +103,19 @@
                 android:orientation="vertical" />
 
         </FrameLayout>
-
     </LinearLayout>
+
+    <com.getbase.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_alignBottom="@id/toolbar_big"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="-40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:elevation="4dp"
+        fab:fab_icon="@drawable/ic_qrcode_white_24dp"
+        fab:fab_colorNormal="@color/fab"
+        fab:fab_colorPressed="@color/fab_pressed" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 049c7013a..d2ca90942 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -2,9 +2,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/menu_key_view_refresh"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        app:showAsAction="always"
+        android:title="@string/key_view_action_update" />
+
     <item
         android:id="@+id/menu_key_view_export_file"
-        android:icon="@drawable/ic_action_import_export"
         app:showAsAction="never"
         android:title="@string/menu_export_key" />