Skip to content

Commit 855befa

Browse files
Girish-BharadwajGirish-Bharadwaj
authored
fix: display issue in multimeter layout on tablet devices (#2129)
* I tried my level best to fix the issue of displaying the quantity in tablet devices * Fixed the display issue of multimeter layout on tablet devices * Modified the size of knob of multimeter for tablet devices * Updated labels around the knob * removed hardcoded value
1 parent ad26220 commit 855befa

File tree

3 files changed

+37
-16
lines changed

3 files changed

+37
-16
lines changed

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

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<android.support.constraint.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">
@@ -85,8 +86,7 @@
8586
<android.support.constraint.ConstraintLayout
8687
android:layout_width="match_parent"
8788
android:layout_height="@dimen/dimen_zero_dp"
88-
android:layout_marginTop="@dimen/multimeter_view_top_margin"
89-
android:layout_marginBottom="@dimen/multimeter_constraint_1"
89+
android:layout_margin="@dimen/multimeter_margin"
9090
app:layout_constraintBottom_toTopOf="@+id/bottom_view"
9191
app:layout_constraintEnd_toEndOf="parent"
9292
app:layout_constraintStart_toStartOf="parent"
@@ -257,8 +257,8 @@
257257

258258
<View
259259
android:id="@+id/knob_marker"
260-
android:layout_width="@dimen/multimeter_knob_width_xhdpi"
261-
android:layout_height="@dimen/multimeter_knob_height_xhdpi"
260+
android:layout_width="@dimen/multimeter_knob_width"
261+
android:layout_height="@dimen/multimeter_knob_height"
262262
android:layout_marginStart="@dimen/multimeter_constraint_1"
263263
android:layout_marginLeft="@dimen/multimeter_constraint_1"
264264
android:layout_marginTop="@dimen/multimeter_constraint_1"
@@ -283,7 +283,8 @@
283283
android:textStyle="bold"
284284
app:layout_constraintCircle="@id/knobs"
285285
app:layout_constraintCircleAngle="@string/multimeter_angle_12"
286-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2_xl" />
286+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2_xhdpi"
287+
/>
287288

288289
<TextView
289290
android:layout_width="wrap_content"
@@ -295,16 +296,16 @@
295296
android:textSize="@dimen/multimeter_bottombutton_textsize"
296297
app:layout_constraintCircle="@id/knobs"
297298
app:layout_constraintCircleAngle="@string/multimeter_angle_4"
298-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xl" />
299+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xhdpi" />
299300

300301
<ImageView
301302
android:id="@+id/cap_symbol"
302-
android:layout_width="@dimen/multimeter_symol_width"
303+
android:layout_width="@dimen/multimeter_symbol_width"
303304
android:layout_height="@dimen/multimeter_symbol_height"
304305
android:rotation="-90"
305306
app:layout_constraintCircle="@id/knobs"
306307
app:layout_constraintCircleAngle="@string/multimeter_angle_5"
307-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xl"
308+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xhdpi"
308309
app:srcCompat="@drawable/capacitor" />
309310

310311
<TextView
@@ -318,7 +319,7 @@
318319
android:textStyle="bold"
319320
app:layout_constraintCircle="@id/knobs"
320321
app:layout_constraintCircleAngle="@string/multimeter_angle_1"
321-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xl" />
322+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xhdpi" />
322323

323324
<TextView
324325
android:layout_width="wrap_content"
@@ -330,7 +331,7 @@
330331
android:textStyle="bold"
331332
app:layout_constraintCircle="@id/knobs"
332333
app:layout_constraintCircleAngle="@string/multimeter_angle_11"
333-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_3_xl" />
334+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_3_xhdpi" />
334335

335336
<TextView
336337
android:id="@+id/ch3"
@@ -342,7 +343,7 @@
342343
android:textStyle="bold"
343344
app:layout_constraintCircle="@id/knobs"
344345
app:layout_constraintCircleAngle="@string/multimeter_angle_10"
345-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_3_xl" />
346+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_3_xhdpi" />
346347

347348
<TextView
348349
android:id="@+id/an8"
@@ -355,7 +356,7 @@
355356
android:textStyle="bold"
356357
app:layout_constraintCircle="@id/knobs"
357358
app:layout_constraintCircleAngle="@string/multimeter_angle_3"
358-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_3_xl" />
359+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_3_xhdpi" />
359360

360361
<TextView
361362
android:id="@+id/id4"
@@ -368,7 +369,7 @@
368369
android:textStyle="bold"
369370
app:layout_constraintCircle="@id/knobs"
370371
app:layout_constraintCircleAngle="@string/multimeter_angle_9"
371-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xl" />
372+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xhdpi" />
372373

373374
<TextView
374375
android:layout_width="wrap_content"
@@ -381,7 +382,7 @@
381382
android:textStyle="bold"
382383
app:layout_constraintCircle="@id/knobs"
383384
app:layout_constraintCircleAngle="@string/multimeter_angle_8"
384-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xl" />
385+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_1_xhdpi" />
385386

386387
<TextView
387388
android:layout_width="wrap_content"
@@ -394,7 +395,7 @@
394395
android:textStyle="bold"
395396
app:layout_constraintCircle="@id/knobs"
396397
app:layout_constraintCircleAngle="@string/multimeter_angle_7"
397-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2_xl" />
398+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2_xhdpi" />
398399

399400
<TextView
400401
android:id="@+id/id1"
@@ -408,7 +409,7 @@
408409
android:textStyle="bold"
409410
app:layout_constraintCircle="@id/knobs"
410411
app:layout_constraintCircleAngle="@string/multimeter_angle_6"
411-
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2_xl" />
412+
app:layout_constraintCircleRadius="@dimen/multimeter_knobcircle_radius_2_xhdpi" />
412413

413414
<TextView
414415
android:id="@+id/measure"

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<resources>
4+
<dimen name="multimeter_margin">60dp</dimen>
5+
<dimen name="multimeter_textbox_height">120dp</dimen>
6+
<dimen name="multimeter_constraint_2">16dp</dimen>
7+
<dimen name="multimeter_layout_margin">20dp</dimen>
8+
<dimen name="multimeter_knob_width">450dp</dimen>
9+
<dimen name="multimeter_knob_height">450dp</dimen>
10+
<dimen name="control_textsize_tiny">25sp</dimen>
11+
<dimen name="multimeter_bottombutton_textsize">25sp</dimen>
12+
<dimen name="multimeter_symbol_width">25dp</dimen>
13+
<dimen name="multimeter_symbol_height">25dp</dimen>
14+
<dimen name="multimeter_heading_ll_text_size">25sp</dimen>
15+
<dimen name="multimeter_measure_textsize">20sp</dimen>
16+
17+
</resources>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@
125125
<dimen name="multimeter_knobcircle_radius_1_xl">115dp</dimen>
126126
<dimen name="multimeter_knobcircle_radius_2_xl">111dp</dimen>
127127
<dimen name="multimeter_knobcircle_radius_3_xl">117dp</dimen>
128+
<dimen name="multimeter_knobcircle_radius_2_xhdpi">249dp</dimen>
129+
<dimen name="multimeter_knobcircle_radius_1_xhdpi">253dp</dimen>
130+
<dimen name="multimeter_knobcircle_radius_3_xhdpi">255dp</dimen>
128131
<dimen name="multimeter_left_box_endmargin">4dp</dimen>
129132
<dimen name="multimeter_end_box_rightmargin">12dp</dimen>
130133
<dimen name="multimeter_layout_margin_2">10dp</dimen>

0 commit comments

Comments
 (0)