Make the description text scrollable
The description text does not have enough space in some non-English
languages with the default font size. To avoid truncated text in those
cases, or in the event of bigger font size, make the text view
scrollable.
Change-Id: I78efcbaf5ab2e502de0abc25339f1e6295a1dbe1
diff --git a/app/src/main/res/layout/details_fragment.xml b/app/src/main/res/layout/details_fragment.xml
index 5f9351d..1c80a28 100644
--- a/app/src/main/res/layout/details_fragment.xml
+++ b/app/src/main/res/layout/details_fragment.xml
@@ -22,30 +22,6 @@
android:layout_alignParentBottom="true"
android:text="@string/camera_swap_got_it" />
- <TextView
- android:id="@+id/part1"
- style="@style/TextBold16BlueDark"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_marginStart="5dp"
- android:layout_marginEnd="5dp"
- android:lineSpacingExtra="4sp"
- android:text="@string/camera_swap_text_part1_both" />
-
- <TextView
- android:id="@+id/instructions"
- style="@style/TextRegular14BlueDark"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="5dp"
- android:layout_marginEnd="5dp"
- android:layout_marginTop="@dimen/main_small_text_below_heading_margin"
- android:layout_below="@id/part1"
- android:lineSpacingExtra="4sp"
- android:text="@string/camera_swap_long_text"
- android:autoLink="web" />
-
<Button
android:id="@+id/button_remind_later"
style="@style/ButtonWhiteGrey"
@@ -55,6 +31,41 @@
android:layout_above="@+id/button_got_it"
android:layout_marginBottom="@dimen/main_margin_small" />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@+id/button_remind_later"
+ android:paddingStart="@dimen/main_small_text_margin_start"
+ android:paddingEnd="@dimen/main_small_text_margin_end"
+ android:layout_marginBottom="@dimen/main_small_text_below_heading_margin">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/part1"
+ style="@style/TextBold16BlueDark"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lineSpacingExtra="4sp"
+ android:text="@string/camera_swap_text_part1_both" />
+
+ <TextView
+ android:id="@+id/instructions"
+ style="@style/TextRegular14BlueDark"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/main_small_text_below_heading_margin"
+ android:lineSpacingExtra="4sp"
+ android:text="@string/camera_swap_long_text"
+ android:autoLink="web" />
+
+ </LinearLayout>
+
+ </ScrollView>
+
</RelativeLayout>
</LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a5293df..b45b363 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,5 +16,7 @@
<dimen name="main_padding_small">20dp</dimen>
<dimen name="main_small_text_margin_top">43dp</dimen>
<dimen name="main_small_text_below_heading_margin">20dp</dimen>
+ <dimen name="main_small_text_margin_start">5dp</dimen>
+ <dimen name="main_small_text_margin_end">5dp</dimen>
<dimen name="main_button_margin_top">8dp</dimen>
</resources>