Skip to content

Commit 673f988

Browse files
AsCressAsCress
authored
fix: updated multimeter screen layout to make it visible properly (#2407)
1 parent be2a53e commit 673f988

File tree

6 files changed

+18
-43
lines changed

6 files changed

+18
-43
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
android:layout_width="match_parent"
8888
android:layout_height="@dimen/dimen_zero_dp"
8989
android:layout_marginBottom="@dimen/multimeter_constraint_1"
90-
app:layout_constraintBottom_toTopOf="@+id/bottom_view"
90+
app:layout_constraintBottom_toBottomOf="parent"
9191
app:layout_constraintEnd_toEndOf="parent"
9292
app:layout_constraintStart_toStartOf="parent"
9393
app:layout_constraintTop_toBottomOf="@+id/display_box">
@@ -428,13 +428,6 @@
428428

429429
</androidx.constraintlayout.widget.ConstraintLayout>
430430

431-
<View
432-
android:id="@+id/bottom_view"
433-
android:layout_width="@dimen/dimen_zero_dp"
434-
android:layout_height="@dimen/dimen_zero_dp"
435-
app:layout_constraintBottom_toBottomOf="parent"
436-
app:layout_constraintStart_toStartOf="parent" />
437-
438431
</androidx.constraintlayout.widget.ConstraintLayout>
439432

440433
</androidx.constraintlayout.widget.ConstraintLayout>

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

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
android:layout_width="match_parent"
8989
android:layout_height="@dimen/dimen_zero_dp"
9090
android:layout_marginTop="@dimen/multimeter_view_top_margin"
91-
android:layout_marginBottom="@dimen/multimeter_constraint_1"
92-
app:layout_constraintBottom_toTopOf="@+id/bottom_view"
91+
android:layout_marginBottom="@dimen/multimeter_constraint_2"
92+
app:layout_constraintBottom_toBottomOf="parent"
9393
app:layout_constraintEnd_toEndOf="parent"
9494
app:layout_constraintStart_toStartOf="parent"
9595
app:layout_constraintTop_toBottomOf="@+id/display_box">
@@ -137,7 +137,7 @@
137137
android:id="@+id/upper_line"
138138
android:layout_width="match_parent"
139139
android:layout_height="@dimen/multimeter_line_width"
140-
android:layout_marginTop="@dimen/multimeter_constraint_2"
140+
android:layout_marginTop="@dimen/multimeter_constraint_5"
141141
android:background="@color/black"
142142
android:visibility="invisible"
143143
app:layout_constraintTop_toBottomOf="@+id/ch3" />
@@ -147,10 +147,8 @@
147147
android:layout_width="match_parent"
148148
android:layout_height="@dimen/multimeter_line_width"
149149
android:layout_marginStart="@dimen/multimeter_constraint_1"
150-
android:layout_marginLeft="@dimen/multimeter_constraint_1"
151150
android:layout_marginEnd="@dimen/multimeter_constraint_1"
152-
android:layout_marginRight="@dimen/multimeter_constraint_1"
153-
android:layout_marginBottom="@dimen/multimeter_constraint_3"
151+
android:layout_marginBottom="@dimen/multimeter_constraint_5"
154152
android:visibility="invisible"
155153
app:layout_constraintBottom_toTopOf="@+id/id4"
156154
app:layout_constraintEnd_toEndOf="parent"
@@ -431,8 +429,8 @@
431429

432430
<TextView
433431
android:id="@+id/id1"
434-
android:layout_width="12dp"
435-
android:layout_height="14dp"
432+
android:layout_width="wrap_content"
433+
android:layout_height="wrap_content"
436434
android:layout_gravity="center"
437435
android:gravity="center"
438436
android:scaleX="1.5"
@@ -468,13 +466,6 @@
468466

469467
</androidx.constraintlayout.widget.ConstraintLayout>
470468

471-
<View
472-
android:id="@+id/bottom_view"
473-
android:layout_width="@dimen/dimen_zero_dp"
474-
android:layout_height="@dimen/dimen_zero_dp"
475-
app:layout_constraintBottom_toBottomOf="parent"
476-
app:layout_constraintStart_toStartOf="parent" />
477-
478469
</androidx.constraintlayout.widget.ConstraintLayout>
479470

480471
</androidx.constraintlayout.widget.ConstraintLayout>

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
android:layout_height="@dimen/dimen_zero_dp"
8989
android:layout_marginTop="@dimen/multimeter_view_top_margin"
9090
android:layout_marginBottom="@dimen/multimeter_constraint_1"
91-
app:layout_constraintBottom_toTopOf="@+id/bottom_view"
91+
app:layout_constraintBottom_toBottomOf="parent"
9292
app:layout_constraintEnd_toEndOf="parent"
9393
app:layout_constraintStart_toStartOf="parent"
9494
app:layout_constraintTop_toBottomOf="@+id/display_box">
@@ -434,13 +434,6 @@
434434

435435
</androidx.constraintlayout.widget.ConstraintLayout>
436436

437-
<View
438-
android:id="@+id/bottom_view"
439-
android:layout_width="@dimen/dimen_zero_dp"
440-
android:layout_height="@dimen/dimen_zero_dp"
441-
app:layout_constraintBottom_toBottomOf="parent"
442-
app:layout_constraintStart_toStartOf="parent" />
443-
444437
</androidx.constraintlayout.widget.ConstraintLayout>
445438

446439
</androidx.constraintlayout.widget.ConstraintLayout>

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
45
android:layout_width="match_parent"
56
android:layout_height="match_parent"
67
android:fitsSystemWindows="true">
@@ -9,7 +10,9 @@
910
android:id="@+id/top_app_bar_layout"
1011
android:layout_width="match_parent"
1112
android:layout_height="wrap_content"
12-
android:theme="@style/AppTheme.AppBarOverlay">
13+
android:theme="@style/AppTheme.AppBarOverlay"
14+
app:layout_constraintStart_toStartOf="parent"
15+
app:layout_constraintTop_toTopOf="parent">
1316

1417
<androidx.appcompat.widget.Toolbar
1518
android:id="@+id/multimeter_toolbar"
@@ -87,7 +90,7 @@
8790
android:layout_height="@dimen/dimen_zero_dp"
8891
android:layout_marginTop="@dimen/multimeter_view_top_margin"
8992
android:layout_marginBottom="@dimen/multimeter_constraint_1"
90-
app:layout_constraintBottom_toTopOf="@+id/bottom_view"
93+
app:layout_constraintBottom_toBottomOf="parent"
9194
app:layout_constraintEnd_toEndOf="parent"
9295
app:layout_constraintStart_toStartOf="parent"
9396
app:layout_constraintTop_toBottomOf="@+id/display_box">
@@ -429,12 +432,6 @@
429432

430433
</androidx.constraintlayout.widget.ConstraintLayout>
431434

432-
<View
433-
android:id="@+id/bottom_view"
434-
android:layout_width="@dimen/dimen_zero_dp"
435-
android:layout_height="@dimen/dimen_zero_dp"
436-
app:layout_constraintBottom_toBottomOf="parent"
437-
app:layout_constraintStart_toStartOf="parent" />
438435

439436
</androidx.constraintlayout.widget.ConstraintLayout>
440437

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<dimen name="multimeter_knob_width">170dp</dimen>
99
<dimen name="multimeter_knob_height">168dp</dimen>
10-
<dimen name="multimeter_knobcircle_radius_1">97dp</dimen>
11-
<dimen name="multimeter_knobcircle_radius_2">93dp</dimen>
12-
<dimen name="multimeter_knobcircle_radius_3">99dp</dimen>
10+
<dimen name="multimeter_knobcircle_radius_1">101dp</dimen>
11+
<dimen name="multimeter_knobcircle_radius_2">97dp</dimen>
12+
<dimen name="multimeter_knobcircle_radius_3">103dp</dimen>
1313

1414
</resources>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@
133133
<dimen name="multimeter_end_box_rightmargin">12dp</dimen>
134134
<dimen name="multimeter_layout_margin_2">10dp</dimen>
135135
<dimen name="multimeter_layout_margin_1">5dp</dimen>
136-
<dimen name="multimeter_constraint_4">15dp</dimen>
136+
<dimen name="multimeter_constraint_4">10dp</dimen>
137+
<dimen name="multimeter_constraint_5">37dp</dimen>
137138
<dimen name="multimeter_length_0">0dp</dimen>
138139
<dimen name="multimeter_knob_width_xhdpi">192dp</dimen>
139140
<dimen name="multimeter_knob_height_xhdpi">190dp</dimen>

0 commit comments

Comments
 (0)