diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_verify_otr.xml | 189 | ||||
| -rw-r--r-- | src/main/res/layout/dialog_verify_otr.xml | 60 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 17 |
3 files changed, 206 insertions, 60 deletions
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml new file mode 100644 index 00000000..d907d871 --- /dev/null +++ b/src/main/res/layout/activity_verify_otr.xml @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/secondarybackground"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + android:id="@+id/error_no_session" + android:layout_margin="16dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_otr_session_found" + android:layout_gravity="center_horizontal" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + /> + <RelativeLayout + android:id="@+id/verification_area_one" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@drawable/infocard_border" + android:layout_margin="8dp"> + <LinearLayout + android:id="@+id/fingerprint_area" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:orientation="vertical"> + <TextView + android:id="@+id/remote_jid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline"/> + <TextView + android:layout_marginTop="16dp" + android:id="@+id/your_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" + android:text="@string/your_fingerprint"/> + <TextView + android:layout_marginTop="16dp" + android:id="@+id/remote_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" + android:text="@string/remote_fingerprint"/> + </LinearLayout> + <LinearLayout + android:layout_below="@+id/fingerprint_area" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" > + + <Button + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:visibility="invisible" /> + + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/divider" + android:visibility="invisible"/> + + <Button + android:id="@+id/button_verify_fingerprint" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/verify" + android:textColor="@color/primarytext" /> + </LinearLayout> + </RelativeLayout> + <RelativeLayout + android:id="@+id/verification_area_two" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:background="@drawable/infocard_border"> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:id="@+id/shared_secret_box" + android:padding="16dp"> + <TextView + android:text="@string/smp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" + android:layout_marginBottom="16dp" + /> + <TextView + android:id="@+id/status_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/verified" + android:layout_gravity="center_horizontal" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:visibility="gone"/> + <EditText + android:id="@+id/shared_secret_hint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textAutoComplete" + android:hint="@string/shared_secret_hint" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" + android:layout_marginBottom="8dp"/> + <EditText + android:id="@+id/shared_secret_secret" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/shared_secret_secret" + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + </LinearLayout> + <LinearLayout + android:layout_below="@+id/shared_secret_box" + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" > + + <Button + android:id="@+id/button_shared_secret_negative" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:enabled="false" + android:text="@string/cancel" + android:textColor="@color/secondarytext"/> + + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/divider" /> + + <Button + android:id="@+id/button_shared_secret_positive" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/create" + android:textColor="@color/primarytext" /> + </LinearLayout> + </RelativeLayout> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/dialog_verify_otr.xml b/src/main/res/layout/dialog_verify_otr.xml deleted file mode 100644 index 499ef6cd..00000000 --- a/src/main/res/layout/dialog_verify_otr.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingBottom="16dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:text="@string/account_settings_jabber_id" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeHeadline" /> - - <TextView - android:id="@+id/verify_otr_jid" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:textColor="@color/secondarytext" - android:textSize="?attr/TextSizeBody" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:text="@string/otr_fingerprint" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeHeadline" /> - - <TextView - android:id="@+id/verify_otr_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:textColor="@color/secondarytext" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:text="@string/your_fingerprint" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeHeadline" /> - - <TextView - android:id="@+id/verify_otr_yourprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:textColor="@color/secondarytext" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> - -</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 414de73b..645dc8e5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -311,4 +311,21 @@ <string name="scan_qr_code">Scan QR code</string> <string name="show_qr_code">Show QR code</string> <string name="account_details">Account details</string> + <string name="verify_otr">Verify OTR</string> + <string name="remote_fingerprint">Remote Fingerprint</string> + <string name="scan">scan</string> + <string name="or_touch_phones">(or touch phones)</string> + <string name="smp">Socialist Millionaire Protocol</string> + <string name="shared_secret_hint">Hint or Question</string> + <string name="shared_secret_secret">Shared Secret</string> + <string name="confirm">Confirm</string> + <string name="in_progress">In progress</string> + <string name="respond">Respond</string> + <string name="failed">Failed</string> + <string name="secrets_do_not_match">Secrets do not match</string> + <string name="try_again">Try again</string>; + <string name="finish">Finish</string> + <string name="verified">Verified!</string> + <string name="smp_requested">Contact requested SMP verification</string> + <string name="no_otr_session_found">No valid OTR session has been found!</string> </resources> |