diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 107 insertions, 138 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml index ea064b00c..a2f81f74c 100644 --- a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml @@ -56,11 +56,13 @@ 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="false" + android:clickable="true" style="?android:attr/borderlessButtonStyle" /> <TextView diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml new file mode 100644 index 000000000..79ffe58b1 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml @@ -0,0 +1,104 @@ +<?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:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_above="@+id/create_key_buttons"> + + <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" /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + 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_create_key_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/first_time_create_key" + 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" /> + + <!--<TextView--> + <!--android:id="@+id/create_key_yubikey_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/first_time_yubikey"--> + <!--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" />--> + + <TextView + android:id="@+id/create_key_import_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/first_time_import_key" + 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" /> + + <TextView + android:id="@+id/create_key_cancel" + 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_do_not_save" + android:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_close_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/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml deleted file mode 100644 index 9b37766e9..000000000 --- a/OpenKeychain/src/main/res/layout/first_time_activity.xml +++ /dev/null @@ -1,137 +0,0 @@ -<?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"> - - <ImageView - android:id="@+id/status_bar" - android:layout_width="match_parent" - android:layout_height="@dimen/statusbar_height" /> - - <LinearLayout - android:id="@+id/first_time_buttons" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:layout_alignParentBottom="true" - android:orientation="vertical"> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@+id/first_time_import_key" - 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/first_time_import_key" - android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_folder_grey_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" - android:layout_gravity="center_vertical" - android:clickable="true" - android:background="?android:selectableItemBackground" /> - - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:background="?android:attr/listDivider" /> - - <TextView - android:id="@+id/first_time_create_key" - 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/first_time_create_key" - android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_key_plus_grey600_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" - android:layout_gravity="center_vertical" - android:clickable="true" - android:background="?android:selectableItemBackground" /> - - </LinearLayout> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <TextView - android:id="@+id/first_time_cancel" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/first_time_skip" - android:minHeight="?android:attr/listPreferredItemHeight" - android:gravity="center" - android:clickable="true" - android:background="?android:selectableItemBackground" - android:layout_gravity="center_horizontal" /> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:layout_below="@+id/status_bar" - 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="8dp" - 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> |