Android fix android step quiz horizontal margin (#736)

^ALTAPPS-1029
hyperskill · Nov 6, 2023 · a6090dc · a6090dc
1 parent eb72603
commit a6090dc
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/androidHyperskillApp/src/main/res/layout/layout_fill_blanks_skeleton.xml b/androidHyperskillApp/src/main/res/layout/layout_fill_blanks_skeleton.xml
@@ -1,9 +1,9 @@
 <?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="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <include layout="@layout/view_divider_vertical" />

diff --git a/androidHyperskillApp/src/main/res/layout/layout_step_quiz_fill_blanks_binding.xml b/androidHyperskillApp/src/main/res/layout/layout_step_quiz_fill_blanks_binding.xml
@@ -3,18 +3,19 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/step_quiz_content_padding_top"
     android:layout_marginBottom="@dimen/step_quiz_content_padding_bottom"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/stepQuizHints"
-    app:layout_constraintBottom_toTopOf="@id/stepQuizStatistics">
+    app:layout_constraintBottom_toTopOf="@id/stepQuizStatistics"
+    app:layout_constraintVertical_bias="0">
 
     <LinearLayout
         android:id="@+id/stepQuizFillBlanksContainer"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <include layout="@layout/view_divider_vertical" />

diff --git a/androidHyperskillApp/src/main/res/layout/layout_step_quiz_parsons.xml b/androidHyperskillApp/src/main/res/layout/layout_step_quiz_parsons.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:layout_marginHorizontal="@dimen/step_quiz_content_padding_horizontal"
     android:layout_marginTop="@dimen/step_quiz_content_padding_top"
     android:layout_marginBottom="@dimen/step_quiz_content_padding_bottom"
     app:layout_constraintBottom_toTopOf="@id/stepQuizStatistics"

diff --git a/androidHyperskillApp/src/main/res/layout/layout_step_quiz_sorting.xml b/androidHyperskillApp/src/main/res/layout/layout_step_quiz_sorting.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:layout_marginHorizontal="@dimen/step_quiz_content_padding_horizontal"
     android:layout_marginTop="@dimen/step_quiz_content_padding_top"
     android:layout_marginBottom="@dimen/step_quiz_content_padding_bottom"
     app:layout_constraintVertical_bias="0"

diff --git a/androidHyperskillApp/src/main/res/layout/layout_step_quiz_text.xml b/androidHyperskillApp/src/main/res/layout/layout_step_quiz_text.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:layout_marginHorizontal="@dimen/step_quiz_content_padding_horizontal"
     android:layout_marginTop="@dimen/step_quiz_content_padding_top"
     android:layout_marginBottom="@dimen/step_quiz_content_padding_bottom"
     app:layout_constraintBottom_toTopOf="@id/stepQuizStatistics"

diff --git a/androidHyperskillApp/src/main/res/values/dimens.xml b/androidHyperskillApp/src/main/res/values/dimens.xml
@@ -57,6 +57,7 @@
     <dimen name="item_choice_skeleton_height">21dp</dimen>
     <dimen name="step_quiz_content_padding_top">12dp</dimen>
     <dimen name="step_quiz_content_padding_bottom">20dp</dimen>
+    <dimen name="step_quiz_content_padding_horizontal">20dp</dimen>
     <dimen name="step_quiz_collapsible_block_header_height">48dp</dimen>
     <dimen name="step_quiz_description_padding_top">16dp</dimen>
     <dimen name="step_quiz_hints_top_margin">20dp</dimen>