diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml | 91 |
1 files changed, 46 insertions, 45 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 index f55a5368d..983d4efd5 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml @@ -1,9 +1,7 @@ <?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"> + android:layout_height="match_parent"> <ScrollView android:layout_width="match_parent" @@ -29,54 +27,35 @@ 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!" + android:text="This operation links your key to your GitHub account." style="?android:textAppearanceSmall"/> - <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator + <LinearLayout 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" - /> + android:orientation="vertical" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"> <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"> + 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> + <org.sufficientlysecure.keychain.ui.widget.StatusIndicator + android:layout_width="24dp" + android:layout_height="24dp" + android:id="@+id/linked_status_step1" + android:layout_margin="4dp" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="Login at GitHub…" - style="?android:textAppearanceMedium" - /> + <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> <LinearLayout android:layout_width="match_parent" @@ -86,8 +65,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:id="@+id/linked_status_step2" - android:layout_margin="4dp"> - </org.sufficientlysecure.keychain.ui.widget.StatusIndicator> + android:layout_margin="4dp" /> <TextView android:layout_width="wrap_content" @@ -107,8 +85,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:id="@+id/linked_status_step3" - android:layout_margin="4dp"> - </org.sufficientlysecure.keychain.ui.widget.StatusIndicator> + android:layout_margin="4dp" /> <TextView android:layout_width="wrap_content" @@ -121,6 +98,30 @@ </LinearLayout> + <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/button_container" + android:outAnimation="@anim/fade_out"> + + <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_person_add_grey_24dp" + android:drawableStart="@drawable/ic_person_add_grey_24dp" + android:drawablePadding="12dp" + android:text="Link to Github Account" + android:id="@+id/button_send" + /> + + <Space + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> </LinearLayout> |