diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-27 17:56:52 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-27 17:56:52 +0200 |
commit | dab540e121d622236dd723e31b611624ffb976ef (patch) | |
tree | 0f964fa755ad3ad3602dcb3519dec5dd3c3f53a6 /OpenKeychain/src/main/res/layout | |
parent | 45722d7cfbb2996ff994b3f2143e5871c2e564ba (diff) | |
download | open-keychain-dab540e121d622236dd723e31b611624ffb976ef.tar.gz open-keychain-dab540e121d622236dd723e31b611624ffb976ef.tar.bz2 open-keychain-dab540e121d622236dd723e31b611624ffb976ef.zip |
Work on first time wizard design
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 115 insertions, 84 deletions
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml index bb43fa805..1443ffd46 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml index 673f43084..050aa2b23 100644 --- a/OpenKeychain/src/main/res/layout/create_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml @@ -1,54 +1,82 @@ <?xml version="1.0" encoding="UTF-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="8dp" - android:orientation="vertical"> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="match_parent"> - <TextView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="4dp" - android:text="Enter Full Name, Email and Passphrase!" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> - <AutoCompleteTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPersonName" - android:hint="Name" - android:ems="10" - android:id="@+id/name" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="8dp" + android:text="@string/create_key_text" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <AutoCompleteTextView - android:id="@+id/email" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="bla@example.com" - android:layout_weight="1" - android:ems="10" - android:inputType="textEmailAddress" /> + <AutoCompleteTextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:inputType="textPersonName" + android:hint="@string/label_name" + android:ems="10" + android:id="@+id/name" /> - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" - android:hint="passphrase" - android:ems="10" - android:id="@+id/passphrase" - android:layout_gravity="center_horizontal" /> + <AutoCompleteTextView + android:id="@+id/email" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/label_email" + android:ems="10" + android:inputType="textEmailAddress" /> + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:inputType="textPassword" + android:hint="@string/label_passphrase" + android:ems="10" + android:id="@+id/passphrase" + android:layout_gravity="center_horizontal" /> - <Button - android:id="@+id/create_key_button" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_horizontal" - android:layout_margin="8dp" - android:text="@string/first_time_create_key" - android:background="@drawable/button_edgy" - android:drawableLeft="@drawable/ic_action_new_account" /> + <CheckBox + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:text="@string/create_key_upload" + android:id="@+id/create_key_upload" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/create_key_button" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="@string/first_time_create_key" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_action_new_account" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" /> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> -</LinearLayout>
\ No newline at end of file + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml index 514f34212..37bad7c9b 100644 --- a/OpenKeychain/src/main/res/layout/first_time_activity.xml +++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml @@ -5,44 +5,6 @@ android:paddingTop="16dp" android:paddingBottom="8dp"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/app_name" - android:drawableLeft="@drawable/ic_launcher" - android:drawablePadding="16dp" - android:gravity="center" - android:layout_gravity="center_horizontal" /> - - <ImageView - android:layout_width="wrap_content" - android:layout_marginLeft="64dp" - android:layout_marginRight="64dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:layout_height="256dp" - android:src="@drawable/first_time_1" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="64dp" - android:layout_marginRight="64dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/first_time_text1" - android:layout_gravity="center_horizontal" - android:gravity="center_horizontal" /> - - - </LinearLayout> - <Button android:id="@+id/first_time_cancel" android:layout_alignParentBottom="true" @@ -55,6 +17,7 @@ android:background="@drawable/button_edgy" /> <LinearLayout + android:id="@+id/first_time_buttons" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_above="@id/first_time_cancel" @@ -67,7 +30,7 @@ android:layout_gravity="center_horizontal" android:layout_weight="1" android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_marginRight="4dp" android:text="@string/first_time_create_key" android:background="@drawable/button_edgy" android:drawableLeft="@drawable/ic_action_new_account" /> @@ -78,12 +41,53 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_gravity="center_horizontal" - android:layout_marginLeft="8dp" + android:layout_marginLeft="4dp" android:layout_marginRight="8dp" android:text="@string/first_time_import_key" android:background="@drawable/button_edgy" android:drawableLeft="@drawable/ic_action_download" /> </LinearLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_above="@+id/first_time_buttons"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="@string/app_name" + android:drawableLeft="@drawable/ic_launcher" + android:drawablePadding="16dp" + android:gravity="center" + android:layout_gravity="center_horizontal" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:adjustViewBounds="true" + android:src="@drawable/first_time_1" + android:layout_gravity="center_horizontal" + android:layout_weight="1" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="64dp" + android:layout_marginRight="64dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/first_time_text1" + android:layout_gravity="center_horizontal" + android:gravity="center_horizontal" + android:layout_marginBottom="16dp" /> + + </LinearLayout> + </RelativeLayout> |