Fix drive mode, share story and font moved to lib.

2020-02-05 10:10:47 +05:30 · 2020-02-05 10:10:47 +05:30 · 9d76cb165a
commit 9d76cb165a
parent 5754141b0e
36 changed files with 233 additions and 157 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -116,6 +116,7 @@ static def getDate() {
 dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation project(':appthemehelper')
+    implementation project(':fonts')
    implementation 'androidx.multidex:multidex:2.0.1'

    implementation "androidx.gridlayout:gridlayout:1.0.0"
--- 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};
        }
        ol {
        list-style-position: inside;
        padding-left: 0;
        padding-right: 0;
        }
        li {
        padding-top: 8px;
        }


    </style>
</head>
<body>
<h4>v3.4.900</h4>
<ul>
    <li>Added playlist search</li>
    <li>Color fixes</li>
</ul>
<h4>v3.4.850</h4>
<ul>
    <li>Added new theme called circle</li>
    <li>Added tiny color card style for home artists</li>
    <li>Added extra track info details to now playing themes</li>
    <li>Added scroll animation</li>
    <li>Added smooth transition animations 🤔</li>
    <li>Added current playing tab options for Bottom Navigation View</li>
    <li>Added search in genre</li>
    <li>Improved selecting feedback effect(ripple with corners)</li>
    <li>Fix bugs & crashes</li>
    <li>Fix crashing on lyrics</li>
    <li>Fix genre details last song is under mini player</li>
    <li>Fix colors mistakes and font sizes</li>
    <li>Fix slider jumping while scrolling in now playing themes</li>
</ul>
<h4>v3.4.800</h4>
<ul>
    <li>Improved dark theme colors and Follow system theme</li>
    <li>Rounded rectangle ripple for BottomNavigationView</li>
    <li>Follow sleep timer dialog checkbox color as accent</li>
    <li>Added song list selection for Album and Artist details</li>
    <li>Fixed Toolbar popup text color when selecting songs</li>
</ul>
<h4>v3.4.700</h4>
<ul>
    <li>Added splash screen(for app loading time)</li>
    <li>Updated dark theme colors</li>
    <li>Added circular progress view</li>
    <li>Hiding year if not showing</li>
</ul>
<h4>v3.4.600</h4>
<ul>
    <li>Fix notification layout height</li>
    <li>Fix folder list last item not showing</li>
    <li>Added auto hide/ show controls according to first and last item</li>
</ul>
<h4>v3.4.500</h4>
<ul>
    <li>Added peak theme</li>
    <li>Added app rating dialog</li>
    <li>Fix song name scrolling in now playing themes if it's long</li>
    <li>Fix playing queue last item hiding FAB</li>
    <li>Added desaturated color option for dark mode</li>
    <li>Fix slow search loading</li>
    <li>Fix last added slow loading</li>
    <li>Fix home banner toolbar corner</li>
    <li>Fix home crashing when switching between two tabs</li>
    <li>Fix remaining time in playing queue</li>
    <li>Fix font not applied for some components</li>
    <li>Fix crashing on album details sorting</li>
    <li>Fixed lot of internal bugs</li>
    <li>Fix dialog expand</li>
    <li>Fix list card color</li>
    <li>Removed SlidingUpPanel to replace with BottomSheet</li>
    <li>Removed color theme as per material design guidelines</li>
    <li>Removed classic theme(We're bringing back)</li>
    <li>Replace line switch to Material Switch in settings</li>
    <li>Performance improved</li>
    <li>Updated internal libraries</li>
    <li>Updated translation</li>
    <li>Limiting the use of Theme engine for making use of system colors</li>
    <li>Change home icon from the user icon</li>
    <li>Corrected all toolbar with elevation when scrolling</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};
        }
        ol {
        list-style-position: inside;
        padding-left: 0;
        padding-right: 0;
        }
        li {
        padding-top: 8px;
        }


    </style>
