summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorBalasankar C <balasankarc@users.noreply.github.com>2018-01-16 20:31:39 +0000
committerMohamed Zenadi <zeapo@users.noreply.github.com>2018-01-16 21:31:39 +0100
commit7eb866b94344c39ecfba309ee6f9efe58e0a9238 (patch)
treed88d021f074d1472212e785753c89b7939b95cef /app/src/main/res
parent0480e7cb028102c413449bbceae03bb7ba159350 (diff)
Fix totp elements layout (#367)
* Fix totp elements layout * Add missing rule * Make username copy button invisible by default * Fix totp copy button string * Don't show username fields if not set
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/decrypt_layout.xml7
-rw-r--r--app/src/main/res/values/strings.xml1
2 files changed, 5 insertions, 3 deletions
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index e5095d66..ac274e4e 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -133,6 +133,7 @@
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:contentDescription="@string/copy_username"
+ android:visibility="invisible"
android:background="@color/background"
android:src="@drawable/ic_content_copy"/>
@@ -170,9 +171,9 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentTop="true"
+ android:layout_below="@id/crypto_username_show"
android:visibility="invisible"
- android:contentDescription="@string/copy_username"
+ android:contentDescription="@string/copy_totp"
android:background="@color/background"
android:src="@drawable/ic_content_copy"/>
@@ -182,9 +183,9 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/crypto_copy_totp"
android:layout_toStartOf="@id/crypto_copy_totp"
+ android:layout_below="@id/crypto_username_show"
android:text="@string/totp"
android:textColor="@android:color/black"
android:textStyle="bold" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8a5f0e39..9d23a253 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -97,6 +97,7 @@
<string name="edit_password">Edit password</string>
<string name="copy_password">Copy password</string>
<string name="copy_username">Copy username</string>
+ <string name="copy_totp">Copy OTP code</string>
<string name="share_as_plaintext">Share as plaintext</string>
<string name="last_changed">Last changed %s</string>