Skip to content

Commit 0eb8c9e

Browse files
neel1998neel1998
committed
changes made to wave generator ui
1 parent 4e89f60 commit 0eb8c9e

12 files changed

+148
-272
lines changed

‎app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java‎

Lines changed: 74 additions & 110 deletions
Large diffs are not rendered by default.

‎app/src/main/res/drawable/btn_back_rounded.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<item android:state_enabled="false">
55
<shape android:shape="rectangle">
66
<solid android:color="@color/theme_red_light" />
7-
<corners android:radius="5dp" />
7+
<corners android:radius="@dimen/button_bg_radius" />
88
</shape>
99
</item>
1010
<item android:state_enabled="true">
1111
<shape android:shape="rectangle">
1212
<solid android:color="@color/colorPrimary" />
13-
<corners android:radius="5dp" />
13+
<corners android:radius="@dimen/button_bg_radius" />
1414
</shape>
1515
</item>
1616
</selector>

‎app/src/main/res/drawable/btn_back_rounded_light.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<solid android:color="@color/theme_red_light" />
5+
<corners android:radius="@dimen/button_bg_radius" />
6+
</shape>

‎app/src/main/res/drawable/ic_arrow_left_24dp.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector android:height="24dp" android:tint="#FFFFFF"
2+
android:viewportHeight="24.0" android:viewportWidth="24.0"
3+
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
4+
<path android:fillColor="#FF000000" android:pathData="M15.41,16.09l-4.58,-4.59 4.58,-4.59L14,5.5l-6,6 6,6z"/>
5+
</vector>

‎app/src/main/res/drawable/ic_arrow_right_24dp.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector android:height="24dp" android:tint="#FFFFFF"
2+
android:viewportHeight="24.0" android:viewportWidth="24.0"
3+
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
4+
<path android:fillColor="#FF000000" android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
5+
</vector>

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

Lines changed: 6 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,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"
44
android:id="@+id/square_mode_layout"
5-
android:layout_width="@dimen/length_0dp"
6-
android:layout_height="@dimen/length_0dp"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
77
android:layout_marginEnd="@dimen/card_separation_offset"
88
android:background="@color/black">
99

@@ -15,14 +15,6 @@
1515
app:layout_constraintGuide_begin="@dimen/constraint_guide_begin"
1616
app:layout_constraintGuide_percent="0.5" />
1717

18-
<android.support.constraint.Guideline
19-
android:id="@+id/fguideline3"
20-
android:layout_width="wrap_content"
21-
android:layout_height="wrap_content"
22-
android:orientation="horizontal"
23-
app:layout_constraintGuide_begin="@dimen/constraint_guide_begin"
24-
app:layout_constraintGuide_percent="0.20" />
25-
2618
<android.support.constraint.Guideline
2719
android:id="@+id/fguideline9"
2820
android:layout_width="wrap_content"
@@ -37,7 +29,7 @@
3729
android:layout_height="wrap_content"
3830
android:orientation="vertical"
3931
app:layout_constraintGuide_begin="@dimen/constraint_guide_begin"
40-
app:layout_constraintGuide_percent="0.35" />
32+
app:layout_constraintGuide_percent="0.20" />
4133

4234
<ImageView
4335
android:id="@+id/wave_ic_img"
@@ -46,42 +38,11 @@
4638
app:layout_constraintBottom_toTopOf="@+id/wave_mon_select_wave"
4739
app:layout_constraintEnd_toStartOf="@+id/fguideline10"
4840
app:layout_constraintStart_toStartOf="parent"
49-
app:layout_constraintTop_toTopOf="@+id/fguideline3"
41+
app:layout_constraintTop_toTopOf="parent"
5042
app:layout_constraintVertical_bias="0.45"
5143
app:layout_constraintVertical_chainStyle="packed"
5244
app:srcCompat="@drawable/ic_triangular" />
5345

