diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_activity.xml (renamed from OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml) | 13 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/first_time_activity.xml | 89 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/wizard_activity.xml | 98 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml | 43 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/wizard_start_fragment.xml | 63 |
5 files changed, 102 insertions, 204 deletions
diff --git a/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml index 258ea7223..673f43084 100644 --- a/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml @@ -2,6 +2,7 @@ <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"> <TextView @@ -38,4 +39,16 @@ 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" /> + + </LinearLayout>
\ 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 new file mode 100644 index 000000000..514f34212 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml @@ -0,0 +1,89 @@ +<?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="wrap_content" + 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" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:text="@string/first_time_skip" + android:background="@drawable/button_edgy" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@id/first_time_cancel" + android:orientation="horizontal"> + + <Button + android:id="@+id/first_time_create_key" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_weight="1" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:text="@string/first_time_create_key" + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_new_account" /> + + <Button + android:id="@+id/first_time_import_key" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_horizontal" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:text="@string/first_time_import_key" + android:background="@drawable/button_edgy" + android:drawableLeft="@drawable/ic_action_download" /> + </LinearLayout> + + +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/wizard_activity.xml b/OpenKeychain/src/main/res/layout/wizard_activity.xml deleted file mode 100644 index 299d07a76..000000000 --- a/OpenKeychain/src/main/res/layout/wizard_activity.xml +++ /dev/null @@ -1,98 +0,0 @@ -<?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"> - - <LinearLayout - android:id="@+id/wizard_buttons" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:orientation="horizontal"> - - <Button - android:id="@+id/wizard_back" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:onClick="backOnClick" - android:text="cancel" - style="@style/SelectableItem" /> - - <View - android:layout_width="1dip" - android:layout_height="match_parent" - android:layout_marginBottom="4dip" - android:layout_marginTop="4dip" - android:background="?android:attr/listDivider" /> - - <Button - android:id="@+id/wizard_next" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:onClick="nextOnClick" - android:text="next" - style="@style/SelectableItem" /> - </LinearLayout> - - <View - android:id="@+id/wizard_progress_line" - android:layout_width="match_parent" - android:layout_height="1dip" - android:layout_above="@+id/wizard_buttons" - android:layout_marginLeft="4dip" - android:layout_marginRight="4dip" - android:background="?android:attr/listDivider" - android:visibility="gone" /> - - <LinearLayout - android:id="@+id/wizard_progress" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/wizard_progress_line" - android:visibility="gone"> - - <ProgressBar - android:id="@+id/wizard_progress_progressbar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <ImageView - android:id="@+id/wizard_progress_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/icon_light_refresh" /> - - <TextView - android:id="@+id/wizard_progress_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="asd" - android:textAppearance="?android:attr/textAppearanceMedium" /> - </LinearLayout> - - <View - android:id="@+id/wizard_line2" - android:layout_width="match_parent" - android:layout_height="1dip" - android:layout_above="@+id/wizard_progress" - android:layout_marginLeft="4dip" - android:layout_marginRight="4dip" - android:background="?android:attr/listDivider" /> - - <ScrollView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_above="@+id/wizard_line2"> - - <LinearLayout - android:id="@+id/wizard_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="16dp" /> - </ScrollView> - -</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml deleted file mode 100644 index 342adc37e..000000000 --- a/OpenKeychain/src/main/res/layout/wizard_k9_fragment.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?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:orientation="vertical" > - - <org.sufficientlysecure.htmltextview.HtmlTextView - android:id="@+id/wizard_k9_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingBottom="4dp" - android:text="Text..." - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <RadioGroup - android:id="@+id/wizard_k9_radio_group" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <RadioButton - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:checked="true" - android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/SelectableItem" - android:text="install K9" - android:id="@+id/wizard_k9_install" /> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <RadioButton - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/SelectableItem" - android:text="skip install" - android:id="@+id/wizard_k9_skip" /> - </RadioGroup> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/wizard_start_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_start_fragment.xml deleted file mode 100644 index 9e1403f74..000000000 --- a/OpenKeychain/src/main/res/layout/wizard_start_fragment.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?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:orientation="vertical"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingBottom="4dp" - android:text="Welcome to OpenKeychain" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginTop="14dp" - android:text="What you wanna do today?" - android:layout_weight="1" /> - - <RadioGroup - android:id="@+id/wizard_start_radio_group" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <RadioButton - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:checked="true" - android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/SelectableItem" - android:text="new key" - android:id="@+id/wizard_start_new_key" /> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <RadioButton - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/SelectableItem" - android:text="import existing key" - android:id="@+id/wizard_start_import" /> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <RadioButton - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/SelectableItem" - android:text="skip wizard" - android:id="@+id/wizard_start_skip" /> - </RadioGroup> - -</LinearLayout>
\ No newline at end of file |