Merge remote-tracking branch 'origin/master'

This commit is contained in:
Blatzar 2022-12-09 18:20:19 +01:00
commit 0d7c20e3bd
3 changed files with 6 additions and 4 deletions

View file

@ -3,14 +3,14 @@
<item android:id="@android:id/background"> <item android:id="@android:id/background">
<shape> <shape>
<corners android:radius="8dp"/> <corners android:radius="8dp"/>
<solid android:color="@color/darkBarTransparent"/> <solid android:color="@color/progressBackgroundColor"/>
</shape> </shape>
</item> </item>
<item android:id="@android:id/progress"> <item android:id="@android:id/progress">
<scale android:scaleGravity="bottom" android:scaleWidth="0%" android:scaleHeight="100%"> <scale android:scaleGravity="bottom" android:scaleWidth="0%" android:scaleHeight="100%">
<shape> <shape>
<solid android:color="?attr/colorPrimary"/> <solid android:color="@color/white"/>
<corners android:radius="3dp"/> <corners android:radius="3dp"/>
</shape> </shape>
</scale> </scale>

View file

@ -597,7 +597,7 @@
<ProgressBar <ProgressBar
android:id="@+id/player_progressbar_left" android:id="@+id/player_progressbar_left"
style="@android:style/Widget.Material.ProgressBar.Horizontal" style="@android:style/Widget.Material.ProgressBar.Horizontal"
android:layout_width="4dp" android:layout_width="5dp"
android:layout_height="150dp" android:layout_height="150dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
@ -639,7 +639,7 @@
<ProgressBar <ProgressBar
android:id="@+id/player_progressbar_right" android:id="@+id/player_progressbar_right"
style="@android:style/Widget.Material.ProgressBar.Horizontal" style="@android:style/Widget.Material.ProgressBar.Horizontal"
android:layout_width="4dp" android:layout_width="5dp"
android:layout_height="150dp" android:layout_height="150dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"

View file

@ -25,6 +25,8 @@
<color name="whiteText">#FFF</color> <color name="whiteText">#FFF</color>
<color name="blackText">#000</color> <color name="blackText">#000</color>
<color name="progressBackgroundColor">#1AFFFFFF</color>
<color name="dubColorText">#121950</color> <!--3b65f5 f18c82 8294F1--> <color name="dubColorText">#121950</color> <!--3b65f5 f18c82 8294F1-->
<color name="amoledModeLight">#121213</color> <color name="amoledModeLight">#121213</color>