Remove line breaking on API 23+ because it breaks words at awkward (#519

) places (like 'ex-ample').
oppia · Dec 5, 2019 · e8597aa · e8597aa
1 parent c781c9b
commit e8597aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/src/main/res/layout/content_item.xml b/app/src/main/res/layout/content_item.xml
@@ -14,8 +14,8 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="20dp"
     android:layout_marginTop="@dimen/divider_margin_top"
-    android:layout_marginBottom="@dimen/divider_margin_bottom"
     android:layout_marginEnd="28dp"
+    android:layout_marginBottom="@dimen/divider_margin_bottom"
     android:background="@drawable/content_blue_background">
 
     <TextView
@@ -26,6 +26,7 @@
       android:layout_marginTop="16dp"
       android:layout_marginEnd="12dp"
       android:layout_marginBottom="16dp"
+      android:breakStrategy="simple"
       android:fontFamily="sans-serif"
       android:text="@{htmlContent}"
       android:textColor="@color/oppiaPrimaryText"

diff --git a/app/src/main/res/layout/feedback_item.xml b/app/src/main/res/layout/feedback_item.xml
@@ -10,24 +10,24 @@
   <FrameLayout
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/content_blue_background"
     android:layout_marginStart="20dp"
-    android:layout_marginEnd="28dp"
     android:layout_marginTop="@dimen/divider_margin_top"
-    android:layout_marginBottom="@dimen/divider_margin_bottom">
+    android:layout_marginEnd="28dp"
+    android:layout_marginBottom="@dimen/divider_margin_bottom"
+    android:background="@drawable/content_blue_background">
 
     <TextView
       android:id="@+id/feedback_text_view"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:breakStrategy="simple"
+      android:fontFamily="sans-serif"
       android:paddingStart="12dp"
       android:paddingTop="16dp"
       android:paddingEnd="12dp"
       android:paddingBottom="16dp"
-      android:fontFamily="sans-serif"
       android:text="@{htmlContent}"
       android:textColor="@color/oppiaPrimaryText"
       android:textSize="16sp" />
   </FrameLayout>
-
 </layout>