Fixed #69 - even more layout optimization

AhiruSoftwareCompany · Oct 11, 2020 · 45b38c2 · 45b38c2
1 parent 3725e6a
commit 45b38c2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/app/src/main/res/layout/items_depleted_drink.xml b/app/src/main/res/layout/items_depleted_drink.xml
@@ -24,11 +24,15 @@
 
             <TextView
                 android:id="@+id/name"
-                android:layout_width="wrap_content"
+                android:layout_width="170sp"
                 android:layout_height="wrap_content"
                 android:alpha="0.5"
                 android:text="@string/no_information"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+
+                app:autoSizeMinTextSize="10sp"
+
+                app:autoSizeTextType="uniform" />
         </TableRow>
 
         <TableRow
@@ -47,7 +51,7 @@
 
             <View
                 android:id="@+id/view"
-                android:layout_width="25dp"
+                android:layout_width="20dp"
                 android:layout_height="0dp" />
 
             <TextView

diff --git a/app/src/main/res/layout/items_drink.xml b/app/src/main/res/layout/items_drink.xml
@@ -24,10 +24,15 @@
 
             <TextView
                 android:id="@+id/name"
-                android:layout_width="wrap_content"
+                android:layout_width="200sp"
                 android:layout_height="wrap_content"
                 android:text="@string/no_information"
-                android:textSize="18sp" />
+                android:gravity="center"
+
+                android:textSize="18sp"
+                app:autoSizeMinTextSize="10sp"
+
+                app:autoSizeTextType="uniform" />
         </TableRow>
 
         <TableRow
@@ -36,17 +41,16 @@
             android:gravity="center">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="160dp"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp">
+                android:paddingStart="0dp"
+                android:paddingEnd="10dp">
 
                 <TextView
                     android:id="@+id/alcoholLevel"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:gravity="center"
                     android:text="@string/bacNoChar"
                     android:textAlignment="center"
@@ -56,7 +60,6 @@
                     android:id="@+id/bac"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:gravity="center"
                     android:text="@string/no_information"
                     android:textAlignment="center"
@@ -67,8 +70,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp">
+                android:paddingStart="0dp"
+                android:paddingEnd="15dp">
 
                 <TextView
                     android:id="@+id/elap"
@@ -94,8 +97,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp">
+                android:paddingStart="15dp"
+                android:paddingEnd="15sp">
 
                 <TextView
                     android:id="@+id/left"

diff --git a/app/version.properties b/app/version.properties
@@ -1,2 +1,2 @@
-#Sun Oct 11 19:02:11 CEST 2020
-VERSION_BUILD=1311
+#Sun Oct 11 19:17:59 CEST 2020
+VERSION_BUILD=1329