be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Rework dialog 

* De-Duplicated some fields
* Use a container for the pitch controls
* Name pitch related elements correctly
This commit is contained in:
litetex 2022-03-01 20:52:48 +01:00
parent e4f202834c
commit a4c083e7f9
1 changed files with 157 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/src/main/res/layout/dialog_playback_parameter.xml
View File

@ -29,7 +29,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/tempoControl" android:id="@+id/tempoControl"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="wrap_content"
android:layout_below="@id/tempoControlText" android:layout_below="@id/tempoControlText"
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:orientation="horizontal"> android:orientation="horizontal">
@ -146,15 +146,20 @@
android:textStyle="bold" /> android:textStyle="bold" />
<RelativeLayout <RelativeLayout
android:id="@+id/pitchControl" android:id="@+id/pitchControlContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="wrap_content"
android:layout_below="@id/pitchControlText" android:layout_below="@id/pitchControlText"
android:layout_marginTop="3dp" android:layout_marginTop="3dp">
<RelativeLayout
android:id="@+id/pitchPercentControl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"> android:orientation="horizontal">
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/pitchStepDown" android:id="@+id/pitchPercentStepDown"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
@ -170,17 +175,17 @@
tools:text="-5%" /> tools:text="-5%" />
<RelativeLayout <RelativeLayout
android:id="@+id/pitchDisplay" android:id="@+id/pitchPercentDisplay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:layout_toStartOf="@+id/pitchStepUp" android:layout_toStartOf="@+id/pitchPercentStepUp"
android:layout_toEndOf="@+id/pitchStepDown" android:layout_toEndOf="@+id/pitchPercentStepDown"
android:orientation="horizontal"> android:orientation="horizontal">
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/pitchMinimumText" android:id="@+id/pitchPercentMinimumText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
@ -192,7 +197,7 @@
tools:text="25%" /> tools:text="25%" />
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/pitchCurrentText" android:id="@+id/pitchPercentCurrentText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@ -204,7 +209,7 @@
tools:text="100%" /> tools:text="100%" />
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/pitchMaximumText" android:id="@+id/pitchPercentMaximumText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
@ -216,17 +221,17 @@
tools:text="300%" /> tools:text="300%" />
<androidx.appcompat.widget.AppCompatSeekBar <androidx.appcompat.widget.AppCompatSeekBar
android:id="@+id/pitchSeekbar" android:id="@+id/pitchPercentSeekbar"
style="@style/Widget.AppCompat.SeekBar" style="@style/Widget.AppCompat.SeekBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/pitchCurrentText" android:layout_below="@+id/pitchPercentCurrentText"
android:paddingBottom="4dp" android:paddingBottom="4dp"
tools:progress="50" /> tools:progress="50" />
</RelativeLayout> </RelativeLayout>
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/pitchStepUp" android:id="@+id/pitchPercentStepUp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
@ -244,15 +249,13 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/semitoneControl" android:id="@+id/pitchSemitoneControl"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="match_parent"
android:layout_below="@id/pitchControlText"
android:layout_marginTop="4dp"
android:orientation="horizontal"> android:orientation="horizontal">
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/semitoneStepDown" android:id="@+id/pitchSemitoneStepDown"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
@ -268,17 +271,17 @@
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<RelativeLayout <RelativeLayout
android:id="@+id/semitoneDisplay" android:id="@+id/pitchSemitoneDisplay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:layout_toStartOf="@+id/semitoneStepUp" android:layout_toStartOf="@+id/pitchSemitoneStepUp"
android:layout_toEndOf="@+id/semitoneStepDown" android:layout_toEndOf="@+id/pitchSemitoneStepDown"
android:orientation="horizontal"> android:orientation="horizontal">
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/semitoneMinimumText" android:id="@+id/pitchSemitoneMinimumText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
@ -286,10 +289,10 @@
android:gravity="center" android:gravity="center"
android:text="-12" android:text="-12"
android:textColor="?attr/colorAccent" android:textColor="?attr/colorAccent"
tools:ignore="HardcodedText"/> tools:ignore="HardcodedText" />
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/semitoneCurrentText" android:id="@+id/pitchSemitoneCurrentText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@ -299,7 +302,7 @@
tools:text="0" /> tools:text="0" />
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/semitoneMaximumText" android:id="@+id/pitchSemitoneMaximumText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
@ -310,18 +313,18 @@
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<androidx.appcompat.widget.AppCompatSeekBar <androidx.appcompat.widget.AppCompatSeekBar
android:id="@+id/semitoneSeekbar" android:id="@+id/pitchSemitoneSeekbar"
style="@style/Widget.AppCompat.SeekBar" style="@style/Widget.AppCompat.SeekBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/semitoneCurrentText" android:layout_below="@+id/pitchSemitoneCurrentText"
android:max="24" android:max="24"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:progress="12" /> android:progress="12" />
</RelativeLayout> </RelativeLayout>
<org.schabi.newpipe.views.NewPipeTextView <org.schabi.newpipe.views.NewPipeTextView
android:id="@+id/semitoneStepUp" android:id="@+id/pitchSemitoneStepUp"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
@ -337,12 +340,13 @@
android:textStyle="bold" android:textStyle="bold"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout>
<View <View
android:id="@+id/separatorStepSizeSelector" android:id="@+id/separatorStepSizeSelector"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_below="@+id/semitoneControl" android:layout_below="@+id/pitchControlContainer"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"