54-
<TextView
55-
android:id="@+id/wave_mon_wave1"
56-
android:layout_width="wrap_content"
57-
android:layout_height="wrap_content"
58-
android:layout_marginEnd="@dimen/mon_title_sep_margin"
59-
android:enabled="false"
60-
android:text="@string/wave1"
61-
android:textColor="@drawable/text_color_selector"
62-
android:textSize="@dimen/text_size_wavegen"
63-
android:textStyle="bold"
64-
app:layout_constraintBottom_toTopOf="@+id/fguideline3"
65-
app:layout_constraintEnd_toStartOf="@+id/fguideline2"
66-
app:layout_constraintStart_toStartOf="parent"
67-
app:layout_constraintTop_toTopOf="parent" />
68-
69-
<TextView
70-
android:id="@+id/wave_mon_wave2"
71-
android:layout_width="wrap_content"
72-
android:layout_height="wrap_content"
73-
android:layout_marginStart="@dimen/mon_title_sep_margin"
74-
android:enabled="false"
75-
android:text="@string/wave2"
76-
android:textColor="@drawable/text_color_selector"
77-
android:textSize="@dimen/text_size_wavegen"
78-
android:textStyle="bold"
79-
app:layout_constraintBottom_toBottomOf="@+id/wave_mon_wave1"
80-
app:layout_constraintEnd_toEndOf="parent"
81-
app:layout_constraintStart_toEndOf="@id/fguideline2"
82-
app:layout_constraintTop_toTopOf="@+id/wave_mon_wave1" />
83-
84-
8546
<TextView
8647
android:id="@+id/wave_mon_select_wave"
8748
android:layout_width="wrap_content"
@@ -108,7 +69,7 @@
10869
android:textStyle="bold"
10970
app:layout_constraintBottom_toTopOf="@+id/wave_phase"
11071
app:layout_constraintStart_toStartOf="@+id/fguideline10"
111-
app:layout_constraintTop_toTopOf="@+id/fguideline3"
72+
app:layout_constraintTop_toTopOf="parent"
11273
app:layout_constraintVertical_chainStyle="packed" />
11374

11475
<TextView
@@ -186,20 +147,9 @@
186147
android:background="@color/dark_grey"
187148
app:layout_constraintBottom_toTopOf="@+id/fguideline9"
188149
app:layout_constraintEnd_toEndOf="parent"
189-
app:layout_constraintHorizontal_bias="0.35"
190-
app:layout_constraintStart_toStartOf="parent"
191-
app:layout_constraintTop_toBottomOf="@+id/fguideline3" />
192-
193-
<View
194-
android:layout_width="@dimen/length_0dp"
195-
android:layout_height="@dimen/divider_width"
196-
android:background="@color/dark_grey"
197-
app:layout_constraintBottom_toBottomOf="parent"
198-
app:layout_constraintEnd_toEndOf="parent"
199150
app:layout_constraintHorizontal_bias="0.20"
200151
app:layout_constraintStart_toStartOf="parent"
201-
app:layout_constraintTop_toTopOf="parent"
202-
app:layout_constraintVertical_bias="0.20" />
152+
app:layout_constraintTop_toTopOf="parent" />
203153

204154
<View
205155
android:layout_width="@dimen/length_0dp"

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

Lines changed: 5 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,11 @@
22
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/pwm_mode_layout"
5-
android:layout_width="@dimen/length_0dp"
6-
android:layout_height="@dimen/length_0dp"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
77
android:layout_marginEnd="@dimen/card_separation_offset"
88
android:background="@color/black">
99

10-
<android.support.constraint.Guideline
11-
android:id="@+id/guideline3"
12-
android:layout_width="wrap_content"
13-
android:layout_height="wrap_content"
14-
android:orientation="horizontal"
15-
app:layout_constraintGuide_begin="@dimen/constraint_guide_begin"
16-
app:layout_constraintGuide_percent="0.20" />
17-
1810
<android.support.constraint.Guideline
1911
android:id="@+id/guideline9"
2012
android:layout_width="wrap_content"
@@ -54,7 +46,7 @@
5446
app:layout_constraintBottom_toTopOf="@+id/pwm_mon_mode_select"
5547
app:layout_constraintEnd_toStartOf="@+id/guideline10"
5648
app:layout_constraintStart_toStartOf="parent"
57-
app:layout_constraintTop_toTopOf="@+id/guideline3"
49+
app:layout_constraintTop_toTopOf="parent"
5850
app:layout_constraintVertical_bias="0.45"
5951
app:layout_constraintVertical_chainStyle="packed"
6052
app:srcCompat="@drawable/ic_pwm_pic" />
@@ -73,64 +65,6 @@
7365
app:layout_constraintStart_toStartOf="@+id/pwm_ic_img"
7466
app:layout_constraintTop_toBottomOf="@+id/pwm_ic_img" />
7567

