diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-09 22:00:44 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-09 22:00:44 +0100 |
commit | 67076b20196cd522f519e6ea156ddc34e20977d1 (patch) | |
tree | c9690ad6c6523853fe0be313b872912f524b928f /OpenKeychain/src/main/res/layout | |
parent | cc66435e38248880fee3af795619b5794b65d222 (diff) | |
download | open-keychain-67076b20196cd522f519e6ea156ddc34e20977d1.tar.gz open-keychain-67076b20196cd522f519e6ea156ddc34e20977d1.tar.bz2 open-keychain-67076b20196cd522f519e6ea156ddc34e20977d1.zip |
Make create key wizard step-by-step
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_email_fragment.xml | 84 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_final_fragment.xml | 46 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_name_fragment.xml | 83 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml (renamed from OpenKeychain/src/main/res/layout/create_key_input_fragment.xml) | 87 |
4 files changed, 201 insertions, 99 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml new file mode 100644 index 000000000..a24d1a2ee --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + android:layout_above="@+id/create_key_buttons"> + + <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:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/create_key_email_text" /> + + <org.sufficientlysecure.keychain.ui.widget.EmailEditText + android:id="@+id/create_key_email" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="8dp" + android:imeOptions="actionNext" + android:hint="@string/label_email" + android:ems="10" /> + + </LinearLayout> + </ScrollView> + + <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:background="@color/holo_gray_bright" + android:id="@+id/create_key_buttons"> + + <TextView + android:id="@+id/create_key_back_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + 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:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" /> + + <TextView + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + 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:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" + android:drawablePadding="8dp" + android:gravity="right|center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" /> + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 84625d1fd..830f039f7 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -6,7 +6,7 @@ <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@+id/create_key_buttons_divider"> + android:layout_above="@+id/create_key_buttons"> <LinearLayout android:layout_width="match_parent" @@ -144,58 +144,42 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" + android:background="@color/holo_gray_bright" android:id="@+id/create_key_buttons"> <TextView android:id="@+id/create_key_back_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" 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:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" - android:gravity="center_vertical" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" android:clickable="true" - style="?android:attr/borderlessButtonStyle" - 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" /> + style="?android:attr/borderlessButtonStyle" /> <TextView - android:id="@+id/create_key_create_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/btn_create_key" + android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" android:drawableRight="@drawable/ic_key_plus_grey600_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" + android:gravity="right|center_vertical" android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:layout_gravity="center_vertical" /> + style="?android:attr/borderlessButtonStyle" /> </LinearLayout> - <View - android:id="@+id/create_key_buttons_divider" - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_alignTop="@+id/create_key_buttons" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml new file mode 100644 index 000000000..ea064b00c --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + android:layout_above="@+id/create_key_buttons"> + + <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:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/create_key_name_text" /> + + <org.sufficientlysecure.keychain.ui.widget.NameEditText + android:id="@+id/create_key_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="8dp" + android:imeOptions="actionNext" + android:inputType="textAutoCorrect|textPersonName|textCapWords" + android:hint="@string/create_key_hint_full_name" + android:ems="10" /> + + </LinearLayout> + </ScrollView> + + <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:background="@color/holo_gray_bright" + android:id="@+id/create_key_buttons"> + + <TextView + android:id="@+id/create_key_back_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" + android:clickable="false" + style="?android:attr/borderlessButtonStyle" /> + + <TextView + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + 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:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" + android:drawablePadding="8dp" + android:gravity="right|center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" /> + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml index 2178fcb1f..4b09c6cac 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -8,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:layout_above="@+id/create_key_button_divider"> + android:layout_above="@+id/create_key_buttons"> <LinearLayout android:layout_width="match_parent" @@ -23,40 +22,7 @@ android:layout_marginTop="16dp" android:layout_marginLeft="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/create_key_text" /> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/label_user_id" /> - - <org.sufficientlysecure.keychain.ui.widget.NameEditText - android:id="@+id/create_key_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:imeOptions="actionNext" - android:inputType="textAutoCorrect|textPersonName|textCapWords" - android:hint="@string/create_key_hint_full_name" - android:ems="10" /> - - <org.sufficientlysecure.keychain.ui.widget.EmailEditText - android:id="@+id/create_key_email" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:imeOptions="actionNext" - android:hint="@string/label_email" - android:ems="10" /> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/label_passphrase" /> + android:text="@string/create_key_passphrase_text" /> <org.sufficientlysecure.keychain.ui.widget.PassphraseEditText android:id="@+id/create_key_passphrase" @@ -83,17 +49,6 @@ </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" @@ -101,45 +56,41 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" + android:background="@color/holo_gray_bright" android:id="@+id/create_key_buttons"> <TextView android:id="@+id/create_key_back_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" + android:text="@string/btn_back" + android:textAllCaps="true" 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" /> + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" /> <TextView - android:id="@+id/create_key_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" 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:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_play_arrow_grey_24dp" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" + android:gravity="right|center_vertical" android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:layout_gravity="center_vertical" /> + style="?android:attr/borderlessButtonStyle" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file |