diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-01 06:41:47 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-01 06:42:10 +0200 |
| commit | b52a0303ca3a6b10661f36a0ff2102eb21dffaf7 (patch) | |
| tree | 7c67082d6dc5b637f436312a3f044aa06de3c746 /OpenKeychain/src/main/res | |
| parent | 9668abfe9edf09f36dc361b008106708f5c1dd9c (diff) | |
| download | open-keychain-b52a0303ca3a6b10661f36a0ff2102eb21dffaf7.tar.gz open-keychain-b52a0303ca3a6b10661f36a0ff2102eb21dffaf7.tar.bz2 open-keychain-b52a0303ca3a6b10661f36a0ff2102eb21dffaf7.zip | |
linked: redesign github resource creation, implement ouath flow (WIP)
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 174 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml new file mode 100644 index 000000000..f55a5368d --- /dev/null +++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml @@ -0,0 +1,172 @@ +<?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" + xmlns:tools="http://schemas.android.com/tools" + xmlns:custom="http://schemas.android.com/apk/res-auto"> + + <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:padding="16dp" + android:orientation="vertical"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_margin="8dp" + android:src="@drawable/linked_github" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginBottom="16dp" + android:text="This login data will be used to post a gist, verifying this account and key belongs to you!" + style="?android:textAppearanceSmall"/> + + <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/proceed_container" + custom:initialView="1"> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + style="?android:buttonBarButtonStyle" + android:drawableLeft="@drawable/ic_mode_edit_grey_24dp" + android:drawableStart="@drawable/ic_mode_edit_grey_24dp" + android:drawablePadding="12dp" + android:text="Post Gist & Link Key" + android:id="@+id/button_send" + /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <org.sufficientlysecure.keychain.ui.widget.StatusIndicator + android:layout_width="24dp" + android:layout_height="24dp" + android:id="@+id/linked_status_step1" + android:layout_margin="4dp"> + </org.sufficientlysecure.keychain.ui.widget.StatusIndicator> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="Login at GitHub…" + style="?android:textAppearanceMedium" + /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <org.sufficientlysecure.keychain.ui.widget.StatusIndicator + android:layout_width="24dp" + android:layout_height="24dp" + android:id="@+id/linked_status_step2" + android:layout_margin="4dp"> + </org.sufficientlysecure.keychain.ui.widget.StatusIndicator> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="Post Gist…" + style="?android:textAppearanceMedium" + /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <org.sufficientlysecure.keychain.ui.widget.StatusIndicator + android:layout_width="24dp" + android:layout_height="24dp" + android:id="@+id/linked_status_step3" + android:layout_margin="4dp"> + </org.sufficientlysecure.keychain.ui.widget.StatusIndicator> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="Update Key…" + style="?android:textAppearanceMedium" + /> + </LinearLayout> + + </LinearLayout> + + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> + + </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_cancel" + android:minHeight="?android:attr/listPreferredItemHeight" + android:textAllCaps="true" + style="?android:attr/borderlessButtonStyle" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + android:layout_gravity="center_vertical" /> + + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_verify.xml b/OpenKeychain/src/main/res/layout/linked_create_verify.xml index 234f43334..9f9dbcd97 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_verify.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_verify.xml @@ -4,8 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - tools:showIn="@layout/linked_create_https_fragment_step2"> + tools:showIn="@layout/linked_create_github_fragment_step2"> <ViewAnimator android:id="@+id/verify_progress" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 7ff148e28..ff126a7a5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -82,6 +82,7 @@ <string name="btn_export_to_server">"Upload To Keyserver"</string> <string name="btn_next">"Next"</string> <string name="btn_back">"Back"</string> + <string name="btn_cancel">"Cancel"</string> <string name="btn_no">"No"</string> <string name="btn_match">"Fingerprints match"</string> <string name="btn_share_encrypted_signed">"Encrypt/sign and share text"</string> |