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>
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@ -26,6 +26,7 @@ android {

 dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':fonts')
    implementation 'androidx.appcompat:appcompat:1.1.0'
    implementation 'com.google.android.material:material:1.2.0-alpha04'
    implementation 'androidx.preference:preference:1.1.0'
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt
@ -15,9 +15,10 @@
 package code.name.monkey.appthemehelper.common.prefs

 import android.content.Context
-import android.preference.Preference
 import android.util.AttributeSet
 import android.view.View
+import androidx.preference.Preference
+import androidx.preference.PreferenceViewHolder
 import code.name.monkey.appthemehelper.R

 class ATEColorPreference @JvmOverloads constructor(
@ -32,15 +33,20 @@ class ATEColorPreference @JvmOverloads constructor(
    private var border: Int = 0

    init {
-        layoutResource = R.layout.ate_preference_custom
        widgetLayoutResource = R.layout.ate_preference_color
        isPersistent = false
    }

-    override fun onBindView(view: View) {
+    /*override fun onBindView(view: View) {
        super.onBindView(view)
        mView = view
        invalidateColor()
+    }*/
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+        super.onBindViewHolder(holder)
+        mView = holder?.itemView
+        invalidateColor()
    }

    fun setColor(color: Int, border: Int) {
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt
@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.appthemehelper.common.views
-
-import android.content.Context
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.ThemeStore
-import com.google.android.material.textview.MaterialTextView
-
-class ATESecondaryTextView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : MaterialTextView(context, attrs, defStyleAttr) {
-
-    init {
-        setTextColor(ThemeStore.textColorSecondary(context))
-    }
-}
--- a/appthemehelper/src/main/res/drawable/ate_switch.xml
+++ b/appthemehelper/src/main/res/drawable/ate_switch.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_toggle_switch_off" android:state_checked="false" />
-    <item android:drawable="@drawable/ic_toggle_switch" android:state_checked="true" />
-</selector>
--- a/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml
+++ b/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M17 6H7c-3.31 0-6 2.69-6 6s2.69 6 6 6h10c3.31 0 6-2.69 6-6s-2.69-6-6-6zm0 10H7c-2.21 0-4-1.79-4-4s1.79-4 4-4h10c2.21 0 4 1.79 4 4s-1.79 4-4 4zm0-7c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
-</vector>
--- a/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml
+++ b/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M17 6H7c-3.31 0-6 2.69-6 6s2.69 6 6 6h10c3.31 0 6-2.69 6-6s-2.69-6-6-6zm0 10H7c-2.21 0-4-1.79-4-4s1.79-4 4-4h10c2.21 0 4 1.79 4 4s-1.79 4-4 4zM7 9c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
-</vector>
--- a/appthemehelper/src/main/res/layout/ate_preference_custom.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom.xml
@ -18,7 +18,9 @@
        android:layout_gravity="center"
        android:layout_marginStart="@dimen/ate_preference_inset"
        android:layout_marginLeft="@dimen/ate_preference_inset"
-        tools:ignore="ContentDescription" />
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/icon_checkmark_white"
+        tools:tint="@color/md_black_1000" />

    <RelativeLayout
        android:layout_width="0dp"
@ -32,7 +34,7 @@
        android:layout_marginBottom="12dip"
        android:layout_weight="1">

-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+        <com.google.android.material.textview.MaterialTextView
            android:id="@android:id/title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@ -40,10 +42,13 @@
            android:layout_alignParentLeft="true"
            android:ellipsize="marquee"
            android:fadingEdge="horizontal"
+            android:fontFamily="@font/circular"
            android:singleLine="true"
-            tools:text="Title" />
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:textColor="?android:attr/textColorPrimary"
+            tools:text="@tools:sample/lorem/random" />

-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <code.name.monkey.retromusic.views.BaselineGridTextView
            android:id="@android:id/summary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@ -51,18 +56,18 @@
            android:layout_alignStart="@android:id/title"
            android:layout_alignLeft="@android:id/title"
            android:layout_marginTop="2dp"
+            android:fontFamily="@font/circular"
            android:maxLines="4"
-            tools:text="Summary" />
+            tools:text="@tools:sample/lorem/random" />

    </RelativeLayout>

    <!-- Preference should place its actual preference widget here. -->
-    <code.name.monkey.appthemehelper.common.views.ATESwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    <code.name.monkey.appthemehelper.common.views.ATESwitch
        android:id="@+id/switchWidget"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:background="@null"
-        android:button="@drawable/ate_switch"
        android:clickable="false"
        android:focusable="false" />

--- a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
@ -19,7 +19,8 @@
        android:layout_gravity="center"
        android:layout_marginStart="@dimen/ate_preference_inset"
        android:layout_marginLeft="@dimen/ate_preference_inset"
-        tools:ignore="ContentDescription" />
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/icon_back_black" />

    <RelativeLayout
        android:layout_width="0dp"
@ -33,19 +34,22 @@
        android:layout_marginBottom="12dip"
        android:layout_weight="1">

-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+        <com.google.android.material.textview.MaterialTextView
            android:id="@android:id/title"
-            style="@style/TextAppearance.MaterialComponents.Subtitle1"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentStart="true"
            android:layout_alignParentLeft="true"
            android:ellipsize="marquee"
            android:fadingEdge="horizontal"
+            android:fontFamily="@font/circular"
            android:singleLine="true"
-            tools:text="Title" />
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:textColor="?android:attr/textColorPrimary"
+            tools:text="@tools:sample/lorem/random" />

-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+
+        <com.google.android.material.textview.MaterialTextView
            android:id="@android:id/summary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@ -53,7 +57,9 @@
            android:layout_alignStart="@android:id/title"
            android:layout_alignLeft="@android:id/title"
            android:layout_marginTop="2dp"
+            android:fontFamily="@font/circular"
            android:maxLines="4"
+            android:textColor="?android:attr/textColorSecondary"
            tools:text="I have one solution for you.you can change font size for specific preference by managing layout file." />

    </RelativeLayout>
--- a/fonts/.gitignore
+++ b/fonts/.gitignore
@ -0,0 +1 @@
+/build
--- a/fonts/build.gradle
+++ b/fonts/build.gradle
@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020 Hemanth Savarala. 
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under 
+ * the terms of the GNU General Public License as published by 
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version. 
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+ * See the GNU General Public License for more details.
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
--- a/fonts/consumer-rules.pro
+++ b/fonts/consumer-rules.pro
--- a/fonts/proguard-rules.pro
+++ b/fonts/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt
+++ b/fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt
@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2020 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package dev.hemanths.fonts
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("dev.hemanths.fonts.test", appContext.packageName)
+    }
+}
--- a/fonts/src/main/AndroidManifest.xml
+++ b/fonts/src/main/AndroidManifest.xml
@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="dev.hemanths.fonts" />
--- a/fonts/src/main/res/values/strings.xml
+++ b/fonts/src/main/res/values/strings.xml
@ -0,0 +1,17 @@
+<!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<resources>
+    <string name="app_name">fonts</string>
+</resources>
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.kt
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Hemanth Savarala.
+ * Copyright (c) 2020 Hemanth Savarala.
 *
 * Licensed under the GNU General Public License v3
 *
@ -12,20 +12,21 @@
 * See the GNU General Public License for more details.
 */

-package code.name.monkey.appthemehelper.common.views
+package dev.hemanths.fonts

-import android.content.Context
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.ThemeStore
-import com.google.android.material.textview.MaterialTextView
+import org.junit.Test

-class ATEPrimaryTextView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : MaterialTextView(context, attrs, defStyleAttr) {
+import org.junit.Assert.*

-    init {
-        setTextColor(ThemeStore.textColorPrimary(context))
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
    }
 }
--- a/settings.gradle
+++ b/settings.gradle
@ -1 +1 @@
-include ':app', ':appthemehelper'
+include ':app', ':appthemehelper', ':fonts'