</head>
<body>
<h4>v3.4.900</h4>
<ul>
    <li>Added playlist search</li>
    <li>Added Drive mode</li>
    <li>Added Album and Artist layout change option in library</li>
    <li>Added Show more album and artist information in details</li>
    <li>Added Pixel style scroller bar</li>
    <li>Added current now playing share</li>
    <li>Fix font issues and colors in some places</li>
    <li>Improved Full now playing theme</li>
</ul>
<h4>v3.4.850</h4>
<ul>
    <li>Added new theme called circle</li>
    <li>Added tiny color card style for home artists</li>
    <li>Added extra track info details to now playing themes</li>
    <li>Added scroll animation</li>
    <li>Added smooth transition animations 🤔</li>
    <li>Added current playing tab options for Bottom Navigation View</li>
    <li>Added search in genre</li>
    <li>Improved selecting feedback effect(ripple with corners)</li>
    <li>Fix bugs & crashes</li>
    <li>Fix crashing on lyrics</li>
    <li>Fix genre details last song is under mini player</li>
    <li>Fix colors mistakes and font sizes</li>
    <li>Fix slider jumping while scrolling in now playing themes</li>
</ul>
<h4>v3.4.800</h4>
<ul>
    <li>Improved dark theme colors and Follow system theme</li>
    <li>Rounded rectangle ripple for BottomNavigationView</li>
    <li>Follow sleep timer dialog checkbox color as accent</li>
    <li>Added song list selection for Album and Artist details</li>
    <li>Fixed Toolbar popup text color when selecting songs</li>
</ul>
<h4>v3.4.700</h4>
<ul>
    <li>Added splash screen(for app loading time)</li>
    <li>Updated dark theme colors</li>
    <li>Added circular progress view</li>
    <li>Hiding year if not showing</li>
</ul>
<h4>v3.4.600</h4>
<ul>
    <li>Fix notification layout height</li>
    <li>Fix folder list last item not showing</li>
    <li>Added auto hide/ show controls according to first and last item</li>
</ul>
<h4>v3.4.500</h4>
<ul>
    <li>Added peak theme</li>
    <li>Added app rating dialog</li>
    <li>Fix song name scrolling in now playing themes if it's long</li>
    <li>Fix playing queue last item hiding FAB</li>
    <li>Added desaturated color option for dark mode</li>
    <li>Fix slow search loading</li>
    <li>Fix last added slow loading</li>
    <li>Fix home banner toolbar corner</li>
    <li>Fix home crashing when switching between two tabs</li>
    <li>Fix remaining time in playing queue</li>
    <li>Fix font not applied for some components</li>
    <li>Fix crashing on album details sorting</li>
    <li>Fixed lot of internal bugs</li>
    <li>Fix dialog expand</li>
    <li>Fix list card color</li>
    <li>Removed SlidingUpPanel to replace with BottomSheet</li>
    <li>Removed color theme as per material design guidelines</li>
    <li>Removed classic theme(We're bringing back)</li>
    <li>Replace line switch to Material Switch in settings</li>
    <li>Performance improved</li>
    <li>Updated internal libraries</li>
    <li>Updated translation</li>
    <li>Limiting the use of Theme engine for making use of system colors</li>
    <li>Change home icon from the user icon</li>
    <li>Corrected all toolbar with elevation when scrolling</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/activities/ShareInstagramStory.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt
@ -50,7 +50,6 @@ class ShareInstagramStory : AbsBaseActivity() {
        const val EXTRA_SONG = "extra_song"
    }

-    private lateinit var colorString: String
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        if (item.itemId == android.R.id.home) {
            onBackPressed()
@ -109,7 +108,14 @@ class ShareInstagramStory : AbsBaseActivity() {
    private fun setColors(colorLight: Boolean, color: Int) {
        setLightStatusbar(colorLight)
        toolbar.setTitleTextColor(MaterialValueHelper.getPrimaryTextColor(this@ShareInstagramStory, colorLight))
-        toolbar.navigationIcon?.setTintList(ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this@ShareInstagramStory, colorLight)))
+        toolbar.navigationIcon?.setTintList(
+            ColorStateList.valueOf(
+                MaterialValueHelper.getPrimaryTextColor(
+                    this@ShareInstagramStory,
+                    colorLight
+                )
+            )
+        )
        mainContent.background =
            GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, intArrayOf(color, Color.BLACK))
    }
