Merge pull request #121 from ryanwarsaw/master

Fix scaling TextView bug on Android API 27 and below
theirc · Sep 9, 2018 · 810240b · 810240b
2 parents d857229 + 881419e
commit 810240b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:support-v4:26.1.0'
     implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.google.code.gson:gson:2.8.2'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.7.3'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.7.3'

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -16,7 +16,8 @@
     app:layout_constraintBottom_toTopOf="@+id/guideline_image_bottom"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="@id/guideline_header" />
+    app:layout_constraintTop_toTopOf="@id/guideline_header"
+    android:contentDescription="@string/logo_description" />
 
   <ListView
     android:id="@+id/menu_options"

diff --git a/app/src/main/res/layout/fragment_quiz_free_text.xml b/app/src/main/res/layout/fragment_quiz_free_text.xml
@@ -12,14 +12,13 @@
     android:orientation="horizontal"
     app:layout_constraintGuide_percent="0.05" />
 
-  <!-- TODO: Add the AppCompatTextView widget here so stuff doesn't break on older devices -->
-  <TextView
+  <android.support.v7.widget.AppCompatTextView
     android:id="@+id/question"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    android:autoSizeMaxTextSize="36sp"
-    android:autoSizeMinTextSize="16sp"
-    android:autoSizeTextType="uniform"
+    app:autoSizeMaxTextSize="36sp"
+    app:autoSizeMinTextSize="16sp"
+    app:autoSizeTextType="uniform"
     android:gravity="center"
     android:textColor="@color/questionText"
     app:layout_constraintBottom_toBottomOf="@id/guideline_question_footer"
@@ -41,13 +40,13 @@
     android:orientation="horizontal"
     app:layout_constraintGuide_percent="0.45" />
 
-  <TextView
+  <android.support.v7.widget.AppCompatTextView
     android:id="@+id/hint"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    android:autoSizeMaxTextSize="18sp"
-    android:autoSizeMinTextSize="8sp"
-    android:autoSizeTextType="uniform"
+    app:autoSizeMaxTextSize="18sp"
+    app:autoSizeMinTextSize="8sp"
+    app:autoSizeTextType="uniform"
     android:text="@string/free_text_hint"
     android:ellipsize="end"
     android:gravity="center"

diff --git a/app/src/main/res/layout/fragment_quiz_multi_choice.xml b/app/src/main/res/layout/fragment_quiz_multi_choice.xml
@@ -12,14 +12,13 @@
     android:orientation="horizontal"
     app:layout_constraintGuide_percent="0.05" />
 
-  <!-- Add the AppCompatTextView widget here so stuff doesn't break on older devices -->
-  <TextView
+  <android.support.v7.widget.AppCompatTextView
     android:id="@+id/question"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    android:autoSizeMaxTextSize="36sp"
-    android:autoSizeMinTextSize="16sp"
-    android:autoSizeTextType="uniform"
+    app:autoSizeMaxTextSize="36sp"
+    app:autoSizeMinTextSize="16sp"
+    app:autoSizeTextType="uniform"
     android:gravity="center"
     android:textColor="@color/questionText"
     app:layout_constraintBottom_toBottomOf="@id/guideline_question_footer"
@@ -32,22 +31,22 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    app:layout_constraintGuide_percent="0.40" />
+    app:layout_constraintGuide_percent="0.3" />
 
   <android.support.constraint.Guideline
     android:id="@+id/guideline_hint_header"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    app:layout_constraintGuide_percent="0.45" />
+    app:layout_constraintGuide_percent="0.35" />
 
-  <TextView
+  <android.support.v7.widget.AppCompatTextView
     android:id="@+id/hint"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    android:autoSizeMaxTextSize="18sp"
-    android:autoSizeMinTextSize="8sp"
-    android:autoSizeTextType="uniform"
+    app:autoSizeMaxTextSize="18sp"
+    app:autoSizeMinTextSize="8sp"
+    app:autoSizeTextType="uniform"
     android:text="@string/multiple_choice_hint"
     android:ellipsize="end"
     android:gravity="center"
@@ -62,14 +61,14 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    app:layout_constraintGuide_percent="0.50" />
+    app:layout_constraintGuide_percent="0.4" />
 
   <android.support.constraint.Guideline
     android:id="@+id/guideline_select_option_header"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    app:layout_constraintGuide_percent="0.55" />
+    app:layout_constraintGuide_percent="0.45" />
 
   <ListView
     android:id="@+id/answer_options"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,4 +12,5 @@
   <string name="quiz_end_title">Uguherahezwa kw\'akabazo</string>
   <string name="multiple_choice_hint">Hitamwo kimwe:</string>
   <string name="question_header">%1$s : Ikibazo ca (%2$d muri %3$d)</string>
+  <string name="logo_description">Coach Erevu logo</string>
 </resources>