76-
<TextView
77-
android:id="@+id/pwm_mon_sq1"
78-
android:layout_width="wrap_content"
79-
android:layout_height="wrap_content"
80-
android:enabled="false"
81-
android:text="@string/text_sq1"
82-
android:textColor="@drawable/text_color_selector"
83-
android:textSize="@dimen/text_size_wavegen"
84-
android:textStyle="bold"
85-
app:layout_constraintBottom_toTopOf="@+id/guideline3"
86-
app:layout_constraintEnd_toStartOf="@+id/pwm_mon_sq2"
87-
app:layout_constraintStart_toStartOf="@+id/guideline12"
88-
app:layout_constraintTop_toTopOf="parent" />
89-
90-
<TextView
91-
android:id="@+id/pwm_mon_sq2"
92-
android:layout_width="wrap_content"
93-
android:layout_height="wrap_content"
94-
android:enabled="false"
95-
android:text="@string/text_sq2"
96-
android:textColor="@drawable/text_color_selector"
97-
android:textSize="@dimen/text_size_wavegen"
98-
android:textStyle="bold"
99-
app:layout_constraintBottom_toTopOf="@+id/guideline3"
100-
app:layout_constraintEnd_toStartOf="@+id/pwm_mon_sq3"
101-
app:layout_constraintHorizontal_bias="0.5"
102-
app:layout_constraintStart_toEndOf="@+id/pwm_mon_sq1"
103-
app:layout_constraintTop_toTopOf="parent" />
104-
105-
<TextView
106-
android:id="@+id/pwm_mon_sq3"
107-
android:layout_width="wrap_content"
108-
android:layout_height="wrap_content"
109-
android:enabled="false"
110-
android:text="@string/text_sq3"
111-
android:textColor="@drawable/text_color_selector"
112-
android:textSize="@dimen/text_size_wavegen"
113-
android:textStyle="bold"
114-
app:layout_constraintBottom_toTopOf="@+id/guideline3"
115-
app:layout_constraintEnd_toStartOf="@+id/pwm_mon_sq4"
116-
app:layout_constraintHorizontal_bias="0.5"
117-
app:layout_constraintStart_toEndOf="@+id/pwm_mon_sq2"
118-
app:layout_constraintTop_toTopOf="parent" />
119-
120-
<TextView
121-
android:id="@+id/pwm_mon_sq4"
122-
android:layout_width="wrap_content"
123-
android:layout_height="wrap_content"
124-
android:enabled="false"
125-
android:text="@string/text_sq4"
126-
android:textColor="@drawable/text_color_selector"
127-
android:textSize="@dimen/text_size_wavegen"
128-
android:textStyle="bold"
129-
app:layout_constraintBottom_toTopOf="@+id/guideline3"
130-
app:layout_constraintEnd_toStartOf="@+id/guideline13"
131-
app:layout_constraintStart_toEndOf="@+id/pwm_mon_sq3"
132-
app:layout_constraintTop_toTopOf="parent" />
133-
13468
<TextView
13569
android:id="@+id/pwm_freq"
13670
android:layout_width="wrap_content"
@@ -142,7 +76,7 @@
14276
android:textStyle="bold"
14377
app:layout_constraintBottom_toTopOf="@+id/pwm_phase"
14478
app:layout_constraintStart_toStartOf="@+id/guideline10"
145-
app:layout_constraintTop_toTopOf="@+id/guideline3"
79+
app:layout_constraintTop_toTopOf="parent"
14680
app:layout_constraintVertical_chainStyle="packed" />
14781

