Skip to content

Commit a4c083e

Browse files
litetexlitetex
committed
Rework dialog
* De-Duplicated some fields * Use a container for the pitch controls * Name pitch related elements correctly
1 parent e4f2028 commit a4c083e

1 file changed

Lines changed: 153 additions & 149 deletions

File tree

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

Lines changed: 153 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<RelativeLayout
3030
android:id="@+id/tempoControl"
3131
android:layout_width="match_parent"
32-
android:layout_height="40dp"
32+
android:layout_height="wrap_content"
3333
android:layout_below="@id/tempoControlText"
3434
android:layout_marginTop="3dp"
3535
android:orientation="horizontal">
@@ -146,203 +146,207 @@
146146
android:textStyle="bold" />
147147

148148
<RelativeLayout
149-
android:id="@+id/pitchControl"
149+
android:id="@+id/pitchControlContainer"
150150
android:layout_width="match_parent"
151-
android:layout_height="40dp"
151+
android:layout_height="wrap_content"
152152
android:layout_below="@id/pitchControlText"
153-
android:layout_marginTop="3dp"
154-
android:orientation="horizontal">
155-
156-
<org.schabi.newpipe.views.NewPipeTextView
157-
android:id="@+id/pitchStepDown"
158-
android:layout_width="wrap_content"
159-
android:layout_height="match_parent"
160-
android:layout_alignParentStart="true"
161-
android:layout_centerVertical="true"
162-
android:background="?attr/selectableItemBackground"
163-
android:clickable="true"
164-
android:focusable="true"
165-
android:gravity="center"
166-
android:text="--%"
167-
android:textColor="?attr/colorAccent"
168-
android:textStyle="bold"
169-
tools:ignore="HardcodedText"
170-
tools:text="-5%" />
153+
android:layout_marginTop="3dp">
171154

172155
<RelativeLayout
173-
android:id="@+id/pitchDisplay"
156+
android:id="@+id/pitchPercentControl"
174157
android:layout_width="match_parent"
175158
android:layout_height="match_parent"
176-
android:layout_marginLeft="4dp"
177-
android:layout_marginRight="4dp"
178-
android:layout_toStartOf="@+id/pitchStepUp"
179-
android:layout_toEndOf="@+id/pitchStepDown"
180159
android:orientation="horizontal">
181160

