Skip to content

Commit f601c87

Browse files
Aayush1357Aayush1357
committed
Multimeter Incomplete screen resolved and Hardcoded value removed
1 parent 6cdcc24 commit f601c87

File tree

6 files changed

+126
-91
lines changed

6 files changed

+126
-91
lines changed

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

+25-21
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
android:layout_height="@dimen/multimeter_length_0"
5151
android:layout_marginTop="@dimen/multimeter_constraint_2"
5252
android:layout_marginEnd="@dimen/multimeter_layout_margin"
53-
android:layout_marginRight="@dimen/multimeter_layout_margin"
5453
android:textSize="@dimen/multimeter_quantity_dimen"
5554
app:layout_constraintBottom_toTopOf="@+id/view"
5655
app:layout_constraintEnd_toEndOf="@+id/display_box"
@@ -121,7 +120,7 @@
121120
android:paddingBottom="@dimen/multimeter_button_text_padding"
122121
android:text="@string/voltage_channels"
123122
android:textColor="@color/colorPrimary"
124-
android:textSize="14sp"
123+
android:textSize="@dimen/multimeter_voltage_textsize"
125124
android:textStyle="bold"
126125
app:layout_constraintEnd_toEndOf="parent"
127126
app:layout_constraintStart_toStartOf="parent"
@@ -155,9 +154,7 @@
155154
android:layout_width="@dimen/multimeter_length_0"
156155
android:layout_height="@dimen/multimeter_length_0"
157156
android:layout_marginStart="@dimen/multimeter_layout_margin_2"
158-
android:layout_marginLeft="@dimen/multimeter_layout_margin_2"
159157
android:layout_marginEnd="@dimen/multimeter_left_box_endmargin"
160-
android:layout_marginRight="@dimen/multimeter_left_box_endmargin"
161158
android:layout_marginBottom="@dimen/multimeter_constraint_1"
162159
android:background="@drawable/rectangle_border_black"
163160
app:layout_constraintBottom_toBottomOf="parent"
@@ -170,9 +167,7 @@
170167
android:layout_width="@dimen/multimeter_length_0"
171168
android:layout_height="@dimen/multimeter_length_0"
172169
android:layout_marginStart="@dimen/multimeter_end_box_rightmargin"
173-
android:layout_marginLeft="@dimen/multimeter_end_box_rightmargin"
174170
android:layout_marginEnd="@dimen/multimeter_layout_margin_2"
175-
android:layout_marginRight="@dimen/multimeter_layout_margin_2"
176171
android:layout_marginBottom="@dimen/multimeter_constraint_1"
177172
android:background="@drawable/rectangle_border_black"
178173
app:layout_constraintBottom_toBottomOf="parent"
@@ -186,10 +181,10 @@
186181
android:layout_width="@dimen/multimeter_length_0"
187182
android:layout_height="@dimen/multimeter_length_0"
188183
android:layout_centerHorizontal="true"
189-
android:layout_marginStart="5dp"
190-
android:layout_marginTop="5dp"
191-
android:layout_marginEnd="@dimen/multimeter_margin_2"
192-
android:layout_marginBottom="@dimen/multimeter_margin_2"
184+
android:layout_marginStart="@dimen/multimeter_knobs_margin_hdpi"
185+
android:layout_marginTop="@dimen/multimeter_knobs_margin_hdpi"
186+
android:layout_marginEnd="@dimen/multimeter_knobs_margin_hdpi"
187+
android:layout_marginBottom="@dimen/multimeter_knobs_margin_hdpi"
193188
android:layout_weight="1"
194189
app:kCircularIndicatorRelativeRadius="0"
195190
app:kDefaultState="2"
@@ -270,12 +265,13 @@
270265
android:layout_width="wrap_content"
271266
android:layout_height="wrap_content"
272267
android:layout_gravity="center"
273-
android:layout_marginTop="4dp"
268+
android:layout_marginTop="@dimen/multimeter_left_box_endmargin"
274269
android:gravity="center"
275270
android:text="@string/ch1"
276271
android:textColor="@color/colorPrimary"
277272
android:textSize="@dimen/control_textsize_tiny"
278273
android:textStyle="bold"
274+
app:layout_constraintBottom_toBottomOf="@+id/textView6"
279275
app:layout_constraintCircle="@id/knobs"
280276
app:layout_constraintCircleAngle="@string/multimeter_angle_12"
281277
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2"
@@ -292,25 +288,28 @@
292288
android:text="@string/resistance_abbreviation"
293289
android:textColor="@color/black"
294290
android:textSize="@dimen/multimeter_bottombutton_textsize"
291+
app:layout_constraintBottom_toBottomOf="@+id/an8"
295292
app:layout_constraintCircle="@id/knobs"
296293
app:layout_constraintCircleAngle="@string/multimeter_angle_4"
297294
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1"
298295
app:layout_constraintEnd_toEndOf="@+id/an8"
299296
app:layout_constraintStart_toStartOf="@+id/an8"
300-
tools:layout_editor_absoluteY="174dp" />
297+
app:layout_constraintTop_toTopOf="@+id/an8" />
301298

