Merge pull request #11 from KidsPOSProject/fix-calsulator-textsize

会計画面の「ごうけい」と「おあずかり」のテキストサイズの変更
KidsPOSProject · Feb 9, 2019 · bd591c8 · bd591c8
2 parents 1fccb05 + ef32fa6
commit bd591c8
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/app/src/main/res/layout/fragment_calculator_dialog.xml b/app/src/main/res/layout/fragment_calculator_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -56,6 +57,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="0.3"
                         android:autoSizeTextType="uniform"
+                        app:autoSizeTextType="uniform"
                         android:gravity="center"
                         android:labelFor="@+id/sum_river"
                         android:maxLines="1"
@@ -67,6 +69,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="0.7"
                         android:autoSizeTextType="uniform"
+                        app:autoSizeTextType="uniform"
                         android:clickable="false"
                         android:focusable="false"
                         android:focusableInTouchMode="false"
@@ -88,6 +91,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="0.3"
                         android:autoSizeTextType="uniform"
+                        app:autoSizeTextType="uniform"
                         android:gravity="center"
                         android:labelFor="@+id/receive_river"
                         android:maxLines="1"
@@ -99,6 +103,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="0.7"
                         android:autoSizeTextType="uniform"
+                        app:autoSizeTextType="uniform"
                         android:clickable="false"
                         android:gravity="center_vertical|end"
                         android:maxLines="1"
@@ -120,6 +125,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_weight="0.5"
                     android:autoSizeTextType="uniform"
+                    app:autoSizeTextType="uniform"
                     android:maxLines="1"
                     android:onClick="@{viewModel::onCancelClick}"
                     android:paddingTop="16dp"
@@ -134,6 +140,7 @@
                     android:layout_gravity="end|bottom"
                     android:layout_weight="0.5"
                     android:autoSizeTextType="uniform"
+                    app:autoSizeTextType="uniform"
                     android:maxLines="1"
                     android:onClick="@{viewModel::onDoneClick}"
                     android:paddingTop="16dp"