14882
<TextView
@@ -222,18 +156,7 @@
222156
app:layout_constraintEnd_toEndOf="parent"
223157
app:layout_constraintHorizontal_bias="0.20"
224158
app:layout_constraintStart_toStartOf="parent"
225-
app:layout_constraintTop_toBottomOf="@+id/guideline3" />
226-
227-
<View
228-
android:layout_width="@dimen/length_0dp"
229-
android:layout_height="@dimen/divider_width"
230-
android:background="@color/dark_grey"
231-
app:layout_constraintBottom_toBottomOf="parent"
232-
app:layout_constraintEnd_toEndOf="parent"
233-
app:layout_constraintHorizontal_bias="0.20"
234-
app:layout_constraintStart_toStartOf="parent"
235-
app:layout_constraintTop_toTopOf="parent"
236-
app:layout_constraintVertical_bias="0.20" />
159+
app:layout_constraintTop_toTopOf="parent" />
237160

238161
<View
239162
android:layout_width="@dimen/length_0dp"

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,37 @@
1717
android:text="@string/produce_sound_text"
1818
android:textAllCaps="false"
1919
android:textColor="@color/white"
20-
android:textSize="14sp" />
20+
android:textSize="@dimen/wave_gen_control_text_size" />
2121

2222
<Button
23-
android:id="@+id/pwm_btn_mode"
23+
android:id="@+id/analog_mode_btn"
2424
android:layout_width="match_parent"
2525
android:layout_height="match_parent"
2626
android:layout_marginStart="@dimen/margin_btn"
2727
android:layout_marginTop="@dimen/margin_btn"
28-
android:layout_marginEnd="@dimen/margin_btn"
2928
android:layout_marginBottom="@dimen/margin_btn"
3029
android:layout_weight="1"
3130
android:background="@drawable/btn_back_rounded"
3231
android:minWidth="@dimen/btn_min_width"
3332
android:stateListAnimator="@animator/selector_animator"
34-
android:text="@string/mode"
33+
android:text="@string/text_analog"
34+
android:textAllCaps="false"
35+
android:textColor="@color/white"
36+
android:textSize="@dimen/wave_gen_control_text_size" />
37+
<Button
38+
android:id="@+id/digital_mode_btn"
39+
android:layout_width="match_parent"
40+
android:layout_height="match_parent"
41+
android:layout_marginStart="@dimen/margin_btn"
42+
android:layout_marginTop="@dimen/margin_btn"
43+
android:layout_marginEnd="@dimen/margin_btn"
44+
android:layout_marginBottom="@dimen/margin_btn"
45+
android:layout_weight="1"
46+
android:background="@drawable/btn_back_rounded_light"
47+
android:minWidth="@dimen/btn_min_width"
48+
android:stateListAnimator="@animator/selector_animator"
49+
android:text="@string/text_digital"
3550
android:textAllCaps="false"
3651
android:textColor="@color/white"
37-
android:textSize="14sp" />
52+
android:textSize="@dimen/wave_gen_control_text_size" />
3853
</LinearLayout>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
android:id="@+id/img_btn_down"
1212
android:layout_width="@dimen/length_0dp"
1313
android:layout_height="wrap_content"
14+
android:padding="@dimen/btn_padding"
1415
android:layout_marginLeft="@dimen/seek_btn_margin"
1516
android:layout_marginRight="@dimen/seek_btn_margin"
1617
android:layout_weight="0.1"
1718
android:background="@drawable/btn_back_rounded"
18-
android:src="@drawable/ic_arrow_drop_down_black_24dp"
19+
android:src="@drawable/ic_arrow_left_24dp"
1920
android:stateListAnimator="@animator/selector_animator" />
2021

2122
<com.warkiz.widget.IndicatorSeekBar
@@ -38,11 +39,12 @@
3839
android:id="@+id/img_btn_up"
3940
android:layout_width="@dimen/length_0dp"
4041
android:layout_height="wrap_content"
42+
android:padding="@dimen/btn_padding"
4143
android:layout_marginLeft="@dimen/seek_btn_margin"
4244
android:layout_marginRight="@dimen/seek_btn_margin"
4345
android:layout_weight="0.1"
4446
android:background="@drawable/btn_back_rounded"
45-
android:src="@drawable/ic_arrow_drop_up_black_24dp"
47+
android:src="@drawable/ic_arrow_right_24dp"
4648
android:stateListAnimator="@animator/selector_animator" />
4749

4850
</LinearLayout>

0 commit comments

Comments
 (0)