302299
<ImageView
303300
android:id="@+id/cap_symbol"
304301
android:layout_width="@dimen/multimeter_symol_width"
305302
android:layout_height="@dimen/multimeter_symbol_height"
306303
android:rotation="-90"
304+
app:layout_constraintBottom_toBottomOf="@+id/textView10"
307305
app:layout_constraintCircle="@id/knobs"
308306
app:layout_constraintCircleAngle="@string/multimeter_angle_5"
309307
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1"
310308
app:layout_constraintEnd_toEndOf="@+id/textView10"
311309
app:layout_constraintStart_toStartOf="@+id/textView10"
310+
app:layout_constraintTop_toTopOf="@+id/textView10"
312311
app:srcCompat="@drawable/capacitor"
313-
tools:layout_editor_absoluteY="235dp" />
312+
tools:ignore="ContentDescription" />
314313

315314
<TextView
316315
android:id="@+id/textView5"
@@ -322,12 +321,13 @@
322321
android:textColor="@color/colorPrimary"
323322
android:textSize="@dimen/control_textsize_tiny"
324323
android:textStyle="bold"
324+
app:layout_constraintBottom_toTopOf="@+id/knob_marker"
325325
app:layout_constraintCircle="@id/knobs"
326326
app:layout_constraintCircleAngle="@string/multimeter_angle_1"
327327
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1"
328328
app:layout_constraintEnd_toEndOf="@+id/textView11"
329329
app:layout_constraintStart_toStartOf="@+id/textView11"
330-
tools:layout_editor_absoluteY="91dp" />
330+
app:layout_constraintTop_toTopOf="@+id/textView11" />
331331

332332
<TextView
333333
android:id="@+id/textView6"
@@ -375,12 +375,13 @@
375375
android:textColor="@color/colorPrimary"
376376
android:textSize="@dimen/control_textsize_tiny"
377377
android:textStyle="bold"
378+
app:layout_constraintBottom_toBottomOf="@+id/textView5"
378379
app:layout_constraintCircle="@id/knobs"
379380
app:layout_constraintCircleAngle="@string/multimeter_angle_3"
380381
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_3"
381382
app:layout_constraintEnd_toEndOf="@+id/textView5"
382383
app:layout_constraintStart_toStartOf="@+id/textView5"
383-
tools:layout_editor_absoluteY="129dp" />
384+
app:layout_constraintTop_toTopOf="@+id/textView5" />
384385

385386
<TextView
386387
android:id="@+id/id4"
@@ -391,12 +392,13 @@
391392
android:textColor="@color/black"
392393
android:textSize="@dimen/control_textsize_tiny"
393394
android:textStyle="bold"
395+
app:layout_constraintBottom_toBottomOf="@+id/textView8"
394396
app:layout_constraintCircle="@id/knobs"
395397
app:layout_constraintCircleAngle="@string/multimeter_angle_9"
396398
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1"
397399
app:layout_constraintEnd_toEndOf="@+id/textView8"
398400
app:layout_constraintStart_toStartOf="@+id/textView8"
399-
tools:layout_editor_absoluteY="179dp" />
401+
app:layout_constraintTop_toTopOf="@+id/textView8" />
400402

