diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-12 13:17:18 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-12 13:17:18 +0100 |
commit | 5faeb5f5f060e049000e804deca5445d281f8611 (patch) | |
tree | 9c6d9446ce980c4a69125b3957e18e35fc5673f1 /OpenKeychain/src/main/res | |
parent | 6570483fab4b7bfa2b09cc3e94a3901a002326cc (diff) | |
download | open-keychain-5faeb5f5f060e049000e804deca5445d281f8611.tar.gz open-keychain-5faeb5f5f060e049000e804deca5445d281f8611.tar.bz2 open-keychain-5faeb5f5f060e049000e804deca5445d281f8611.zip |
intermediate state, nothing really working yet
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/drawable/ssl_lock.png | bin | 0 -> 479 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable/twitter.png | bin | 0 -> 5122 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml | 121 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml | 182 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml | 118 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_main_fragment.xml | 22 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 |
7 files changed, 453 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/drawable/ssl_lock.png b/OpenKeychain/src/main/res/drawable/ssl_lock.png Binary files differnew file mode 100644 index 000000000..00c4d8e4f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/ssl_lock.png diff --git a/OpenKeychain/src/main/res/drawable/twitter.png b/OpenKeychain/src/main/res/drawable/twitter.png Binary files differnew file mode 100644 index 000000000..3533e0488 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/twitter.png 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 new file mode 100644 index 000000000..f50a4d9be --- /dev/null +++ b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml @@ -0,0 +1,121 @@ +<?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/aff_create_https_1_1" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:orientation="horizontal"> + + <org.sufficientlysecure.keychain.ui.widget.HttpsPrefixedText + android:id="@+id/affirmation_create_https_uri" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:ems="10" + android:inputType="textUri" + 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" /> + + <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" /> + + </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/create_key_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="" + android:minHeight="?android:attr/listPreferredItemHeight" + 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_step2.xml b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml new file mode 100644 index 000000000..50a0d6514 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml @@ -0,0 +1,182 @@ +<?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/aff_create_https_2_1" /> + + <EditText + android:id="@+id/affirmation_create_https_uri" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:layout_marginTop="8dp" + android:hint="uri" + android:ems="10" + 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/aff_create_https_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/aff_create_https_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"/> + + <ProgressBar + android:id="@+id/verify_progress" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:indeterminateOnly="true"/> + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="Not verified" + android:layout_marginLeft="16dip" + android:layout_weight="1" + android:id="@+id/verify_status"/> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Verify" + android:id="@+id/button_verify" + android:layout_marginRight="16dp"/> + + </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_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/create_key_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="" + android:minHeight="?android:attr/listPreferredItemHeight" + 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_select_fragment.xml b/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml new file mode 100644 index 000000000..f9c28c5c3 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="8dp" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="An 'affirmation' connects your pgp key to a resource on the web." + android:id="@+id/textView" + android:layout_weight="1" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="Please select a type:" + android:layout_weight="1" /> + + <org.sufficientlysecure.keychain.ui.widget.FixedListView + android:id="@+id/view_key_user_ids" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginBottom="4dp" + android:background="?android:attr/listDivider" /> + + <LinearLayout + android:id="@+id/affirmation_create_https_button" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:paddingRight="4dp" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <!-- separate ImageView required for recoloring --> + <ImageView + android:id="@+id/certify_key_action_certify_image" + android:layout_width="60dip" + android:layout_height="60dip" + android:padding="8dp" + android:src="@drawable/ssl_lock" + android:layout_gravity="center_vertical" /> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="Website" + android:layout_weight="1" + android:gravity="center_vertical" /> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginBottom="4dp" + android:background="?android:attr/listDivider" /> + + <LinearLayout + android:id="@+id/affirmation_create_twitter_button" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:paddingRight="4dp" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <!-- separate ImageView required for recoloring --> + <ImageView + android:layout_width="60dip" + android:layout_height="60dip" + android:padding="8dp" + android:src="@drawable/twitter" + android:layout_gravity="center" + /> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="Twitter" + android:layout_weight="1" + android:gravity="center_vertical" /> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginBottom="4dp" + android:background="?android:attr/listDivider" /> + + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 691ee357d..e3347bd70 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -72,6 +72,28 @@ android:background="?android:attr/listDivider" /> <TextView + android:id="@+id/view_key_action_link" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="@style/SelectableItem" + android:text="Link to Resource" + android:layout_weight="1" + android:drawableRight="@drawable/ic_action_add_person" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> + + <View + android:id="@+id/view_key_action_link_divider" + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <TextView android:id="@+id/view_key_action_edit" android:paddingLeft="8dp" android:paddingRight="8dp" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 301de0be1..b6b7cdd0f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ <string name="title_unlock">"Unlock Key"</string> <string name="title_add_subkey">"Add subkey"</string> <string name="title_edit_key">"Edit Key"</string> + <string name="title_affirmation">"Create Affirmation"</string> <string name="title_preferences">"Preferences"</string> <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string> <string name="title_api_registered_apps">"Apps"</string> @@ -1099,4 +1100,13 @@ <string name="unlocked">Unlocked</string> <string name="nfc_settings">Settings</string> + <string name="aff_create_https_1_1">"You can connect your key to a website you own. This website must support https! Please enter a url where you are able to place a text file for proof:"</string> + <string name="aff_create_https_1_2">"Example: https://example.com/pgpkey.txt"</string> + <string name="aff_create_https_1_3">"In the next step, a proof text file will be generated and signed with your key. After that, you will then be asked to upload the proof file for verification."</string> + <string name="aff_create_https_created">"The proof file has been created. For the next step, you should save and upload it to the URI you indicated:"</string> + <string name="aff_create_https_2_1">"A proof file for this URI has been created:"</string> + <string name="aff_create_https_2_2">"For the next step, you should save and upload this file."</string> + <string name="aff_create_https_2_3">"Make sure the file is reachable at the correct URI, then verify your setup."</string> + <string name="aff_create_https_2_4">"After verification is successful, hit next to finish the process."</string> + </resources> |