182161
<org.schabi.newpipe.views.NewPipeTextView
183-
android:id="@+id/pitchMinimumText"
162+
android:id="@+id/pitchPercentStepDown"
184163
android:layout_width="wrap_content"
185-
android:layout_height="wrap_content"
164+
android:layout_height="match_parent"
186165
android:layout_alignParentStart="true"
187-
android:layout_marginStart="4dp"
188-
android:gravity="center"
189-
android:text="---%"
190-
android:textColor="?attr/colorAccent"
191-
tools:ignore="HardcodedText"
192-
tools:text="25%" />
193-
194-
<org.schabi.newpipe.views.NewPipeTextView
195-
android:id="@+id/pitchCurrentText"
196-
android:layout_width="wrap_content"
197-
android:layout_height="wrap_content"
198-
android:layout_centerHorizontal="true"
166+
android:layout_centerVertical="true"
167+
android:background="?attr/selectableItemBackground"
168+
android:clickable="true"
169+
android:focusable="true"
199170
android:gravity="center"
200-
android:text="---%"
171+
android:text="--%"
201172
android:textColor="?attr/colorAccent"
202173
android:textStyle="bold"
203174
tools:ignore="HardcodedText"
204-
tools:text="100%" />
175+
tools:text="-5%" />
176+
177+
<RelativeLayout
178+
android:id="@+id/pitchPercentDisplay"
179+
android:layout_width="match_parent"
180+
android:layout_height="match_parent"
181+
android:layout_marginLeft="4dp"
182+
android:layout_marginRight="4dp"
183+
android:layout_toStartOf="@+id/pitchPercentStepUp"
184+
android:layout_toEndOf="@+id/pitchPercentStepDown"
185+
android:orientation="horizontal">
186+
187+
<org.schabi.newpipe.views.NewPipeTextView
188+
android:id="@+id/pitchPercentMinimumText"
189+
android:layout_width="wrap_content"
190+
android:layout_height="wrap_content"
191+
android:layout_alignParentStart="true"
192+
android:layout_marginStart="4dp"
193+
android:gravity="center"
194+
android:text="---%"
195+
android:textColor="?attr/colorAccent"
196+
tools:ignore="HardcodedText"
197+
tools:text="25%" />
198+
199+
<org.schabi.newpipe.views.NewPipeTextView
200+
android:id="@+id/pitchPercentCurrentText"
201+
android:layout_width="wrap_content"
202+
android:layout_height="wrap_content"
203+
android:layout_centerHorizontal="true"
204+
android:gravity="center"
205+
android:text="---%"
206+
android:textColor="?attr/colorAccent"
207+
android:textStyle="bold"
208+
tools:ignore="HardcodedText"
209+
tools:text="100%" />
210+
211+
<org.schabi.newpipe.views.NewPipeTextView
212+
android:id="@+id/pitchPercentMaximumText"
213+
android:layout_width="wrap_content"
214+
android:layout_height="wrap_content"
215+
android:layout_alignParentEnd="true"
216+
android:layout_marginEnd="4dp"
217+
android:gravity="center"
218+
android:text="---%"
219+
android:textColor="?attr/colorAccent"
220+
tools:ignore="HardcodedText"
221+
tools:text="300%" />
222+
223+
<androidx.appcompat.widget.AppCompatSeekBar
224+
android:id="@+id/pitchPercentSeekbar"
225+
style="@style/Widget.AppCompat.SeekBar"
226+
android:layout_width="match_parent"
227+
android:layout_height="wrap_content"
228+
android:layout_below="@+id/pitchPercentCurrentText"
229+
android:paddingBottom="4dp"
230+
tools:progress="50" />
231+
</RelativeLayout>
205232

206233
<org.schabi.newpipe.views.NewPipeTextView
207-
android:id="@+id/pitchMaximumText"
234+
android:id="@+id/pitchPercentStepUp"
208235
android:layout_width="wrap_content"
209-
android:layout_height="wrap_content"
236+
android:layout_height="match_parent"
210237
android:layout_alignParentEnd="true"
238+
android:layout_centerVertical="true"
211239
android:layout_marginEnd="4dp"
240+
android:background="?attr/selectableItemBackground"
241+
android:clickable="true"
242+
android:focusable="true"
212243
android:gravity="center"
213-
android:text="---%"
244+
android:text="+-%"
214245
android:textColor="?attr/colorAccent"
246+
android:textStyle="bold"
215247
tools:ignore="HardcodedText"
216-
tools:text="300%" />
217-
218-
<androidx.appcompat.widget.AppCompatSeekBar
219-
android:id="@+id/pitchSeekbar"
220-
style="@style/Widget.AppCompat.SeekBar"
221-
android:layout_width="match_parent"
222-
android:layout_height="wrap_content"
223-
android:layout_below="@+id/pitchCurrentText"
224-
android:paddingBottom="4dp"
225-
tools:progress="50" />
248+
tools:text="+5%" />
226249
</RelativeLayout>
227250

