fix seekbar alignment and volume controls color issue

2019-02-27 08:25:38 +05:30 · 2019-02-27 08:25:38 +05:30 · 72a6e86454
parent a74db34121
commit 72a6e86454
8 changed files with 103 additions and 28 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -32,8 +32,8 @@ android {
        vectorDrawables.useSupportLibrary = true

        applicationId "code.name.monkey.retromusic"
-        versionCode 295
-        versionName '3.1.200'
+        versionCode 296
+        versionName '3.1.230'

        multiDexEnabled true

--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@ -1 +1 @@
-<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: #{link-color};
        }
        a:active {
        color: #{link-color-active};
        }
        ul {
        list-style-position: outside;
        padding-left: 0;
        padding-right: 0;
        margin-left: 1em;
        }
        li {
        padding-top: 8px;
        }



    </style>
</head>
<body>
<h3 style="text-align:center;">
    Subscribe to <a href="https://www.youtube.com/user/PewDiePie/">PewDiePie</a> 👊
</h3>

<h4>v3.1.230</h4>
<ul>
    <li>Improved full theme appearances</li>
    <li>Now playing theme preview updated</li>
    <li>Fix composer error</li>
</ul>
<h4>v3.1.200</h4>
<ul>
    <li>Added composer sort and editing</li>
    <li>Fix Crash in Album tag editor while selecting options</li>
    <li>Added Filter song length</li>
    <li>Added Favourites playlist icon will be accent color</li>
    <li>Added Colorful settings icons</li>
    <li>Added Corners for dialog</li>
</ul>
<h4>v3.0.570</h4>
<ul>
    <li>Fix Album/Artist square image</li>
    <li>Fix Delete dialog text format</li>
    <li>Fix Profile picture not showing after coming back from folders</li>
    <li>Fix Play button color i Simple and Plain themes</li>
    <li>Fix Sleep timer dialog crashing</li>
    <li>Fix Share song dialog title and text</li>
</ul>
<p>If you see entire app white or dark or black select same theme in settings to fix </p>
<p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a>
</p>
<p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its
    not working try to
    uninstall and install again. </p>
</body>
+<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: #{link-color};
        }
        a:active {
        color: #{link-color-active};
        }
        ul {
        list-style-position: outside;
        padding-left: 0;
        padding-right: 0;
        margin-left: 1em;
        }
        li {
        padding-top: 8px;
        }



    </style>
</head>
<body>
<h3 style="text-align:center;">
    Subscribe to <a href="https://www.youtube.com/user/PewDiePie/">PewDiePie</a> 👊
</h3>

<h4>v3.1.230</h4>
<ul>
    <li>Added tiny theme</li>
    <li>Improved full theme appearances</li>
    <li>Now playing theme preview updated</li>
    <li>Fix composer error</li>
</ul>
<h4>v3.1.200</h4>
<ul>
    <li>Added composer sort and editing</li>
    <li>Fix Crash in Album tag editor while selecting options</li>
    <li>Added Filter song length</li>
    <li>Added Favourites playlist icon will be accent color</li>
    <li>Added Colorful settings icons</li>
    <li>Added Corners for dialog</li>
</ul>
<h4>v3.0.570</h4>
<ul>
    <li>Fix Album/Artist square image</li>
    <li>Fix Delete dialog text format</li>
    <li>Fix Profile picture not showing after coming back from folders</li>
    <li>Fix Play button color i Simple and Plain themes</li>
    <li>Fix Sleep timer dialog crashing</li>
    <li>Fix Share song dialog title and text</li>
</ul>
<p>If you see entire app white or dark or black select same theme in settings to fix </p>
<p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a>
</p>
<p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its
    not working try to
    uninstall and install again. </p>
</body>
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.kt
@ -108,7 +108,7 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum
    }

    fun setTintable(color: Int) {
-        TintHelper.setTintAuto(volumeSeekBar, color, true)
+        TintHelper.setTintAuto(volumeSeekBar, color, false)
    }

    fun removeThumb() {
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.kt
@ -29,7 +29,6 @@ import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import kotlinx.android.synthetic.main.fragment_plain_controls_fragment.*
 import kotlinx.android.synthetic.main.media_button.*
-import kotlinx.android.synthetic.main.player_time.*

 /**
 * @author Hemanth S (h4h13).
--- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
@ -7,18 +7,55 @@
    android:orientation="vertical"
    tools:ignore="MissingPrefix">

-    <SeekBar
-        android:id="@+id/progressSlider"
+    <RelativeLayout
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:maxHeight="2dp"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp"
-        android:progressDrawable="@drawable/color_progress_seek"
-        android:splitTrack="false"
-        tools:progress="20" />
+        android:layout_height="28dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp">

-    <include layout="@layout/player_time" />
+        <TextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+        <TextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+        <SeekBar
+            android:id="@+id/progressSlider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="3dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>

    <LinearLayout
        android:layout_width="match_parent"
@ -29,6 +66,7 @@

        <androidx.appcompat.widget.AppCompatTextView
            android:id="@+id/title"
+            style="@style/TextAppearance.MaterialComponents.Subtitle1"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
@ -42,12 +80,12 @@
            android:paddingEnd="16dp"
            android:scrollHorizontally="true"
            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
            android:textColor="?android:attr/textColorPrimary"
            tools:text="Title" />

        <androidx.appcompat.widget.AppCompatTextView
            android:id="@+id/text"
+            style="@style/TextAppearance.MaterialComponents.Body2"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
@ -56,8 +94,7 @@
            android:gravity="center"
            android:maxLines="1"
            android:paddingStart="24dp"
-            android:paddingEnd="24dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+            android:paddingEnd="24dp" />
    </LinearLayout>

    <include layout="@layout/media_button" />
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@ -48,6 +48,7 @@
            android:id="@+id/progressSlider"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
            android:layout_toLeftOf="@id/songTotalTime"
            android:layout_toRightOf="@id/songCurrentProgress"
            android:maxHeight="3dp"
--- a/app/src/main/res/layout/fragment_material_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_material_playback_controls.xml
@ -49,6 +49,7 @@
            android:id="@+id/progressSlider"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
            android:layout_toLeftOf="@id/songTotalTime"
            android:layout_toRightOf="@id/songCurrentProgress"
            android:maxHeight="3dp"
--- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
@ -6,18 +6,55 @@
    android:gravity="center_vertical"
    android:orientation="vertical">

-    <SeekBar
-        android:id="@+id/progressSlider"
+    <RelativeLayout
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:maxHeight="3dp"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp"
-        android:progressDrawable="@drawable/color_progress_seek"
-        android:splitTrack="false"
-        tools:progress="20" />
+        android:layout_height="28dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp">

-    <include layout="@layout/player_time" />
+        <TextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+        <TextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+        <SeekBar
+            android:id="@+id/progressSlider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="3dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>

    <include layout="@layout/media_button" />