Replace copy image with button, extract strings

This commit is contained in:
str4d
2015-01-02 04:30:02 +00:00
parent 6991da2815
commit 14c025031e
7 changed files with 20 additions and 29 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 435 B

View File

@@ -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

View File

@@ -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>

View File

@@ -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>