228-
<org.schabi.newpipe.views.NewPipeTextView
229-
android:id="@+id/pitchStepUp"
230-
android:layout_width="wrap_content"
231-
android:layout_height="match_parent"
232-
android:layout_alignParentEnd="true"
233-
android:layout_centerVertical="true"
234-
android:layout_marginEnd="4dp"
235-
android:background="?attr/selectableItemBackground"
236-
android:clickable="true"
237-
android:focusable="true"
238-
android:gravity="center"
239-
android:text="+-%"
240-
android:textColor="?attr/colorAccent"
241-
android:textStyle="bold"
242-
tools:ignore="HardcodedText"
243-
tools:text="+5%" />
244-
</RelativeLayout>
245-
246-
<RelativeLayout
247-
android:id="@+id/semitoneControl"
248-
android:layout_width="match_parent"
249-
android:layout_height="40dp"
250-
android:layout_below="@id/pitchControlText"
251-
android:layout_marginTop="4dp"
252-
android:orientation="horizontal">
253-
254-
<org.schabi.newpipe.views.NewPipeTextView
255-
android:id="@+id/semitoneStepDown"
256-
android:layout_width="24dp"
257-
android:layout_height="match_parent"
258-
android:layout_alignParentStart="true"
259-
android:layout_centerVertical="true"
260-
android:background="?attr/selectableItemBackground"
261-
android:clickable="true"
262-
android:focusable="true"
263-
android:gravity="center"
264-
android:text="♭"
265-
android:textColor="?attr/colorAccent"
266-
android:textSize="24sp"
267-
android:textStyle="bold"
268-
tools:ignore="HardcodedText" />
269-
270251
<RelativeLayout
271-
android:id="@+id/semitoneDisplay"
252+
android:id="@+id/pitchSemitoneControl"
272253
android:layout_width="match_parent"
273254
android:layout_height="match_parent"
274-
android:layout_marginLeft="4dp"
275-
android:layout_marginRight="4dp"
276-
android:layout_toStartOf="@+id/semitoneStepUp"
277-
android:layout_toEndOf="@+id/semitoneStepDown"
278255
android:orientation="horizontal">
279256

280257
<org.schabi.newpipe.views.NewPipeTextView
281-
android:id="@+id/semitoneMinimumText"
282-
android:layout_width="wrap_content"
283-
android:layout_height="wrap_content"
258+
android:id="@+id/pitchSemitoneStepDown"
259+
android:layout_width="24dp"
260+
android:layout_height="match_parent"
284261
android:layout_alignParentStart="true"
285-
android:layout_marginStart="4dp"
286-
android:gravity="center"
287-
android:text="-12"
288-
android:textColor="?attr/colorAccent"
289-
tools:ignore="HardcodedText"/>
290-
291-
<org.schabi.newpipe.views.NewPipeTextView
292-
android:id="@+id/semitoneCurrentText"
293-
android:layout_width="wrap_content"
294-
android:layout_height="wrap_content"
295-
android:layout_centerHorizontal="true"
262+
android:layout_centerVertical="true"
263+
android:background="?attr/selectableItemBackground"
264+
android:clickable="true"
265+
android:focusable="true"
296266
android:gravity="center"
267+
android:text="♭"
297268
android:textColor="?attr/colorAccent"
269+
android:textSize="24sp"
298270
android:textStyle="bold"
299-
tools:text="0" />
271+
tools:ignore="HardcodedText" />
272+
273+
<RelativeLayout
274+
android:id="@+id/pitchSemitoneDisplay"
275+
android:layout_width="match_parent"
276+
android:layout_height="match_parent"
277+
android:layout_marginLeft="4dp"
278+
android:layout_marginRight="4dp"
279+
android:layout_toStartOf="@+id/pitchSemitoneStepUp"
280+
android:layout_toEndOf="@+id/pitchSemitoneStepDown"
281+
android:orientation="horizontal">
282+
283+
<org.schabi.newpipe.views.NewPipeTextView
284+
android:id="@+id/pitchSemitoneMinimumText"
285+
android:layout_width="wrap_content"
286+
android:layout_height="wrap_content"
287+
android:layout_alignParentStart="true"
288+
android:layout_marginStart="4dp"
289+
android:gravity="center"
290+
android:text="-12"
291+
android:textColor="?attr/colorAccent"
292+
tools:ignore="HardcodedText" />
293+
294+
<org.schabi.newpipe.views.NewPipeTextView
295+
android:id="@+id/pitchSemitoneCurrentText"
296+
android:layout_width="wrap_content"
297+
android:layout_height="wrap_content"
298+
android:layout_centerHorizontal="true"
299+
android:gravity="center"
300+
android:textColor="?attr/colorAccent"
301+
android:textStyle="bold"
302+
tools:text="0" />
303+
304+
<org.schabi.newpipe.views.NewPipeTextView
305+
android:id="@+id/pitchSemitoneMaximumText"
306+
android:layout_width="wrap_content"
307+
android:layout_height="wrap_content"
308+
android:layout_alignParentEnd="true"
309+
android:layout_marginEnd="4dp"
310+
android:gravity="center"
311+
android:text="+12"
312+
android:textColor="?attr/colorAccent"
313+
tools:ignore="HardcodedText" />
314+
315+
<androidx.appcompat.widget.AppCompatSeekBar
316+
android:id="@+id/pitchSemitoneSeekbar"
317+
style="@style/Widget.AppCompat.SeekBar"
318+
android:layout_width="match_parent"
319+
android:layout_height="wrap_content"
320+
android:layout_below="@+id/pitchSemitoneCurrentText"
321+
android:max="24"
322+
android:paddingBottom="4dp"
323+
android:progress="12" />
324+
</RelativeLayout>
300325

