diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout/first_time_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/first_time_activity.xml | 84 |
1 files changed, 44 insertions, 40 deletions
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> |