From 534269c8fc8fbd9a72e64389564fb0c90365c0c0 Mon Sep 17 00:00:00 2001 From: Aditya Wasan Date: Fri, 8 Jan 2021 03:38:45 +0530 Subject: Fix auth modes not displaying properly (#1271) * res: fix auth modes not displaying properly Signed-off-by: Aditya Wasan * res: wrap onboarding flow screens inside ScrollView Signed-off-by: Aditya Wasan --- app/src/main/res/layout/activity_git_clone.xml | 30 +++- app/src/main/res/layout/fragment_clone.xml | 160 +++++++++++---------- app/src/main/res/layout/fragment_key_selection.xml | 16 ++- app/src/main/res/layout/fragment_repo_location.xml | 160 +++++++++++---------- 4 files changed, 200 insertions(+), 166 deletions(-) (limited to 'app/src/main/res/layout') diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index 04b8338c..890cc19b 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -33,7 +33,8 @@ android:id="@+id/label_server_url" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" android:hint="@string/server_url" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -53,7 +54,8 @@ android:id="@+id/label_server_branch" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" android:hint="@string/server_branch" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -83,9 +85,11 @@ @@ -95,21 +99,33 @@ style="?attr/materialButtonOutlinedStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/connection_mode_ssh_key" /> + android:layout_weight="1" + android:minWidth="0dp" + android:padding="8dp" + android:text="@string/connection_mode_ssh_key" + android:textSize="@dimen/toggle_group_text_size" /> + android:layout_weight="1" + android:minWidth="0dp" + android:padding="8dp" + android:text="@string/connection_mode_basic_authentication" + android:textSize="@dimen/toggle_group_text_size" /> + android:layout_weight="1" + android:minWidth="0dp" + android:padding="8dp" + android:text="@string/connection_mode_openkeychain" + android:textSize="@dimen/toggle_group_text_size" /> + android:background="?attr/colorPrimary"> - + - + - + - + - + - + - + + + + diff --git a/app/src/main/res/layout/fragment_key_selection.xml b/app/src/main/res/layout/fragment_key_selection.xml index 9a391276..f3dd753a 100644 --- a/app/src/main/res/layout/fragment_key_selection.xml +++ b/app/src/main/res/layout/fragment_key_selection.xml @@ -15,7 +15,7 @@ android:layout_width="64dp" android:layout_height="64dp" android:layout_marginStart="32dp" - android:layout_marginTop="100dp" + android:layout_marginTop="@dimen/onboarding_icon_margin_top" android:contentDescription="@string/app_icon_hint" android:src="@mipmap/ic_launcher" app:layout_constraintStart_toStartOf="parent" @@ -23,23 +23,26 @@ diff --git a/app/src/main/res/layout/fragment_repo_location.xml b/app/src/main/res/layout/fragment_repo_location.xml index 9581774e..268907ba 100644 --- a/app/src/main/res/layout/fragment_repo_location.xml +++ b/app/src/main/res/layout/fragment_repo_location.xml @@ -1,86 +1,94 @@ - + android:background="?attr/colorPrimary"> - + - + - + - + - + - + + + + + + - -- cgit v1.2.3