diff --git a/app/build.gradle b/app/build.gradle index 3b5159d0a..6af422455 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 417 - versionName '3.5.100' + versionCode 420 + versionName '3.5.110' multiDexEnabled true diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 742042f0d..3b590b897 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -9,17 +9,19 @@ body { padding-left: 1rem; padding-right: 1rem; - } -h2{ - margin-block-end: 0rem; - margin-block-start: 0rem; -} + } + + h2 { + margin-block-end: 0rem; + margin-block-start: 0rem; + } + li { font-size: 0.85rem; padding-top: 0.5rem; padding-left: 0; padding-right: 0; - color: rgba(0,0,0,0.8); + color: rgba(0, 0, 0, 0.8); } ul { @@ -37,33 +39,41 @@ h2{ line-height: 0.7rem; } + h5 { + margin-block-start: 0; + margin-block-end: 0.5rem; + } + + h3 span { + border-radius: 0.2rem; + padding-left: 0.5rem; + padding-right: 0.5rem; + padding-top: 0.3rem; + padding-bottom: 0.3rem; + font-size: 1rem; + } {style-placeholder} - -

v3.5.100

- Internal version -

What's new?

+
April 28, 2020
+

v3.5.110

+ Beta version +

What's New

-

Improvements and fixed issues

+

Improved

+

*If you face any UI related issues you clear app data and cache, if itsnot working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java index 450d17b49..be500ca45 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java @@ -24,6 +24,7 @@ import java.util.Locale; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.ATHUtil; import code.name.monkey.appthemehelper.util.ColorUtil; +import code.name.monkey.appthemehelper.util.MaterialValueHelper; import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.activities.base.AbsBaseActivity; @@ -38,7 +39,7 @@ public class WhatsNewActivity extends AbsBaseActivity { WebView webView; private static String colorToCSS(int color) { - return String.format(Locale.getDefault(),"rgba(%d, %d, %d, %d)", Color.red(color), Color.green(color), + return String.format(Locale.getDefault(), "rgba(%d, %d, %d, %d)", Color.red(color), Color.green(color), Color.blue(color), Color.alpha(color)); // on API 29, WebView doesn't load with hex colors } @@ -84,11 +85,14 @@ public class WhatsNewActivity extends AbsBaseActivity { // Inject color values for WebView body background and links final boolean isDark = ATHUtil.INSTANCE.isWindowBackgroundDark(this); + final int accentColor = ThemeStore.Companion.accentColor(this); final String backgroundColor = colorToCSS(ATHUtil.INSTANCE.resolveColor(this, R.attr.colorSurface, Color.parseColor(isDark ? "#424242" : "#ffffff"))); final String contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000")); final String textColor = colorToCSS(Color.parseColor(isDark ? "#60FFFFFF" : "#80000000")); + final String accentColorString = colorToCSS(ThemeStore.Companion.accentColor(this)); + final String accentTextColor = colorToCSS(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.INSTANCE.isColorLight(accentColor))); final String changeLog = buf.toString() - .replace("{style-placeholder}", String.format("body { background-color: %s; color: %s; } li {color: %s;}", backgroundColor, contentColor, textColor)) + .replace("{style-placeholder}", String.format("body { background-color: %s; color: %s; } li {color: %s;} .colorHeader {background-color: %s; color: %s;} .tag {color: %s;}", backgroundColor, contentColor, textColor, accentColorString, accentTextColor,accentColorString )) .replace("{link-color}", colorToCSS(ThemeStore.Companion.accentColor(this))) .replace("{link-color-active}", colorToCSS(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this)))); webView.loadData(changeLog, "text/html", "UTF-8"); diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java index 3e566c661..16f234e99 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java @@ -1026,8 +1026,8 @@ public class MusicService extends Service implements public void saveQueuesImpl() { //MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue); - nowPlayingQueue.saveQueue(playingQueue); - nowPlayingQueue.saveOriginalQueue(originalPlayingQueue); + nowPlayingQueue.saveQueue(new ArrayList<>(playingQueue)); + nowPlayingQueue.saveOriginalQueue(new ArrayList<>(originalPlayingQueue)); } public void saveState() { diff --git a/app/src/main/res/layout/card_credit.xml b/app/src/main/res/layout/card_credit.xml index 84ad59163..5ce4dddfb 100644 --- a/app/src/main/res/layout/card_credit.xml +++ b/app/src/main/res/layout/card_credit.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/md_blue_100" app:cardCornerRadius="@dimen/about_card_radius" app:cardUseCompatPadding="true"> @@ -13,7 +12,7 @@ android:orientation="vertical"> - @@ -12,7 +11,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - @@ -13,7 +12,7 @@ android:orientation="vertical"> - @@ -12,7 +11,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - 48dp 12dp 16dp + 2dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0781654ed..246fc52dc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -2,15 +2,17 @@ - - diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt index ef7ec71e7..888f01c7e 100755 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt @@ -10,6 +10,7 @@ import code.name.monkey.appthemehelper.R object MaterialValueHelper { @SuppressLint("PrivateResource") + @JvmStatic @ColorInt fun getPrimaryTextColor(context: Context?, dark: Boolean): Int { return if (dark) { @@ -18,6 +19,7 @@ object MaterialValueHelper { } @SuppressLint("PrivateResource") + @JvmStatic @ColorInt fun getSecondaryTextColor(context: Context?, dark: Boolean): Int { return if (dark) { @@ -26,6 +28,7 @@ object MaterialValueHelper { } @SuppressLint("PrivateResource") + @JvmStatic @ColorInt fun getPrimaryDisabledTextColor(context: Context?, dark: Boolean): Int { return if (dark) { @@ -34,6 +37,7 @@ object MaterialValueHelper { } @SuppressLint("PrivateResource") + @JvmStatic @ColorInt fun getSecondaryDisabledTextColor(context: Context?, dark: Boolean): Int { return if (dark) {