--- a/app/src/main/res/font/circular.xml
+++ b/app/src/main/res/font/circular.xml
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
-    <font
-        app:font="@font/circular_std_book"
-        app:fontStyle="normal"
-        app:fontWeight="400" />
-    <font
-        app:font="@font/circular_std_medium"
-        app:fontStyle="normal"
-        app:fontWeight="600" />
-
-    <font
-        app:font="@font/circular_std_black"
-        app:fontWeight="900" />
-
-</font-family>
--- a/app/src/main/res/font/circular_std_black.otf
+++ b/app/src/main/res/font/circular_std_black.otf
--- a/app/src/main/res/font/circular_std_book.otf
+++ b/app/src/main/res/font/circular_std_book.otf
--- a/app/src/main/res/font/circular_std_medium.otf
+++ b/app/src/main/res/font/circular_std_medium.otf
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@ -83,12 +83,9 @@
                            android:layout_width="match_parent"
                            android:layout_height="@dimen/toolbar_height"
                            android:background="?attr/colorSurface"
-                            app:contentInsetStart="0dp"
-                            app:contentInsetStartWithNavigation="0dp"
                            app:popupTheme="?toolbarPopupTheme"
                            app:title="@string/action_search"
-                            app:titleMarginStart="0dp"
-                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                            app:titleTextAppearance="@style/TextViewHeadline6"
                            tools:ignore="UnusedAttribute" />
                    </com.google.android.material.card.MaterialCardView>

--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@ -55,12 +55,9 @@
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/toolbar_height"
                    android:background="?colorSurface"
-                    app:contentInsetStart="0dp"
-                    app:contentInsetStartWithNavigation="0dp"
                    app:popupTheme="?toolbarPopupTheme"
                    app:title="@string/action_search"
-                    app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                    app:titleTextAppearance="@style/TextViewHeadline6"
                    tools:ignore="UnusedAttribute" />
            </com.google.android.material.card.MaterialCardView>

--- a/app/src/main/res/layout/activity_drive_mode.xml
+++ b/app/src/main/res/layout/activity_drive_mode.xml
@ -67,7 +67,7 @@
        android:id="@+id/playPauseButton"
        android:layout_width="112dp"
        android:layout_height="112dp"
-        android:layout_marginBottom="32dp"
+        android:layout_marginBottom="42dp"
        android:background="?roundSelector"
        android:src="@drawable/ic_pause_white_24dp"
        app:layout_constraintBottom_toTopOf="@+id/repeatButton"
@ -167,21 +167,6 @@
            tools:text="@tools:sample/lorem/random" />
    </LinearLayout>

-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="@color/md_white_1000"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:ignore="RtlHardcoded,RtlSymmetry"
-        tools:text="00:22" />

    <androidx.appcompat.widget.AppCompatSeekBar
        android:id="@+id/progressSlider"
@ -194,25 +179,33 @@
        android:progressTint="@color/md_white_1000"
        android:splitTrack="false"
        android:thumb="@drawable/switch_thumb_material"
-        app:layout_constraintBottom_toTopOf="@id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
+        app:layout_constraintBottom_toTopOf="@id/songCurrentProgress"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
        tools:ignore="RtlHardcoded,UnusedAttribute"
        tools:progress="20" />

    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="40dp"
+        android:id="@+id/songCurrentProgress"
+        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
+        android:layout_marginStart="16dp"
        android:singleLine="true"
        android:textColor="@color/md_white_1000"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
+        app:layout_constraintBottom_toTopOf="@id/playPauseButton"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
+        tools:text="00:22" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/songTotalTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:singleLine="true"
+        android:textColor="@color/md_white_1000"
+        app:layout_constraintBottom_toTopOf="@id/playPauseButton"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
        tools:ignore="RtlHardcoded,RtlSymmetry"
        tools:text="00:22" />

