Fixed UI

brodeurlv · Feb 13, 2022 · 05d0f82 · 05d0f82
1 parent 3301817
commit 05d0f82
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/app/src/main/res/layout/tab_weight.xml b/app/src/main/res/layout/tab_weight.xml
@@ -290,8 +290,8 @@
                     <TableLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:shrinkColumns="3"
-                        android:stretchColumns="0,1,2">
+                        android:shrinkColumns="2"
+                        android:stretchColumns="0,1,3">
 
                         <TableRow
                             android:layout_width="match_parent"
@@ -319,7 +319,7 @@
                             <TextView
                                 android:id="@+id/imcValue"
                                 style="@style/WeightIndexStyle"
-                                android:gravity="right"
+                                android:gravity="center"
                                 tools:text="20" />
 
                             <TextView
@@ -329,6 +329,7 @@
                                 android:ellipsize="end"
                                 android:gravity="center"
                                 android:textSize="20sp"
+                                android:singleLine="true"
                                 android:textStyle="italic"
                                 tools:text="@string/no_size_available" />
 
@@ -351,18 +352,19 @@
                             <TextView
                                 android:id="@+id/ffmiValue"
                                 style="@style/WeightIndexStyle"
-                                android:gravity="right"
+                                android:gravity="center"
                                 tools:text="20" />
 
                             <TextView
                                 android:id="@+id/ffmiViewText"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:gravity="center"
                                 android:ellipsize="end"
+                                android:singleLine="true"
+                                android:gravity="center"
                                 android:textSize="20sp"
                                 android:textStyle="italic"
-                                tools:text="normal" />
+                                tools:text="@string/no_fat_available" />
 
                             <ImageButton
                                 android:id="@+id/ffmiHelp"
@@ -384,17 +386,18 @@
                             <TextView
                                 android:id="@+id/bmrValue"
                                 style="@style/WeightIndexStyle"
-                                android:gravity="right"
-                                tools:text="20" />
+                                android:gravity="center"
+                                tools:text="1864" />
 
                             <TextView
                                 android:id="@+id/bmrViewText"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:gravity="center"
                                 android:ellipsize="end"
+                                android:gravity="center"
                                 android:textSize="20sp"
                                 android:textStyle="italic"
+                                android:singleLine="true"
                                 tools:text="normal" />
 
                             <ImageButton
@@ -417,16 +420,16 @@
                             <TextView
                                 android:id="@+id/dailyCalorieValue"
                                 style="@style/WeightIndexStyle"
-                                android:gravity="right"
-                                tools:text="20" />
+                                android:gravity="center"
+                                tools:text="2731" />
 
                             <Spinner
                                 android:id="@+id/activityLevelSpinner"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="center_horizontal"
                                 android:ellipsize="end"
-                                />
+                                android:singleLine="true"
+                                android:gravity="center_horizontal" />
 
                             <ImageButton
                                 android:id="@+id/dailyCalorieHelp"

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -176,7 +176,7 @@
     <string name="overweight">surpoids</string>
     <string name="obese">obèse</string>
     <string name="enter_gender_here">Choisis ton genre</string>
-    <string name="no_size_available">aucune taille disponible</string>
+    <string name="no_size_available">taille non disponible</string>
     <string name="no_weight_available">poids non disponible</string>
     <string name="BMI_dialog_title">Indice de Masse Corporel (IMC)</string>
     <string name="BMI_formula">IMC = poids(kg) / taille(m)*taille(m)</string>
@@ -188,7 +188,7 @@
     <string name="new_folder">Nouveau dossier</string>
     <string name="ffmiLabel">FFMI</string>
     <string name="FFMI_dialog_title">Indice de masse sans graisse (FFMI)</string>
-    <string name="no_fat_available">graisse [%] non disponible</string>
+    <string name="no_fat_available">graisse non disponible</string>
     <string name="indexLabel">Index</string>
     <string name="SecondsLabel_short">Sec.</string>
     <string name="exercise_type">Type d\'exercice :</string>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -71,9 +71,9 @@
     </style>
 
     <style name="InfoButton">
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_width">25sp</item>
         <item name="android:layout_height">25sp</item>
-        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_gravity">right</item>
         <item name="android:adjustViewBounds">false</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:cropToPadding">false</item>