fix: updated multimeter screen layout to make it visible properly (#2407)

Author: AsCress

app/src/main/res/layout-hdpi/activity_multimeter.xml

@@ -87,7 +87,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dimen_zero_dp"
             android:layout_marginBottom="@dimen/multimeter_constraint_1"
-            app:layout_constraintBottom_toTopOf="@+id/bottom_view"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/display_box">
@@ -428,13 +428,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <View
-            android:id="@+id/bottom_view"
-            android:layout_width="@dimen/dimen_zero_dp"
-            android:layout_height="@dimen/dimen_zero_dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw600dp/activity_multimeter.xml

@@ -88,8 +88,8 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dimen_zero_dp"
             android:layout_marginTop="@dimen/multimeter_view_top_margin"
-            android:layout_marginBottom="@dimen/multimeter_constraint_1"
-            app:layout_constraintBottom_toTopOf="@+id/bottom_view"
+            android:layout_marginBottom="@dimen/multimeter_constraint_2"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/display_box">
@@ -137,7 +137,7 @@
                 android:id="@+id/upper_line"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/multimeter_line_width"
-                android:layout_marginTop="@dimen/multimeter_constraint_2"
+                android:layout_marginTop="@dimen/multimeter_constraint_5"
                 android:background="@color/black"
                 android:visibility="invisible"
                 app:layout_constraintTop_toBottomOf="@+id/ch3" />
@@ -147,10 +147,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/multimeter_line_width"
                 android:layout_marginStart="@dimen/multimeter_constraint_1"
-                android:layout_marginLeft="@dimen/multimeter_constraint_1"
                 android:layout_marginEnd="@dimen/multimeter_constraint_1"
-                android:layout_marginRight="@dimen/multimeter_constraint_1"
-                android:layout_marginBottom="@dimen/multimeter_constraint_3"
+                android:layout_marginBottom="@dimen/multimeter_constraint_5"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toTopOf="@+id/id4"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -431,8 +429,8 @@
 
             <TextView
                 android:id="@+id/id1"
-                android:layout_width="12dp"
-                android:layout_height="14dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:scaleX="1.5"
@@ -468,13 +466,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <View
-            android:id="@+id/bottom_view"
-            android:layout_width="@dimen/dimen_zero_dp"
-            android:layout_height="@dimen/dimen_zero_dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-xhdpi/activity_multimeter.xml

@@ -88,7 +88,7 @@
             android:layout_height="@dimen/dimen_zero_dp"
             android:layout_marginTop="@dimen/multimeter_view_top_margin"
             android:layout_marginBottom="@dimen/multimeter_constraint_1"
-            app:layout_constraintBottom_toTopOf="@+id/bottom_view"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/display_box">
@@ -434,13 +434,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <View
-            android:id="@+id/bottom_view"
-            android:layout_width="@dimen/dimen_zero_dp"
-            android:layout_height="@dimen/dimen_zero_dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_multimeter.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
@@ -9,7 +10,9 @@
         android:id="@+id/top_app_bar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/multimeter_toolbar"
@@ -87,7 +90,7 @@
             android:layout_height="@dimen/dimen_zero_dp"
             android:layout_marginTop="@dimen/multimeter_view_top_margin"
             android:layout_marginBottom="@dimen/multimeter_constraint_1"
-            app:layout_constraintBottom_toTopOf="@+id/bottom_view"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/display_box">
@@ -429,12 +432,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <View
-            android:id="@+id/bottom_view"
-            android:layout_width="@dimen/dimen_zero_dp"
-            android:layout_height="@dimen/dimen_zero_dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/values-hdpi/dimens.xml

@@ -7,8 +7,8 @@
 
     <dimen name="multimeter_knob_width">170dp</dimen>
     <dimen name="multimeter_knob_height">168dp</dimen>
-    <dimen name="multimeter_knobcircle_radius_1">97dp</dimen>
-    <dimen name="multimeter_knobcircle_radius_2">93dp</dimen>
-    <dimen name="multimeter_knobcircle_radius_3">99dp</dimen>
+    <dimen name="multimeter_knobcircle_radius_1">101dp</dimen>
+    <dimen name="multimeter_knobcircle_radius_2">97dp</dimen>
+    <dimen name="multimeter_knobcircle_radius_3">103dp</dimen>
 
 </resources>

app/src/main/res/values/dimens.xml

@@ -133,7 +133,8 @@
     <dimen name="multimeter_end_box_rightmargin">12dp</dimen>
     <dimen name="multimeter_layout_margin_2">10dp</dimen>
     <dimen name="multimeter_layout_margin_1">5dp</dimen>
-    <dimen name="multimeter_constraint_4">15dp</dimen>
+    <dimen name="multimeter_constraint_4">10dp</dimen>
+    <dimen name="multimeter_constraint_5">37dp</dimen>
     <dimen name="multimeter_length_0">0dp</dimen>
     <dimen name="multimeter_knob_width_xhdpi">192dp</dimen>
     <dimen name="multimeter_knob_height_xhdpi">190dp</dimen>