401403
<TextView
402404
android:id="@+id/textView8"
@@ -408,12 +410,13 @@
408410
android:textColor="@color/black"
409411
android:textSize="@dimen/control_textsize_tiny"
410412
android:textStyle="bold"
413+
app:layout_constraintBottom_toBottomOf="@+id/textView9"
411414
app:layout_constraintCircle="@id/knobs"
412415
app:layout_constraintCircleAngle="@string/multimeter_angle_8"
413416
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1"
414417
app:layout_constraintEnd_toEndOf="@+id/textView9"
415418
app:layout_constraintStart_toStartOf="@+id/textView9"
416-
tools:layout_editor_absoluteY="235dp" />
419+
app:layout_constraintTop_toTopOf="@+id/textView9" />
417420

418421
<TextView
419422
android:id="@+id/textView9"
@@ -425,12 +428,13 @@
425428
android:textColor="@color/black"
426429
android:textSize="@dimen/control_textsize_tiny"
427430
android:textStyle="bold"
431+
app:layout_constraintBottom_toBottomOf="@+id/id1"
428432
app:layout_constraintCircle="@id/knobs"
429433
app:layout_constraintCircleAngle="@string/multimeter_angle_7"
430434
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2"
431435
app:layout_constraintEnd_toEndOf="@+id/id1"
432436
app:layout_constraintStart_toStartOf="@+id/id1"
433-
tools:layout_editor_absoluteY="261dp" />
437+
app:layout_constraintTop_toTopOf="@+id/id1" />
434438

435439
<TextView
436440
android:id="@+id/id1"
@@ -442,12 +446,12 @@
442446
android:textColor="@color/black"
443447
android:textSize="@dimen/control_textsize_tiny"
444448
android:textStyle="bold"
449+
app:layout_constraintBottom_toBottomOf="parent"
445450
app:layout_constraintCircle="@id/knobs"
446451
app:layout_constraintCircleAngle="@string/multimeter_angle_6"
447452
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2"
448453
app:layout_constraintEnd_toEndOf="@+id/cap_symbol"
449-
app:layout_constraintStart_toStartOf="@+id/cap_symbol"
450-
tools:layout_editor_absoluteY="261dp" />
454+
app:layout_constraintStart_toStartOf="@+id/cap_symbol" />
451455

452456
<TextView
453457
android:id="@+id/measure"
@@ -471,7 +475,7 @@
471475
android:layout_width="wrap_content"
472476
android:layout_height="wrap_content"
473477
android:orientation="horizontal"
474-
app:layout_constraintGuide_begin="158dp" />
478+
app:layout_constraintGuide_begin="@dimen/multimeter_guideline_constraint_begin" />
475479

476480
</androidx.constraintlayout.widget.ConstraintLayout>
477481

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

+9-20
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
app:layout_constraintHorizontal_bias="0.0"
1616
app:layout_constraintStart_toStartOf="parent"
1717
app:layout_constraintTop_toTopOf="@+id/top_app_bar_layout"
18-
app:layout_constraintVertical_bias="0.48000002" />
18+
app:layout_constraintVertical_bias="0.55" />
1919

2020
<com.google.android.material.appbar.AppBarLayout
2121
android:id="@+id/top_app_bar_layout"
@@ -58,7 +58,6 @@
5858
android:layout_height="@dimen/multimeter_length_0"
5959
android:layout_marginTop="@dimen/multimeter_constraint_2"
6060
android:layout_marginEnd="@dimen/multimeter_layout_margin"
61-
android:layout_marginRight="@dimen/multimeter_layout_margin"
6261
android:textSize="@dimen/multimeter_quantity_dimen"
6362
app:layout_constraintBottom_toTopOf="@+id/view"
6463
app:layout_constraintEnd_toEndOf="@+id/display_box"
@@ -112,10 +111,8 @@
112111
android:background="@drawable/rectangle_border"
113112
app:layout_constraintBottom_toBottomOf="@+id/upper_line"
114113
app:layout_constraintEnd_toEndOf="parent"
115-
app:layout_constraintHorizontal_bias="0.0"
116114
app:layout_constraintStart_toStartOf="parent"
117-
app:layout_constraintTop_toTopOf="parent"
118-
app:layout_constraintVertical_bias="1.0" />
115+
app:layout_constraintTop_toTopOf="parent" />
119116

120117
<TextView
121118
android:id="@+id/upper_box_title"
@@ -135,10 +132,9 @@
135132
android:textStyle="bold"
136133
app:layout_constraintBottom_toBottomOf="@+id/upper_line"
137134
app:layout_constraintEnd_toEndOf="parent"
138-
app:layout_constraintHorizontal_bias="0.0"
139135
app:layout_constraintStart_toStartOf="parent"
140136
app:layout_constraintTop_toTopOf="@+id/upper_box"
141-
app:layout_constraintVertical_bias="0.0" />
137+
app:layout_constraintVertical_bias="0.01" />
142138

