Skip to content

GitLab

Commit 7970e94e authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Geoffrey Métais
Browse files
Options

Fix circle button background color in dialogs

parent fe3f6ee1
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 2 deletions
vlc-android/res/color/dialog_circle_background.xml 0 → 100644
View file @ 7970e94e
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:color="@color/orange500focus"/>
<item android:state_selected="true" android:color="@color/orange500focus"/>
<item android:state_pressed="true" android:color="@color/orange500focus"/>
<item android:color="@color/grey400"/>
</selector>
\ No newline at end of file
vlc-android/res/color/dialog_circle_background_dark.xml 0 → 100644
View file @ 7970e94e
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:color="@color/orange500focus"/>
<item android:state_selected="true" android:color="@color/orange500focus"/>
<item android:state_pressed="true" android:color="@color/orange500focus"/>
<item android:color="@color/grey800"/>
</selector>
\ No newline at end of file
vlc-android/res/drawable/ic_down_on_circle_dialog.xml 0 → 100644
View file @ 7970e94e
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
android:strokeAlpha="1"
android:strokeLineJoin="round"
android:strokeWidth="15.1181097"
android:fillColor="?attr/dialog_circle_background"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="0.75294118"
android:strokeLineCap="butt"/>
<path
android:pathData="m24.0004,32.6215a1.5,1.5 0,0 1,-1.0605 -0.4395l-10.4854,-10.4853 -0.015,-0.015A1.5,1.5 0,0 1,12 20.6211a1.5,1.5 0,0 1,1.5 -1.5,1.5 1.5,0 0,1 1.0605,0.4395L24,29l9.4248,-9.4248a1.5,1.5 0,0 1,1.0752 -0.4541,1.5 1.5,0 0,1 1.5,1.5 1.5,1.5 0,0 1,-0.4395 1.0605L25.0752,32.1671a1.5,1.5 0,0 1,-1.0748 0.4543z"
android:strokeAlpha="1"
android:strokeLineJoin="round"
android:strokeWidth="3"
android:fillColor="?attr/player_icon_color"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1"
android:strokeLineCap="round"/>
</vector>
vlc-android/res/drawable/ic_up_on_circle_dialog.xml 0 → 100644
View file @ 7970e94e
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
android:strokeAlpha="1"
android:strokeLineJoin="round"
android:strokeWidth="15.1181097"
android:fillColor="?attr/dialog_circle_background"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="0.75294118"
android:strokeLineCap="butt"/>
<path
android:pathData="m24.0004,15.303a1.5,1.5 0,0 0,-1.0605 0.4395l-10.4854,10.4853 -0.015,0.015a1.5,1.5 0,0 0,-0.4395 1.0605,1.5 1.5,0 0,0 1.5,1.5 1.5,1.5 0,0 0,1.0605 -0.4395L24,18.9244l9.4248,9.4248a1.5,1.5 0,0 0,1.0752 0.4541,1.5 1.5,0 0,0 1.5,-1.5 1.5,1.5 0,0 0,-0.4395 -1.0605l-10.4853,-10.4855a1.5,1.5 0,0 0,-1.0748 -0.4543z"
android:strokeAlpha="1"
android:strokeLineJoin="round"
android:strokeWidth="3"
android:fillColor="?attr/player_icon_color"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1"
android:strokeLineCap="round"/>
</vector>
vlc-android/res/layout/dialog_playback_speed.xml
View file @ 7970e94e
......@@ -94,7 +94,7 @@
android:padding="0dp"
android:nextFocusUp="@+id/playback_speed_seek"
android:nextFocusDown="@+id/playback_speed_minus"
app:srcCompat="@drawable/ic_up_on_circle_player"
app:srcCompat="@drawable/ic_up_on_circle_dialog"
app:layout_constraintBottom_toTopOf="@+id/playback_speed_minus"
app:layout_constraintEnd_toEndOf="parent"/>
......@@ -108,7 +108,7 @@
android:nextFocusDown="@+id/playback_speed_icon"
app:backgroundTint="@color/transparent"
android:padding="0dp"
app:srcCompat="@drawable/ic_down_on_circle_player"
app:srcCompat="@drawable/ic_down_on_circle_dialog"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
......
vlc-android/res/values/attrs.xml
View file @ 7970e94e
......@@ -70,6 +70,7 @@
<attr name="ic_crop_player" format="reference" />
<attr name="ic_dial" format="reference" />
<attr name="player_icon_color" format="reference" />
<attr name="dialog_circle_background" format="reference"/>
<attr name="shadow_top_9patch" format="reference"/>
<attr name="shadow_bottom_9patch" format="reference"/>
......
vlc-android/res/values/styles.xml
View file @ 7970e94e
......@@ -42,6 +42,7 @@
<item name="audio_browser_separator">@color/orange500</item>
<item name="playlist_item_drag_shadow">@color/orange500</item>
<item name="audio_player_header_time">@color/orange500</item>
<item name="dialog_circle_background">@color/dialog_circle_background</item>
<item name="font_default">@color/grey900</item>
<item name="font_light">@color/grey700</item>
<item name="font_audio_light">@color/grey700</item>
......@@ -143,6 +144,7 @@
<item name="audio_browser_separator">@color/orange500</item>
<item name="playlist_item_drag_shadow">@color/orange500</item>
<item name="audio_player_header_time">@color/orange500</item>
<item name="dialog_circle_background">@color/dialog_circle_background_dark</item>
<item name="font_default">@color/grey50</item>
<item name="font_light">@color/grey600</item>
<item name="font_audio_light">@color/grey400</item>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment