Skip to content

Commit 8ed0ca5

Browse files
AsCressAsCress
authored
feat: added descriptive labels in fragment layouts of the Oscilloscope screen (#2483)
1 parent 0d72a0d commit 8ed0ca5

File tree

10 files changed

+292
-67
lines changed

10 files changed

+292
-67
lines changed

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

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,34 @@
55
android:layout_height="match_parent"
66
android:orientation="vertical">
77

8+
<View
9+
android:id="@+id/border_view"
10+
android:layout_width="match_parent"
11+
android:layout_height="0dp"
12+
android:layout_marginTop="@dimen/margin_5dp"
13+
android:background="@drawable/rounded_custom_border"
14+
app:layout_constraintBottom_toBottomOf="parent"
15+
app:layout_constraintEnd_toEndOf="parent"
16+
app:layout_constraintStart_toStartOf="parent"
17+
app:layout_constraintTop_toTopOf="parent" />
18+
19+
<TextView
20+
android:id="@+id/title_text"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_centerHorizontal="true"
24+
android:background="@color/white"
25+
android:includeFontPadding="false"
26+
android:paddingLeft="@dimen/ctrl_title_text_padding"
27+
android:paddingRight="@dimen/ctrl_title_text_padding"
28+
android:text="@string/channels"
29+
android:textColor="@color/colorPrimary"
30+
android:textSize="@dimen/text_size_osc"
31+
android:textStyle="bold"
32+
app:layout_constraintEnd_toEndOf="parent"
33+
app:layout_constraintStart_toStartOf="parent"
34+
app:layout_constraintTop_toTopOf="parent" />
35+
836
<CheckBox
937
android:id="@+id/checkBox_ch1_cp"
1038
android:layout_width="wrap_content"
@@ -15,14 +43,14 @@
1543
android:textSize="@dimen/osc_text_size_large"
1644
android:textStyle="normal|bold"
1745
app:layout_constraintLeft_toLeftOf="parent"
18-
app:layout_constraintTop_toTopOf="parent" />
46+
app:layout_constraintTop_toTopOf="@id/border_view" />
1947

2048
<CheckBox
2149
android:id="@+id/checkBox_ch2_cp"
2250
android:layout_width="wrap_content"
2351
android:layout_height="wrap_content"
24-
android:layout_marginBottom="@dimen/osc_cb_margin2"
2552
android:layout_marginStart="@dimen/osc_cb_margin2"
53+
android:layout_marginBottom="@dimen/osc_cb_margin2"
2654
android:text="@string/label_ch2"
2755
android:textSize="@dimen/osc_text_size_large"
2856
android:textStyle="normal|bold"
@@ -33,14 +61,14 @@
3361
android:id="@+id/checkBox_ch3_cp"
3462
android:layout_width="wrap_content"
3563
android:layout_height="wrap_content"
36-
android:layout_marginEnd="@dimen/osc_cb_margin2"
3764
android:layout_marginTop="@dimen/osc_cb_margin2"
65+
android:layout_marginEnd="@dimen/osc_cb_margin2"
3866
android:text="@string/ch3_value"
3967
android:textSize="@dimen/osc_text_size_large"
4068
android:textStyle="normal|bold"
4169
app:layout_constraintEnd_toStartOf="@id/mic_radio_group"
4270
app:layout_constraintStart_toEndOf="@id/spinner_channel_select_cp"
43-
app:layout_constraintTop_toTopOf="parent" />
71+
app:layout_constraintTop_toTopOf="@id/border_view" />
4472

4573
<TextView
4674
android:id="@+id/tv_range1_cp"
@@ -53,14 +81,14 @@
5381
android:textColor="@color/cardview_dark_background"
5482
android:textSize="@dimen/osc_text_size_large"
5583
app:layout_constraintLeft_toRightOf="@+id/checkBox_ch1_cp"
56-
app:layout_constraintTop_toTopOf="parent" />
84+
app:layout_constraintTop_toTopOf="@id/border_view" />
5785

5886
<TextView
5987
android:id="@+id/tv_range2_cp"
6088
android:layout_width="wrap_content"
6189
android:layout_height="@dimen/osc_tv_height"
62-
android:layout_marginBottom="@dimen/osc_cb_margin2"
6390
android:layout_marginStart="@dimen/osc_cb_margin2"
91+
android:layout_marginBottom="@dimen/osc_cb_margin2"
6492
android:gravity="fill_vertical"
6593
android:text="@string/range"
6694
android:textColor="@color/cardview_dark_background"
@@ -72,8 +100,8 @@
72100
android:id="@+id/spinner_range_ch2_cp"
73101
android:layout_width="wrap_content"
74102
android:layout_height="@dimen/osc_spinner_height"
75-
android:layout_marginBottom="@dimen/osc_cb_margin"
76103
android:layout_marginStart="@dimen/osc_cb_margin2"
104+
android:layout_marginBottom="@dimen/osc_cb_margin"
77105
app:layout_constraintBottom_toBottomOf="parent"
78106
app:layout_constraintLeft_toRightOf="@+id/tv_range2_cp" />
79107

@@ -84,7 +112,7 @@
84112
android:layout_marginStart="@dimen/osc_cb_margin2"
85113
android:layout_marginTop="@dimen/osc_cb_margin"
86114
app:layout_constraintLeft_toRightOf="@+id/spinner_range_ch1_cp"
87-
app:layout_constraintTop_toTopOf="parent" />
115+
app:layout_constraintTop_toTopOf="@id/border_view" />
88116

89117
<Spinner
90118
android:id="@+id/spinner_range_ch1_cp"
@@ -93,14 +121,14 @@
93121
android:layout_marginStart="@dimen/osc_cb_margin2"
94122
android:layout_marginTop="@dimen/osc_cb_margin"
95123
app:layout_constraintLeft_toRightOf="@+id/tv_range1_cp"
96-
app:layout_constraintTop_toTopOf="parent" />
124+
app:layout_constraintTop_toTopOf="@id/border_view" />
97125

98126
<TextView
99127
android:id="@+id/tv_ch2_cp"
100128
android:layout_width="wrap_content"
101129
android:layout_height="wrap_content"
102-
android:layout_marginBottom="@dimen/text_elevation"
103130
android:layout_marginStart="@dimen/osc_cb_margin2"
131+
android:layout_marginBottom="@dimen/text_elevation"
104132
android:clickable="true"
105133
android:text="@string/label_ch2"
106134
android:textColor="@android:color/background_dark"
@@ -116,7 +144,7 @@
116144
android:layout_marginEnd="@dimen/osc_cb_margin2"
117145
android:orientation="vertical"
118146
app:layout_constraintEnd_toEndOf="parent"
119-
app:layout_constraintTop_toTopOf="parent">
147+
app:layout_constraintTop_toTopOf="@id/border_view">
120148

121149
<CheckBox
122150
android:id="@+id/built_in_mic_cb"

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

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,70 @@
55
android:layout_height="match_parent"
66
android:orientation="vertical">
77

8+
<View
9+
android:id="@+id/border_view"
10+
android:layout_width="match_parent"
11+
android:layout_height="0dp"
12+
android:layout_marginTop="@dimen/margin_5dp"
13+
android:background="@drawable/rounded_custom_border"
14+
app:layout_constraintBottom_toBottomOf="parent"
15+
app:layout_constraintEnd_toEndOf="parent"
16+
app:layout_constraintStart_toStartOf="parent"
17+
app:layout_constraintTop_toTopOf="parent" />
18+
19+
<TextView
20+
android:id="@+id/title_text"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_centerHorizontal="true"
24+
android:background="@color/white"
25+
android:includeFontPadding="false"
26+
android:paddingLeft="@dimen/ctrl_title_text_padding"
27+
android:paddingRight="@dimen/ctrl_title_text_padding"
28+
android:text="@string/data_analysis"
29+
android:textColor="@color/colorPrimary"
30+
android:textSize="@dimen/text_size_osc"
31+
android:textStyle="bold"
32+
app:layout_constraintEnd_toEndOf="parent"
33+
app:layout_constraintStart_toStartOf="parent"
34+
app:layout_constraintTop_toTopOf="parent" />
35+
836
<Spinner
937
android:id="@+id/spinner_curve_fit_da"
1038
android:layout_width="wrap_content"
1139
android:layout_height="48dp"
1240
android:layout_marginLeft="16dp"
13-
android:layout_marginStart="16dp"
14-
android:layout_marginTop="8dp"
41+
android:layout_marginTop="@dimen/margin_10dp"
1542
app:layout_constraintLeft_toLeftOf="parent"
16-
app:layout_constraintTop_toTopOf="parent" />
43+
app:layout_constraintTop_toTopOf="@id/border_view" />
1744

1845
<Spinner
1946
android:id="@+id/spinner_channel_select_da1"
2047
android:layout_width="wrap_content"
2148
android:layout_height="48dp"
22-
android:layout_marginEnd="24dp"
2349
android:layout_marginLeft="16dp"
50+
android:layout_marginTop="@dimen/margin_10dp"
2451
android:layout_marginRight="24dp"
25-
android:layout_marginStart="16dp"
26-
android:layout_marginTop="8dp"
2752
app:layout_constraintLeft_toRightOf="@+id/spinner_curve_fit_da"
2853
app:layout_constraintRight_toLeftOf="@+id/spinner_channel_select_da2"
29-
app:layout_constraintTop_toTopOf="parent" />
54+
app:layout_constraintTop_toTopOf="@id/border_view" />
3055

3156
<Spinner
3257
android:id="@+id/spinner_channel_select_da2"
3358
android:layout_width="wrap_content"
3459
android:layout_height="48dp"
35-
android:layout_marginEnd="16dp"
60+
android:layout_marginTop="@dimen/margin_10dp"
3661
android:layout_marginRight="16dp"
37-
android:layout_marginTop="8dp"
3862
app:layout_constraintRight_toRightOf="parent"
39-
app:layout_constraintTop_toTopOf="parent" />
63+
app:layout_constraintTop_toTopOf="@id/border_view" />
4064

4165
<CheckBox
4266
android:id="@+id/checkBox_fourier_da"
4367
android:layout_width="wrap_content"
4468
android:layout_height="wrap_content"
45-
android:layout_marginBottom="8dp"
46-
android:layout_marginLeft="16dp"
4769
android:layout_marginStart="16dp"
70+
android:layout_marginLeft="16dp"
71+
android:layout_marginBottom="8dp"
4872
android:text="@string/fourier_transforms"
4973
android:textSize="18sp"
5074
app:layout_constraintBottom_toBottomOf="parent"

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

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,44 @@
55
android:layout_height="match_parent"
66
android:orientation="vertical">
77

8+
<View
9+
android:id="@+id/border_view"
10+
android:layout_width="match_parent"
11+
android:layout_height="0dp"
12+
android:layout_marginTop="@dimen/margin_5dp"
13+
android:background="@drawable/rounded_custom_border"
14+
app:layout_constraintBottom_toBottomOf="parent"
15+
app:layout_constraintEnd_toEndOf="parent"
16+
app:layout_constraintStart_toStartOf="parent"
17+
app:layout_constraintTop_toTopOf="parent" />
18+
19+
<TextView
20+
android:id="@+id/title_text"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_centerHorizontal="true"
24+
android:background="@color/white"
25+
android:includeFontPadding="false"
26+
android:paddingLeft="@dimen/ctrl_title_text_padding"
27+
android:paddingRight="@dimen/ctrl_title_text_padding"
28+
android:text="@string/title_xy_plot"
29+
android:textColor="@color/colorPrimary"
30+
android:textSize="@dimen/text_size_osc"
31+
android:textStyle="bold"
32+
app:layout_constraintEnd_toEndOf="parent"
33+
app:layout_constraintStart_toStartOf="parent"
34+
app:layout_constraintTop_toTopOf="parent" />
35+
836
<CheckBox
937
android:id="@+id/checkBox_enable_xy_xy"
1038
android:layout_width="wrap_content"
1139
android:layout_height="wrap_content"
1240
android:layout_marginLeft="16dp"
13-
android:layout_marginStart="16dp"
14-
android:layout_marginTop="8dp"
41+
android:layout_marginTop="@dimen/osc_cb_margin"
1542
android:text="@string/enable_xy_plot"
1643
android:textSize="18sp"
1744
app:layout_constraintLeft_toLeftOf="parent"
18-
app:layout_constraintTop_toTopOf="parent" />
45+
app:layout_constraintTop_toTopOf="@id/border_view" />
1946

2047
<Spinner
2148
android:id="@+id/spinner_channel_select_xy2"
@@ -34,12 +61,12 @@
3461
android:id="@+id/spinner_channel_select_xy1"
3562
android:layout_width="wrap_content"
3663
android:layout_height="48dp"
37-
android:layout_alignParentLeft="true"
38-
android:layout_alignParentStart="true"
3964
android:layout_below="@+id/button_view_xy"
40-
android:layout_marginBottom="8dp"
41-
android:layout_marginLeft="16dp"
65+
android:layout_alignParentStart="true"
66+
android:layout_alignParentLeft="true"
4267
android:layout_marginStart="16dp"
68+
android:layout_marginLeft="16dp"
69+
android:layout_marginBottom="8dp"
4370
android:layout_weight="1"
4471
android:padding="2dp"
4572
app:layout_constraintBottom_toBottomOf="parent"
@@ -50,9 +77,9 @@
5077
android:layout_width="wrap_content"
5178
android:layout_height="wrap_content"
5279
android:layout_alignBottom="@+id/spinner_channel_select_xy2"
53-
android:layout_marginBottom="8dp"
5480
android:layout_marginEnd="16dp"
5581
android:layout_marginRight="16dp"
82+
android:layout_marginBottom="8dp"
5683
android:layout_toEndOf="@+id/spinner_channel_select_xy2"
5784
android:layout_toRightOf="@+id/spinner_channel_select_xy2"
5885
android:layout_weight="1"

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

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,36 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6-
android:background="@drawable/rounded_custom_border"
76
tools:context="io.pslab.fragment.ChannelParametersFragment">
87

8+
<View
9+
android:id="@+id/border_view"
10+
android:layout_width="match_parent"
11+
android:layout_height="0dp"
12+
android:layout_marginTop="@dimen/margin_5dp"
13+
android:background="@drawable/rounded_custom_border"
14+
app:layout_constraintBottom_toBottomOf="parent"
15+
app:layout_constraintEnd_toEndOf="parent"
16+
app:layout_constraintStart_toStartOf="parent"
17+
app:layout_constraintTop_toTopOf="parent" />
18+
19+
<TextView
20+
android:id="@+id/title_text"
21+
android:includeFontPadding="false"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_centerHorizontal="true"
25+
android:background="@color/white"
26+
android:paddingLeft="@dimen/ctrl_title_text_padding"
27+
android:paddingRight="@dimen/ctrl_title_text_padding"
28+
android:text="@string/channels"
29+
android:textColor="@color/colorPrimary"
30+
android:textSize="@dimen/text_size_osc"
31+
android:textStyle="bold"
32+
app:layout_constraintEnd_toEndOf="parent"
33+
app:layout_constraintStart_toStartOf="parent"
34+
app:layout_constraintTop_toTopOf="parent" />
35+
936
<CheckBox
1037
android:id="@+id/checkBox_ch1_cp"
1138
android:layout_width="wrap_content"
@@ -15,7 +42,7 @@
1542
android:text="@string/ch1"
1643
android:textStyle="normal|bold"
1744
app:layout_constraintLeft_toLeftOf="parent"
18-
app:layout_constraintTop_toTopOf="parent" />
45+
app:layout_constraintTop_toTopOf="@id/border_view" />
1946

2047
<CheckBox
2148
android:id="@+id/checkBox_ch2_cp"
@@ -36,7 +63,7 @@
3663
android:layout_marginEnd="@dimen/osc_cb_margin"
3764
android:textStyle="normal|bold"
3865
app:layout_constraintEnd_toEndOf="parent"
39-
app:layout_constraintTop_toTopOf="parent" />
66+
app:layout_constraintTop_toTopOf="@id/border_view" />
4067

4168
<TextView
4269
android:id="@+id/tv_range1_cp"
@@ -48,7 +75,7 @@
4875
android:text="@string/range"
4976
android:textColor="@color/cardview_dark_background"
5077
app:layout_constraintLeft_toRightOf="@+id/checkBox_ch1_cp"
51-
app:layout_constraintTop_toTopOf="parent" />
78+
app:layout_constraintTop_toTopOf="@id/border_view" />
5279

5380
<TextView
5481
android:id="@+id/tv_range2_cp"
@@ -77,14 +104,14 @@
77104
android:layout_height="@dimen/osc_spinner_height"
78105
android:layout_marginStart="@dimen/osc_cb_margin"
79106
app:layout_constraintLeft_toRightOf="@+id/spinner_range_ch1_cp"
80-
app:layout_constraintTop_toTopOf="parent" />
107+
app:layout_constraintTop_toTopOf="@id/border_view" />
81108

82109
<Spinner
83110
android:id="@+id/spinner_range_ch1_cp"
84111
android:layout_width="wrap_content"
85112
android:layout_height="@dimen/osc_spinner_height"
86113
app:layout_constraintLeft_toRightOf="@+id/tv_range1_cp"
87-
app:layout_constraintTop_toTopOf="parent"
114+
app:layout_constraintTop_toTopOf="@id/border_view"
88115
android:layout_marginStart="@dimen/osc_cb_margin" />
89116

90117
<TextView

0 commit comments

Comments
 (0)