301326
<org.schabi.newpipe.views.NewPipeTextView
302-
android:id="@+id/semitoneMaximumText"
303-
android:layout_width="wrap_content"
304-
android:layout_height="wrap_content"
327+
android:id="@+id/pitchSemitoneStepUp"
328+
android:layout_width="24dp"
329+
android:layout_height="match_parent"
305330
android:layout_alignParentEnd="true"
331+
android:layout_centerVertical="true"
306332
android:layout_marginEnd="4dp"
333+
android:background="?attr/selectableItemBackground"
334+
android:clickable="true"
335+
android:focusable="true"
307336
android:gravity="center"
308-
android:text="+12"
337+
android:text="♯"
309338
android:textColor="?attr/colorAccent"
339+
android:textSize="20sp"
340+
android:textStyle="bold"
310341
tools:ignore="HardcodedText" />
311-
312-
<androidx.appcompat.widget.AppCompatSeekBar
313-
android:id="@+id/semitoneSeekbar"
314-
style="@style/Widget.AppCompat.SeekBar"
315-
android:layout_width="match_parent"
316-
android:layout_height="wrap_content"
317-
android:layout_below="@+id/semitoneCurrentText"
318-
android:max="24"
319-
android:paddingBottom="4dp"
320-
android:progress="12" />
321342
</RelativeLayout>
322-
323-
<org.schabi.newpipe.views.NewPipeTextView
324-
android:id="@+id/semitoneStepUp"
325-
android:layout_width="24dp"
326-
android:layout_height="match_parent"
327-
android:layout_alignParentEnd="true"
328-
android:layout_centerVertical="true"
329-
android:layout_marginEnd="4dp"
330-
android:background="?attr/selectableItemBackground"
331-
android:clickable="true"
332-
android:focusable="true"
333-
android:gravity="center"
334-
android:text="♯"
335-
android:textColor="?attr/colorAccent"
336-
android:textSize="20sp"
337-
android:textStyle="bold"
338-
tools:ignore="HardcodedText" />
339343
</RelativeLayout>
340344

341345
<View
342346
android:id="@+id/separatorStepSizeSelector"
343347
android:layout_width="match_parent"
344348
android:layout_height="1dp"
345-
android:layout_below="@+id/semitoneControl"
349+
android:layout_below="@+id/pitchControlContainer"
346350
android:layout_marginStart="12dp"
347351
android:layout_marginTop="6dp"
348352
android:layout_marginEnd="12dp"

0 commit comments

Comments
 (0)