143139
<View
144140
android:id="@+id/upper_line"
@@ -173,19 +169,15 @@
173169
android:background="@drawable/rectangle_border_black"
174170
app:layout_constraintBottom_toBottomOf="parent"
175171
app:layout_constraintEnd_toStartOf="@+id/lower_right_box"
176-
app:layout_constraintHorizontal_bias="0.0"
177172
app:layout_constraintStart_toStartOf="parent"
178-
app:layout_constraintTop_toTopOf="@+id/lower_line"
179-
app:layout_constraintVertical_bias="0.0" />
173+
app:layout_constraintTop_toTopOf="@+id/lower_line" />
180174

181175
<View
182176
android:id="@+id/lower_right_box"
183177
android:layout_width="@dimen/multimeter_length_0"
184178
android:layout_height="@dimen/multimeter_length_0"
185179
android:layout_marginStart="@dimen/multimeter_end_box_rightmargin"
186-
android:layout_marginLeft="@dimen/multimeter_end_box_rightmargin"
187180
android:layout_marginEnd="@dimen/multimeter_layout_margin_2"
188-
android:layout_marginRight="@dimen/multimeter_layout_margin_2"
189181
android:layout_marginBottom="@dimen/multimeter_constraint_1"
190182
android:background="@drawable/rectangle_border_black"
191183
app:layout_constraintBottom_toBottomOf="parent"
@@ -200,10 +192,8 @@
200192
android:layout_height="@dimen/multimeter_length_0"
201193
android:layout_centerHorizontal="true"
202194
android:layout_marginStart="@dimen/multimeter_margin_3"
203-
android:layout_marginLeft="@dimen/multimeter_margin_3"
204195
android:layout_marginTop="@dimen/multimeter_margin_3"
205196
android:layout_marginEnd="@dimen/multimeter_margin_2"
206-
android:layout_marginRight="@dimen/multimeter_margin_2"
207197
android:layout_marginBottom="@dimen/multimeter_margin_2"
208198
android:layout_weight="1"
209199
android:scaleX="1.5"
@@ -237,10 +227,9 @@
237227
android:orientation="horizontal"
238228
app:layout_constraintBottom_toBottomOf="@+id/lower_left_box"
239229
app:layout_constraintEnd_toEndOf="@+id/lower_left_box"
240-
app:layout_constraintHorizontal_bias="0.0"
241230
app:layout_constraintStart_toStartOf="@+id/lower_left_box"
242231
app:layout_constraintTop_toTopOf="@+id/lower_left_box"
243-
app:layout_constraintVertical_bias="0.685">
232+
app:layout_constraintVertical_bias="0.846">
244233

245234
<androidx.appcompat.widget.SwitchCompat
246235

@@ -276,8 +265,8 @@
276265

277266
<View
278267
android:id="@+id/knob_marker"
279-
android:layout_width="204dp"
280-
android:layout_height="202dp"
268+
android:layout_width="@dimen/multimeter_knob_width_tablet"
269+
android:layout_height="@dimen/multimeter_knob_heigth_tablet"
281270
android:layout_marginStart="@dimen/multimeter_constraint_1"
282271
android:layout_marginTop="@dimen/multimeter_constraint_1"
283272
android:layout_marginEnd="@dimen/multimeter_constraint_1"
@@ -517,10 +506,10 @@
517506
android:textStyle="bold"
518507
app:layout_constraintBottom_toBottomOf="@+id/lower_right_box"
519508
app:layout_constraintEnd_toEndOf="@+id/lower_right_box"
520-
app:layout_constraintHorizontal_bias="0.0"
509+
app:layout_constraintHorizontal_bias="1.0"
521510
app:layout_constraintStart_toStartOf="@+id/lower_right_box"
522511
app:layout_constraintTop_toTopOf="@+id/lower_right_box"
523-
app:layout_constraintVertical_bias="0.695" />
512+
app:layout_constraintVertical_bias="0.839" />
524513

525514
<androidx.constraintlayout.widget.Guideline
526515
android:id="@+id/guideline3"

0 commit comments

Comments
 (0)