diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
4 files changed, 232 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml b/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml index aa5353366..4c8697b0a 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml @@ -16,21 +16,43 @@ android:paddingRight="16dp" android:orientation="vertical"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:orientation="horizontal"> + + <ImageView + android:layout_width="60dip" + android:layout_height="60dip" + android:padding="8dp" + android:src="@drawable/dns" + android:layout_gravity="center_vertical" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_dns_1_1" /> + + </LinearLayout> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_1_1" /> + android:text="@string/linked_create_dns_1_2" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_dns_1_3" /> - <org.sufficientlysecure.keychain.ui.widget.HttpsPrefixedText - android:id="@+id/affirmation_create_https_uri" + <EditText + android:id="@+id/affirmation_create_dns_domain" android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionNext" @@ -39,21 +61,19 @@ android:layout_gravity="center_horizontal" /> - </LinearLayout> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_1_2" /> + android:text="@string/linked_create_dns_1_4" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_1_3" /> + android:text="@string/linked_create_dns_1_5" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step2.xml b/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step2.xml new file mode 100644 index 000000000..2f5630f88 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step2.xml @@ -0,0 +1,188 @@ +<?xml version="1.0" encoding="UTF-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="false" + android:layout_above="@+id/create_key_button_divider"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_dns_2_1" /> + + <EditText + android:id="@+id/affirmation_create_dns_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:layout_marginTop="8dp" + android:layout_gravity="center_horizontal" + android:inputType="textUri|none" + android:enabled="false"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_dns_2_2" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_gravity="center_horizontal"> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Share" + android:id="@+id/button_send" + android:layout_marginRight="8dip"/> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Save" + android:id="@+id/button_save" + android:layout_marginLeft="8dip"/> + + </LinearLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_dns_2_3" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp"> + + <ImageView + android:id="@+id/verify_image" + android:src="@drawable/status_signature_unverified_cutout" + android:layout_gravity="center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" + /> + + <ProgressBar + android:id="@+id/verify_progress" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:indeterminateOnly="true"/> + + <TextView + android:id="@+id/verify_status" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_verify_pending" + android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" + android:layout_weight="1" + /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Verify" + android:id="@+id/button_verify" + android:layout_marginRight="16dp" + android:layout_marginEnd="16dip" + /> + + </LinearLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/linked_create_dns_2_4" /> + + </LinearLayout> + + </ScrollView> + + <View + android:id="@+id/create_key_button_divider" + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:background="?android:attr/listDivider" + android:layout_alignTop="@+id/create_key_buttons" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:id="@+id/create_key_buttons"> + + <TextView + android:id="@+id/back_button" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_back" + android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="@style/SelectableItem" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/next_button" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_next" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_action_play" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" + android:layout_gravity="center_vertical" /> + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml index 8bc2ab4ce..9793ee21c 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml @@ -36,7 +36,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/aff_create_https_1_1" /> - </LinearLayout> + </LinearLayout> <TextView android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 9ae5fff02..fc8f130b9 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1175,6 +1175,17 @@ <string name="linked_create_twitter_3_3">"After the tweet is published, hit the button to verify that everything is correct"</string> <string name="linked_create_twitter_3_4">"Next"</string> + <string name="linked_create_dns_1_1">"You can link your key to a domain name you control by publishing a special TXT record."</string> + <string name="linked_create_dns_1_2">"A linked identity of this type is especially useful if the email address you use is at the same domain."</string> + <string name="linked_create_dns_1_3">"Please enter a fully qualified domain name:"</string> + <string name="linked_create_dns_1_4">"Example: subdomain.example.com"</string> + <string name="linked_create_dns_1_5">"In the next step, a message will be generated which you will be asked to publish as a TXT record. This record then links back to your pgp key, to make the connection verifiable in both directions."</string> + <string name="linked_create_dns_2_1">"Your proof text:"</string> + <string name="linked_create_dns_2_2">"For the next step, bla bla"</string> + <string name="linked_create_dns_2_3">"More bla:"</string> + <string name="linked_create_dns_2_4">"bla bla"</string> + + <string name="linked_id_generic_text">"This file claims ownership of the OpenPGP key with long id %2$s.\n\nCookie for proof:\n%1$s"</string> <string name="linked_verifying">Verifying…</string> <string name="linked_verify_success">Verification successful!</string> |