From 14c025031ea010ca9e016fadc0da75822dffac1f Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 2 Jan 2015 04:30:02 +0000
Subject: [PATCH] Replace copy image with button, extract strings

---
 .../ic_content_copy_grey600_24dp.png          | Bin 287 -> 0 bytes
 .../ic_content_copy_grey600_24dp.png          | Bin 217 -> 0 bytes
 .../ic_content_copy_grey600_24dp.png          | Bin 320 -> 0 bytes
 .../ic_content_copy_grey600_24dp.png          | Bin 435 -> 0 bytes
 .../res/layout/fragment_network_error.xml     |  19 ++++---------
 .../main/res/layout/fragment_view_address.xml |  26 +++++++-----------
 app/src/main/res/values/strings.xml           |   4 +++
 7 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png

diff --git a/app/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 5592d5c80153adffbf0aa6918fdf98e18f0596b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W<6gr;B5V$MIy1)CGJl2C3eky`?)ESa>$+{tfyyU&G_Tf?^jb=L-w=C%A@ukczwQ
z!I>i^>Egq4ZR)S7Mvu%pen`ah8*t5bJaYWO|DgC9HbL=b_5-W3K1#a8958oSD{Y!_
zWkFzb+cw7&tk$k<iiZQ6Uu0ac_u{Hg@$f2r(tKV)dXe^tt20DZw5BL7I<<~<SDRpT
dcdru%!#1@ORR;whN&=n8;OXk;vd$@?2>>@BU0VPE

diff --git a/app/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index bab9b4d669edd03f93365a4d2f23daec6edc1a84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kJm
z=;`7ZVsScIBUORdX~ls{)0h4)bXX%*pnZHHV>e5k`oy)2+vDS={z|^wa9&@3W9EUk
zCOgioXj5Fv=v={(UD2vux&OejgYxNp6@jn1eVGLX7^;7)i_(f&bronhgQu&X%Q~lo
FCIFl*LstL*

diff --git a/app/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 68ccece61d349fda144356ca660bbc4d154bf749..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq
zcX+xuhD02Gd&7|LkO5EY!~MptG0N^Q?#L?gF~>0G1(&*=kzp+4WYIESGf`nu?nS*l
zXA1Y7n5cUEYFlBrsp^CqmyN#9OJEgB7n`UZ)z}xR!yfkFp<kbH#Z9J1{W=N^KVCmN
z*{LfoEwHxR+ShMNV@9mQeD`TU>c9jbbz*USr=WsE0|O%yiv{E1G)AU>d=fMMZu|K+
z=g@S=1<ARLi{vLr^M>DEqg1$HX_@Nt6MFV_j}lL4yykVD*`oM&*PX>cKQMT@`njxg
HN@xNA2WM@y

diff --git a/app/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 2fdbbea1384bea28573f646704c0387608d5fab8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&?
zz`&^O>EalYaqsOd$E-sRBF8@d7wHtMVt&agb?e<L$s@{FY6CMSHl+(*e=E8weS((9
zSFWl?y;XOYc>8vU$Q!F2`o8Jpgrk2d_Lv*<6xN;+73V0?(RehI^S;WwdCH3?NnZc?
zV4sa-SJ$%?M}ODiO$*9ycKupb5wL5;`fvB<UQ=vju`*n7OxxH@u53GRa8=0X<%KIh
z2NZ31yIxYb+V^Oans#<u);-ID(;X+cUR6D3xN~u1lN@ts!ELTC=Eg_=`7?e7e%*Ea
zZPfE1?!^vFoGKGg2oZ}*+vWWvg*+4*S%hAk`M$|{<K5k-{cX<uOFnzSD8Oo3*oA6^
z3$sN{5(FEJ(=%9eGe13@d->7zd#T!TFAUFWJ3DLEe{yOrz30As{-bleU)Wu5<+8o-
SaODApC4;A{pUXO@geCy#2drrT

diff --git a/app/src/main/res/layout/fragment_network_error.xml b/app/src/main/res/layout/fragment_network_error.xml
index b8bdbdd..0cb8652 100644
--- a/app/src/main/res/layout/fragment_network_error.xml
+++ b/app/src/main/res/layout/fragment_network_error.xml
@@ -40,20 +40,13 @@
                 android:layout_weight="1"
                 android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
 
-            <View
-                style="@style/Divider.Vertical"
-                android:layout_marginEnd="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginStart="8dp"/>
-
-            <ImageView
+            <Button
                 android:id="@+id/copy_error"
-                android:layout_width="@dimen/listitem_picture_size"
-                android:layout_height="match_parent"
-                android:minHeight="@dimen/listitem_picture_size"
-                android:scaleType="center"
-                android:src="@drawable/ic_content_copy_grey600_24dp"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
+                android:text="@string/copy"/>
         </LinearLayout>
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_view_address.xml b/app/src/main/res/layout/fragment_view_address.xml
index eaa0df4..6ba7b28 100644
--- a/app/src/main/res/layout/fragment_view_address.xml
+++ b/app/src/main/res/layout/fragment_view_address.xml
@@ -82,7 +82,7 @@
                     android:id="@+id/title_address_info"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Address information"
+                    android:text="@string/address_info"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subject"/>
 
                 <TextView
@@ -90,7 +90,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
-                    android:text="Crypto implementation"
+                    android:text="@string/crypto_impl"
                     android:textAppearance="@style/TextAppearance.AppCompat.Primary"/>
 
                 <ImageView
@@ -115,19 +115,13 @@
                         android:text="Key"
                         android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
 
-                    <View
-                        style="@style/Divider.Vertical"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginStart="8dp"/>
-
-                    <ImageView
+                    <Button
                         android:id="@+id/copy_key"
-                        android:layout_width="@dimen/listitem_picture_size"
-                        android:layout_height="match_parent"
-                        android:scaleType="center"
-                        android:src="@drawable/ic_content_copy_grey600_24dp"/>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginStart="8dp"
+                        android:text="@string/copy"/>
                 </LinearLayout>
 
                 <TextView
@@ -135,7 +129,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
-                    android:text="Fingerprint"
+                    android:text="@string/fingerprint"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subject"
                     android:visibility="gone"/>
 
@@ -144,7 +138,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
-                    android:text="Fingerprint"
+                    android:text="@string/fingerprint"
                     android:textAppearance="@style/TextAppearance.AppCompat.Primary"
                     android:visibility="gone"/>
             </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a69fa7..115fcd1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -140,6 +140,10 @@
     <string name="response_quote_wrote_hide" translatable="false">%s wrote:</string>
     <string name="address_book_empty">Address book is empty</string>
     <string name="share">Share</string>
+    <string name="address_info">Address information</string>
+    <string name="crypto_impl">Crypto implementation</string>
+    <string name="copy">Copy</string>
+    <string name="fingerprint">Fingerprint</string>
     <string name="action_new_contact">New contact</string>
     <string name="action_scan_qr_code">Scan QR code</string>
     <string name="edit_contact">Edit contact</string>