mirror of
https://github.com/recloudstream/cloudstream.git
synced 2024-08-15 01:53:11 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0d7c20e3bd
3 changed files with 6 additions and 4 deletions
|
@ -3,14 +3,14 @@
|
|||
<item android:id="@android:id/background">
|
||||
<shape>
|
||||
<corners android:radius="8dp"/>
|
||||
<solid android:color="@color/darkBarTransparent"/>
|
||||
<solid android:color="@color/progressBackgroundColor"/>
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item android:id="@android:id/progress">
|
||||
<scale android:scaleGravity="bottom" android:scaleWidth="0%" android:scaleHeight="100%">
|
||||
<shape>
|
||||
<solid android:color="?attr/colorPrimary"/>
|
||||
<solid android:color="@color/white"/>
|
||||
<corners android:radius="3dp"/>
|
||||
</shape>
|
||||
</scale>
|
||||
|
|
|
@ -597,7 +597,7 @@
|
|||
<ProgressBar
|
||||
android:id="@+id/player_progressbar_left"
|
||||
style="@android:style/Widget.Material.ProgressBar.Horizontal"
|
||||
android:layout_width="4dp"
|
||||
android:layout_width="5dp"
|
||||
android:layout_height="150dp"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_gravity="end|center_vertical"
|
||||
|
@ -639,7 +639,7 @@
|
|||
<ProgressBar
|
||||
android:id="@+id/player_progressbar_right"
|
||||
style="@android:style/Widget.Material.ProgressBar.Horizontal"
|
||||
android:layout_width="4dp"
|
||||
android:layout_width="5dp"
|
||||
android:layout_height="150dp"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_gravity="end|center_vertical"
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
<color name="whiteText">#FFF</color>
|
||||
<color name="blackText">#000</color>
|
||||
|
||||
<color name="progressBackgroundColor">#1AFFFFFF</color>
|
||||
|
||||
<color name="dubColorText">#121950</color> <!--3b65f5 f18c82 8294F1-->
|
||||
<color name="amoledModeLight">#121213</color>
|
||||
|
||||
|
|
Loading…
Reference in a new issue