drawable: update icon
Update the app icon to reflect the new accents. Also move around some things to make it easier to add dynamic colors later on. Don't make it follow dynamic colors right now however, as I want to make sure it lines up with the dynamic pixel icons before I make that change.
|
@ -1,14 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportWidth="108"
|
|
||||||
android:viewportHeight="108">
|
|
||||||
<path
|
|
||||||
android:fillColor="#111111"
|
|
||||||
android:pathData="M0 0h108v108H0z" />
|
|
||||||
<path
|
|
||||||
android:pathData="M9 0v108M19 0v108M29 0v108M39 0v108M49 0v108M59 0v108M69 0v108M79 0v108M89 0v108M99 0v108M0 9h108M0 19h108M0 29h108M0 39h108M0 49h108M0 59h108M0 69h108M0 79h108M0 89h108M0 99h108M19 29h70M19 39h70M19 49h70M19 59h70M19 69h70M19 79h70M29 19v70m10-70v70m10-70v70m10-70v70m10-70v70m10-70v70"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#30FFFFFF" />
|
|
||||||
</vector>
|
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@drawable/ic_launcher_background" />
|
|
||||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
|
||||||
</adaptive-icon>
|
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@drawable/ic_launcher_background" />
|
|
||||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
|
||||||
</adaptive-icon>
|
|
Before Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 5.9 KiB |
|
@ -38,8 +38,6 @@ import org.oxycblt.auxio.util.logD
|
||||||
/**
|
/**
|
||||||
* A [Fragment] that displays more information about the song, along with more media controls.
|
* A [Fragment] that displays more information about the song, along with more media controls.
|
||||||
* Instantiation is done by the navigation component, **do not instantiate this fragment manually.**
|
* Instantiation is done by the navigation component, **do not instantiate this fragment manually.**
|
||||||
* TODO: Turn the seekbar + durations combo into a single view that shares touch events. This could
|
|
||||||
* also make material sliders usable maybe.
|
|
||||||
* @author OxygenCobalt
|
* @author OxygenCobalt
|
||||||
*/
|
*/
|
||||||
class PlaybackFragment : Fragment() {
|
class PlaybackFragment : Fragment() {
|
||||||
|
|
|
@ -30,7 +30,6 @@ import org.oxycblt.auxio.util.inflater
|
||||||
* A custom view that bundles together a seekbar with a current duration and a total duration.
|
* A custom view that bundles together a seekbar with a current duration and a total duration.
|
||||||
* The sub-views are specifically laid out so that the seekbar has an adequate touch height while
|
* The sub-views are specifically laid out so that the seekbar has an adequate touch height while
|
||||||
* still not having gobs of whitespace everywhere.
|
* still not having gobs of whitespace everywhere.
|
||||||
* TODO: Fix the padding on this thing
|
|
||||||
* @author OxygenCobalt
|
* @author OxygenCobalt
|
||||||
*/
|
*/
|
||||||
class PlaybackSeekBar @JvmOverloads constructor(
|
class PlaybackSeekBar @JvmOverloads constructor(
|
||||||
|
|
17
app/src/main/res/color/fill_icon_fg.xml
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- TODO: Apply dynamic colors to our icon once we can make it line up
|
||||||
|
with the pixel ones. Currently it's too risky as all we have are the
|
||||||
|
promo stuff. -->
|
||||||
|
<gradient android:endX="64.75"
|
||||||
|
android:endY="28.5"
|
||||||
|
android:startX="60"
|
||||||
|
android:startY="61.5"
|
||||||
|
android:type="linear"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item
|
||||||
|
android:color="#1E88E5"
|
||||||
|
android:offset="0.0" />
|
||||||
|
<item
|
||||||
|
android:color="#90CAF9"
|
||||||
|
android:offset="1.0" />
|
||||||
|
</gradient>
|
|
@ -1,26 +0,0 @@
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:aapt="http://schemas.android.com/aapt"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportWidth="108"
|
|
||||||
android:viewportHeight="108">
|
|
||||||
<path
|
|
||||||
android:pathData="M54 29.83v28.333c-1.585-0.913-3.41-1.477-5.371-1.477-5.935 0-10.743 4.807-10.743 10.743 0 5.935 4.807 10.742 10.743 10.742 5.935 0 10.743-4.807 10.743-10.742V40.573h10.742V29.831z"
|
|
||||||
android:strokeColor="#ffffff">
|
|
||||||
<aapt:attr name="android:fillColor">
|
|
||||||
<gradient
|
|
||||||
android:endX="64.75"
|
|
||||||
android:endY="28.5"
|
|
||||||
android:startX="60"
|
|
||||||
android:startY="61.5"
|
|
||||||
android:type="linear">
|
|
||||||
<item
|
|
||||||
android:color="#2196f3"
|
|
||||||
android:offset="0.0" />
|
|
||||||
<item
|
|
||||||
android:color="#90caf9"
|
|
||||||
android:offset="1.0" />
|
|
||||||
</gradient>
|
|
||||||
</aapt:attr>
|
|
||||||
</path>
|
|
||||||
</vector>
|
|
12
app/src/main/res/drawable/ic_launcher_foreground.xml
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:aapt="http://schemas.android.com/aapt"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<path
|
||||||
|
android:pathData="M54 29.83v28.333c-1.585-0.913-3.41-1.477-5.371-1.477-5.935 0-10.743 4.807-10.743 10.743 0 5.935 4.807 10.742 10.743 10.742 5.935 0 10.743-4.807 10.743-10.742V40.573h10.742V29.831z"
|
||||||
|
android:strokeColor="#ffffff"
|
||||||
|
android:fillColor="@color/fill_icon_fg">
|
||||||
|
</path>
|
||||||
|
</vector>
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:color="@color/overlay_selection">
|
android:color="@color/mtrl_btn_ripple_color">
|
||||||
<item>
|
<item>
|
||||||
<shape android:shape="rectangle"
|
<shape android:shape="rectangle"
|
||||||
android:tint="@color/sel_accented">
|
android:tint="@color/sel_accented">
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
tools:context=".settings.pref.AccentAdapter.ViewHolder">
|
tools:context=".settings.pref.AccentAdapter.ViewHolder">
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
|
android:theme="@style/ThemeOverlay.Accent"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:padding="@dimen/spacing_small">
|
android:padding="@dimen/spacing_small">
|
||||||
|
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 1,020 B After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 9.6 KiB |
|
@ -1,5 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
<!-- Base app colors -->
|
||||||
<color name="surface">#fafafa</color>
|
<color name="surface">#fafafa</color>
|
||||||
<color name="control">#202020</color>
|
<color name="control">#202020</color>
|
||||||
<color name="nav_bar">#01fafafa</color>
|
<color name="nav_bar">#01fafafa</color>
|
||||||
|
|
|
@ -72,6 +72,10 @@
|
||||||
<item name="android:focusable">true</item>
|
<item name="android:focusable">true</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="ThemeOverlay.Accent" parent="">
|
||||||
|
<item name="colorOnPrimary">?attr/colorSurface</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<!-- TEXTVIEW STYLES -->
|
<!-- TEXTVIEW STYLES -->
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Base" parent="Widget.AppCompat.TextView">
|
<style name="Widget.Auxio.TextView.Base" parent="Widget.AppCompat.TextView">
|
||||||
|
|