Skip to content

Commit 9062eb8

Browse files
VishnuSanalVishnuSanal
authored
fix: double indication of the time units in the sensor screens (#2633)
1 parent 6f11ee3 commit 9062eb8

17 files changed

+7
-271
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,6 @@
6666
tools:layout_editor_absoluteX="288dp"
6767
tools:layout_editor_absoluteY="0dp" />
6868

69-
<TextView
70-
android:id="@+id/tv_unit_xaxis_hmc"
71-
android:layout_width="wrap_content"
72-
android:layout_height="wrap_content"
73-
android:layout_alignParentTop="true"
74-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_hmc"
75-
android:layout_toRightOf="@+id/tv_graph_label_xaxis_hmc"
76-
android:text="@string/seconds"
77-
android:textColor="#ffff"
78-
android:textSize="@dimen/lux_chart_axis_text"
79-
android:textStyle="normal|bold"
80-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_hmc"
81-
tools:layout_editor_absoluteY="0dp" />
82-
8369
</RelativeLayout>
8470

8571
<androidx.constraintlayout.widget.ConstraintLayout

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -150,18 +150,6 @@
150150
tools:layout_editor_absoluteX="288dp"
151151
tools:layout_editor_absoluteY="0dp" />
152152

153-
<TextView
154-
android:id="@+id/tv_unit_xaxis_ads"
155-
android:layout_width="wrap_content"
156-
android:layout_height="wrap_content"
157-
android:layout_alignParentTop="true"
158-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_ads"
159-
android:text="@string/seconds"
160-
android:textColor="#ffff"
161-
android:textSize="@dimen/text_size_9sp"
162-
android:textStyle="normal|bold"
163-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_ads"
164-
tools:layout_editor_absoluteY="0dp" />
165153
</RelativeLayout>
166154

167155
<androidx.constraintlayout.widget.ConstraintLayout

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

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -638,26 +638,13 @@
638638
android:layout_gravity="center_vertical|center_horizontal|center"
639639
android:foregroundGravity="center_vertical"
640640
android:gravity="center_vertical|center_horizontal|center"
641-
android:text="@string/time_space"
641+
android:text="@string/time"
642642
android:textColor="#ffff"
643643
android:textSize="@dimen/text_size_9sp"
644644
android:textStyle="normal|bold"
645645
tools:layout_editor_absoluteX="288dp"
646646
tools:layout_editor_absoluteY="0dp" />
647647

648-
<TextView
649-
android:id="@+id/tv_unit_xaxis_apds"
650-
android:layout_width="wrap_content"
651-
android:layout_height="wrap_content"
652-
android:layout_alignParentTop="true"
653-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_lux_apds"
654-
android:text="@string/seconds"
655-
android:textColor="#ffff"
656-
android:textSize="@dimen/text_size_9sp"
657-
android:textStyle="normal|bold"
658-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_lux_apds"
659-
tools:layout_editor_absoluteY="0dp" />
660-
661648
</RelativeLayout>
662649

663650
<androidx.constraintlayout.widget.ConstraintLayout
@@ -771,19 +758,6 @@
771758
tools:layout_editor_absoluteX="288dp"
772759
tools:layout_editor_absoluteY="0dp" />
773760

774-
<TextView
775-
android:id="@+id/tv_unit_xaxis_prox_apds"
776-
android:layout_width="wrap_content"
777-
android:layout_height="wrap_content"
778-
android:layout_alignParentTop="true"
779-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_prox_apds"
780-
android:text="@string/seconds"
781-
android:textColor="#ffff"
782-
android:textSize="@dimen/text_size_9sp"
783-
android:textStyle="normal|bold"
784-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_prox_apds"
785-
tools:layout_editor_absoluteY="0dp" />
786-
787761
</RelativeLayout>
788762

789763
<androidx.constraintlayout.widget.ConstraintLayout

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

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,6 @@
194194
tools:layout_editor_absoluteX="288dp"
195195
tools:layout_editor_absoluteY="0dp" />
196196

197-
<TextView
198-
android:id="@+id/tv_unit_xaxis_temp_bmp"
199-
android:layout_width="wrap_content"
200-
android:layout_height="wrap_content"
201-
android:layout_alignParentTop="true"
202-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_temp_bmp"
203-
android:text="@string/seconds"
204-
android:textColor="#ffff"
205-
android:textSize="@dimen/text_size_9sp"
206-
android:textStyle="normal|bold"
207-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_temp_bmp"
208-
tools:layout_editor_absoluteY="0dp" />
209-
210197
</RelativeLayout>
211198

212199
<androidx.constraintlayout.widget.ConstraintLayout
@@ -316,19 +303,6 @@
316303
tools:layout_editor_absoluteX="288dp"
317304
tools:layout_editor_absoluteY="0dp" />
318305

319-
<TextView
320-
android:id="@+id/tv_unit_xaxis_alt_bmp"
321-
android:layout_width="wrap_content"
322-
android:layout_height="wrap_content"
323-
android:layout_alignParentTop="true"
324-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_alt_bmp"
325-
android:text="@string/seconds"
326-
android:textColor="#ffff"
327-
android:textSize="@dimen/text_size_9sp"
328-
android:textStyle="normal|bold"
329-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_alt_bmp"
330-
tools:layout_editor_absoluteY="0dp" />
331-
332306
</RelativeLayout>
333307

334308
<androidx.constraintlayout.widget.ConstraintLayout
@@ -440,19 +414,6 @@
440414
tools:layout_editor_absoluteX="288dp"
441415
tools:layout_editor_absoluteY="0dp" />
442416

443-
<TextView
444-
android:id="@+id/tv_unit_xaxis_pre_bmp"
445-
android:layout_width="wrap_content"
446-
android:layout_height="wrap_content"
447-
android:layout_alignParentTop="true"
448-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_pre_bmp"
449-
android:text="@string/seconds"
450-
android:textColor="#ffff"
451-
android:textSize="@dimen/text_size_9sp"
452-
android:textStyle="normal|bold"
453-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_pre_bmp"
454-
tools:layout_editor_absoluteY="0dp" />
455-
456417
</RelativeLayout>
457418

458419
<androidx.constraintlayout.widget.ConstraintLayout

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -177,19 +177,6 @@
177177
tools:layout_editor_absoluteX="288dp"
178178
tools:layout_editor_absoluteY="0dp" />
179179

180-
<TextView
181-
android:id="@+id/tv_unit_xaxis_eCO2_ccs811"
182-
android:layout_width="wrap_content"
183-
android:layout_height="wrap_content"
184-
android:layout_alignParentTop="true"
185-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_eCO2_ccs811"
186-
android:text="@string/seconds"
187-
android:textColor="#ffff"
188-
android:textSize="@dimen/text_size_9sp"
189-
android:textStyle="normal|bold"
190-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_eCO2_ccs811"
191-
tools:layout_editor_absoluteY="0dp" />
192-
193180
</RelativeLayout>
194181

195182
<androidx.constraintlayout.widget.ConstraintLayout
@@ -300,19 +287,6 @@
300287
tools:layout_editor_absoluteX="288dp"
301288
tools:layout_editor_absoluteY="0dp" />
302289

303-
<TextView
304-
android:id="@+id/tv_unit_xaxis_TVOC_ccs811"
305-
android:layout_width="wrap_content"
306-
android:layout_height="wrap_content"
307-
android:layout_alignParentTop="true"
308-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_TVOC_ccs811"
309-
android:text="@string/seconds"
310-
android:textColor="#ffff"
311-
android:textSize="@dimen/text_size_9sp"
312-
android:textStyle="normal|bold"
313-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_TVOC_ccs811"
314-
tools:layout_editor_absoluteY="0dp" />
315-
316290
</RelativeLayout>
317291

318292
<androidx.constraintlayout.widget.ConstraintLayout

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -188,26 +188,13 @@
188188
android:layout_gravity="center_vertical|center_horizontal|center"
189189
android:foregroundGravity="center_vertical"
190190
android:gravity="center_vertical|center_horizontal|center"
191-
android:text="@string/time_space"
191+
android:text="@string/time"
192192
android:textColor="#ffff"
193193
android:textSize="@dimen/text_size_9sp"
194194
android:textStyle="normal|bold"
195195
tools:layout_editor_absoluteX="288dp"
196196
tools:layout_editor_absoluteY="0dp" />
197197

198-
<TextView
199-
android:id="@+id/tv_unit_xaxis_hmc"
200-
android:layout_width="wrap_content"
201-
android:layout_height="wrap_content"
202-
android:layout_alignParentTop="true"
203-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_hmc"
204-
android:text="@string/seconds"
205-
android:textColor="#ffff"
206-
android:textSize="@dimen/text_size_9sp"
207-
android:textStyle="normal|bold"
208-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_hmc"
209-
tools:layout_editor_absoluteY="0dp" />
210-
211198
</RelativeLayout>
212199

213200
<androidx.constraintlayout.widget.ConstraintLayout

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

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -170,26 +170,13 @@
170170
android:layout_gravity="center_vertical|center_horizontal|center"
171171
android:foregroundGravity="center_vertical"
172172
android:gravity="center_vertical|center_horizontal|center"
173-
android:text="@string/time_space"
173+
android:text="@string/time"
174174
android:textColor="#ffff"
175175
android:textSize="@dimen/text_size_9sp"
176176
android:textStyle="normal|bold"
177177
tools:layout_editor_absoluteX="288dp"
178178
tools:layout_editor_absoluteY="0dp" />
179179

180-
<TextView
181-
android:id="@+id/tv_unit_xaxis_objtemp_mlx"
182-
android:layout_width="wrap_content"
183-
android:layout_height="wrap_content"
184-
android:layout_alignParentTop="true"
185-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_objtemp_mlx"
186-
android:text="@string/seconds"
187-
android:textColor="#ffff"
188-
android:textSize="@dimen/text_size_9sp"
189-
android:textStyle="normal|bold"
190-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_objtemp_mlx"
191-
tools:layout_editor_absoluteY="0dp" />
192-
193180
</RelativeLayout>
194181

195182
<androidx.constraintlayout.widget.ConstraintLayout
@@ -293,26 +280,13 @@
293280
android:layout_gravity="center_vertical|center_horizontal|center"
294281
android:foregroundGravity="center_vertical"
295282
android:gravity="center_vertical|center_horizontal|center"
296-
android:text="@string/time_space"
283+
android:text="@string/time"
297284
android:textColor="#ffff"
298285
android:textSize="@dimen/text_size_9sp"
299286
android:textStyle="normal|bold"
300287
tools:layout_editor_absoluteX="288dp"
301288
tools:layout_editor_absoluteY="0dp" />
302289

303-
<TextView
304-
android:id="@+id/tv_unit_xaxis_ambtemp_mlx"
305-
android:layout_width="wrap_content"
306-
android:layout_height="wrap_content"
307-
android:layout_alignParentTop="true"
308-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_ambtemp_mlx"
309-
android:text="@string/seconds"
310-
android:textColor="#ffff"
311-
android:textSize="@dimen/text_size_9sp"
312-
android:textStyle="normal|bold"
313-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_ambtemp_mlx"
314-
tools:layout_editor_absoluteY="0dp" />
315-
316290
</RelativeLayout>
317291

318292
<androidx.constraintlayout.widget.ConstraintLayout

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

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,13 @@
8484
android:layout_gravity="center_vertical|center_horizontal|center"
8585
android:foregroundGravity="center_vertical"
8686
android:gravity="center_vertical|center_horizontal|center"
87-
android:text="@string/time_space"
87+
android:text="@string/time"
8888
android:textColor="#ffff"
8989
android:textSize="@dimen/text_size_9sp"
9090
android:textStyle="normal|bold"
9191
tools:layout_editor_absoluteX="288dp"
9292
tools:layout_editor_absoluteY="0dp" />
9393

94-
<TextView
95-
android:id="@+id/tv_unit_xaxis_hmc"
96-
android:layout_width="wrap_content"
97-
android:layout_height="wrap_content"
98-
android:layout_alignParentTop="true"
99-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_acc_mpu"
100-
android:text="@string/seconds"
101-
android:textColor="#ffff"
102-
android:textSize="@dimen/text_size_9sp"
103-
android:textStyle="normal|bold"
104-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_acc_mpu"
105-
tools:layout_editor_absoluteY="0dp" />
106-
10794
</RelativeLayout>
10895

10996
<androidx.constraintlayout.widget.ConstraintLayout
@@ -216,19 +203,6 @@
216203
tools:layout_editor_absoluteX="288dp"
217204
tools:layout_editor_absoluteY="0dp" />
218205

219-
<TextView
220-
android:id="@+id/tv_unit_xaxis_gy_mpu"
221-
android:layout_width="wrap_content"
222-
android:layout_height="wrap_content"
223-
android:layout_alignParentTop="true"
224-
android:layout_toEndOf="@+id/tv_graph_label_xaxis_gy_mpu"
225-
android:text="@string/seconds"
226-
android:textColor="#ffff"
227-
android:textSize="@dimen/text_size_9sp"
228-
android:textStyle="normal|bold"
229-
app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_gy_mpu"
230-
tools:layout_editor_absoluteY="0dp" />
231-
232206
</RelativeLayout>
233207

234208
<androidx.constraintlayout.widget.ConstraintLayout

0 commit comments

Comments
 (0)