--- a/app/src/main/res/layout/activity_share_instagram.xml
+++ b/app/src/main/res/layout/activity_share_instagram.xml
@ -50,7 +50,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginStart="8dp"
-                android:text="@string/app_name"
+                android:text="@string/retro_music_player"
                android:textColor="@color/md_white_1000"
                app:layout_constraintBottom_toBottomOf="@id/appIcon"
                app:layout_constraintStart_toEndOf="@id/appIcon"
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@ -55,12 +55,9 @@
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/toolbar_height"
                    android:background="?attr/colorSurface"
-                    app:contentInsetStart="0dp"
-                    app:contentInsetStartWithNavigation="0dp"
                    app:popupTheme="?toolbarPopupTheme"
                    app:title="@string/action_search"
-                    app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                    app:titleTextAppearance="@style/TextViewHeadline6"
                    tools:ignore="UnusedAttribute" />
            </com.google.android.material.card.MaterialCardView>

--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@ -40,7 +40,7 @@
                android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_player_playback_controls" />
+                tools:layout="@layout/fragment_fit_playback_controls" />
        </FrameLayout>

        <FrameLayout
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@ -55,12 +55,9 @@
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/toolbar_height"
                    android:background="?attr/colorSurface"
-                    app:contentInsetStart="0dp"
-                    app:contentInsetStartWithNavigation="0dp"
                    app:popupTheme="?toolbarPopupTheme"
                    app:title="@string/action_search"
-                    app:titleMarginStart="0dp"
-                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                    app:titleTextAppearance="@style/TextViewHeadline6"
                    tools:ignore="UnusedAttribute" />
            </com.google.android.material.card.MaterialCardView>
        </com.google.android.material.appbar.AppBarLayout>
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@ -60,12 +60,9 @@
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/toolbar_height"
                        android:background="?colorSurface"
-                        app:contentInsetStart="0dp"
-                        app:contentInsetStartWithNavigation="0dp"
                        app:popupTheme="?attr/toolbarPopupTheme"
                        app:title="@string/action_search"
-                        app:titleMarginStart="0dp"
-                        app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                        app:titleTextAppearance="@style/TextViewHeadline6"
                        app:titleTextColor="?android:attr/textColorSecondary"
                        tools:ignore="UnusedAttribute" />

--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@ -146,6 +146,7 @@
        android:paddingEnd="16dp"
        android:rotation="0"
        android:textAppearance="@style/TextViewHeadline6"
+        app:layout_constrainedWidth="true"
        app:layout_constraintBottom_toTopOf="@id/toolbarContainer"
        app:layout_constraintStart_toEndOf="@+id/title"
        app:layout_constraintTop_toBottomOf="@id/status_bar"
--- a/app/src/main/res/layout/list_item_view.xml
+++ b/app/src/main/res/layout/list_item_view.xml
@ -44,7 +44,7 @@
        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
        app:layout_constraintTop_toTopOf="parent"
        tools:maxLines="@string/grid_size_1"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem/random" />

    <code.name.monkey.retromusic.views.BaselineGridTextView
        android:id="@android:id/summary"
@ -65,6 +65,6 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:orientation="vertical"
-        app:layout_constraintGuide_begin="52dp" />
+        app:layout_constraintGuide_begin="56dp" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/list_item_view_switch.xml
+++ b/app/src/main/res/layout/list_item_view_switch.xml
@ -67,7 +67,7 @@
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:orientation="vertical"
-        app:layout_constraintGuide_begin="52dp" />
+        app:layout_constraintGuide_begin="56dp" />

    <code.name.monkey.appthemehelper.common.views.ATESwitch
        android:id="@android:id/checkbox"
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -824,4 +824,5 @@
    <string name="social_stories">Share story</string>
    <string name="share_to_stories">Share to Stories</string>
    <string name="drive_mode">Drive mode</string>
+    <string name="retro_music_player">Retro Music Player</string>
 </resources>