Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix what's new screen

Browse source
This commit is contained in:
h4h13 2020-04-28 15:05:14 +05:30
parent 0bff6d1f3a
commit 911e18bf89
11 changed files with 60 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -24,8 +24,8 @@ android {
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic" applicationId "code.name.monkey.retromusic"
versionCode 417 versionCode 420
versionName '3.5.100' versionName '3.5.110'
multiDexEnabled true multiDexEnabled true

58
app/src/main/assets/retro-changelog.html
View file

@ -9,17 +9,19 @@
body { body {
padding-left: 1rem; padding-left: 1rem;
padding-right: 1rem; padding-right: 1rem;
} }
h2{
margin-block-end: 0rem; h2 {
margin-block-start: 0rem; margin-block-end: 0rem;
} margin-block-start: 0rem;
}
li { li {
font-size: 0.85rem; font-size: 0.85rem;
padding-top: 0.5rem; padding-top: 0.5rem;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
color: rgba(0,0,0,0.8); color: rgba(0, 0, 0, 0.8);
} }
ul { ul {
@ -37,33 +39,41 @@ h2{
line-height: 0.7rem; 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} {style-placeholder}
</style> </style>
</head> </head>
<body> <body>
<h2>v3.5.100</h2> <h5>April 28, 2020</h5>
<font color="green"><span>Internal version</span></font> <h2>v3.5.110</h2>
<h3>What's new?</h3> <span class="tag"><i>Beta version</i></span>
<h3><span class="colorHeader">What's New</span></h3>
<ul> <ul>
<li>Added grid size and layout change for songs list</li> <li>Changed profile form image to icon</li>
<li>Removed menu options (No use of having only settings)</li> <li>New what's new screen</li>
<li>Added settings option to toolbar</li> <li>Added In-App language changer, where you can select language </li>
</ul> </ul>
<h3>Improvements and fixed issues</h3> <h3><span class="colorHeader">Improved</span></h3>
<ul> <ul>
<li>Added default cover with accent color</li> <li>Improved loading of Songs, Albums, Artists, Genres, Playlists </li>
<li>Added date modified option to sort songs</li>
<li>Added toggle bluetooth connection to play on device as soon as it connected</li>
<li>Major code refactor for library tabs</li>
<li>Folder option now in available in tabs</li>
<li>Improved drive mode page</li>
<li>Improved fit, full, card themes for status visibility</li>
<li>Fix tablet version of app</li>
<li>Fix Album and Artist details toolbar full width for better accessibility</li>
<li>Updated internal libraries</li>
</ul> </ul>
<!--<h3><span class="colorHeader">Bug fixes</span></h3>
<ul>
<li></li>
</ul>-->
<p>*If you face any UI related issues you clear app data and cache, if itsnot working try to uninstall and install <p>*If you face any UI related issues you clear app data and cache, if itsnot working try to uninstall and install
again. </p> again. </p>
</body> </body>

8
app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
View file

@ -24,6 +24,7 @@ import java.util.Locale;
import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.ThemeStore;
import code.name.monkey.appthemehelper.util.ATHUtil; import code.name.monkey.appthemehelper.util.ATHUtil;
import code.name.monkey.appthemehelper.util.ColorUtil; 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.appthemehelper.util.ToolbarContentTintHelper;
import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.activities.base.AbsBaseActivity; import code.name.monkey.retromusic.activities.base.AbsBaseActivity;
@ -38,7 +39,7 @@ public class WhatsNewActivity extends AbsBaseActivity {
WebView webView; WebView webView;
private static String colorToCSS(int color) { 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 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 // Inject color values for WebView body background and links
final boolean isDark = ATHUtil.INSTANCE.isWindowBackgroundDark(this); 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 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 contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000"));
final String textColor = colorToCSS(Color.parseColor(isDark ? "#60FFFFFF" : "#80000000")); 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() 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}", colorToCSS(ThemeStore.Companion.accentColor(this)))
.replace("{link-color-active}", colorToCSS(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this)))); .replace("{link-color-active}", colorToCSS(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this))));
webView.loadData(changeLog, "text/html", "UTF-8"); webView.loadData(changeLog, "text/html", "UTF-8");

4
app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
View file

@ -1026,8 +1026,8 @@ public class MusicService extends Service implements
public void saveQueuesImpl() { public void saveQueuesImpl() {
//MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue); //MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue);
nowPlayingQueue.saveQueue(playingQueue); nowPlayingQueue.saveQueue(new ArrayList<>(playingQueue));
nowPlayingQueue.saveOriginalQueue(originalPlayingQueue); nowPlayingQueue.saveOriginalQueue(new ArrayList<>(originalPlayingQueue));
} }
public void saveState() { public void saveState() {

3
app/src/main/res/layout/card_credit.xml
View file

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardBackgroundColor="@color/md_blue_100"
app:cardCornerRadius="@dimen/about_card_radius" app:cardCornerRadius="@dimen/about_card_radius"
app:cardUseCompatPadding="true"> app:cardUseCompatPadding="true">
@ -13,7 +12,7 @@
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
android:id="@+id/sb1" android:id="@+id/sb1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

5
app/src/main/res/layout/card_other.xml
View file

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardBackgroundColor="@color/md_purple_100"
app:cardCornerRadius="@dimen/about_card_radius" app:cardCornerRadius="@dimen/about_card_radius"
app:cardUseCompatPadding="true"> app:cardUseCompatPadding="true">
@ -12,7 +11,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
android:id="@+id/sb4" android:id="@+id/sb4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -22,7 +21,7 @@
android:paddingBottom="?attr/listPreferredItemPaddingEnd" android:paddingBottom="?attr/listPreferredItemPaddingEnd"
android:text="@string/others" android:text="@string/others"
android:textAppearance="@style/TextViewOverline" android:textAppearance="@style/TextViewOverline"
android:textColor="?android:attr/textColorSecondary" android:textColor="?colorAccent"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"

3
app/src/main/res/layout/card_retro_info.xml
View file

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardBackgroundColor="@color/md_light_green_100"
app:cardCornerRadius="@dimen/about_card_radius" app:cardCornerRadius="@dimen/about_card_radius"
app:cardUseCompatPadding="true"> app:cardUseCompatPadding="true">
@ -13,7 +12,7 @@
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
android:id="@+id/sb2" android:id="@+id/sb2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

5
app/src/main/res/layout/card_social.xml
View file

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardBackgroundColor="@color/md_indigo_100"
app:cardCornerRadius="@dimen/about_card_radius" app:cardCornerRadius="@dimen/about_card_radius"
app:cardUseCompatPadding="true"> app:cardUseCompatPadding="true">
@ -12,7 +11,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
android:id="@+id/sb3" android:id="@+id/sb3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -22,7 +21,7 @@
android:paddingBottom="?attr/listPreferredItemPaddingEnd" android:paddingBottom="?attr/listPreferredItemPaddingEnd"
android:text="@string/social" android:text="@string/social"
android:textAppearance="@style/TextViewOverline" android:textAppearance="@style/TextViewOverline"
android:textColor="?android:attr/textColorSecondary" android:textColor="?colorAccent"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"

1
app/src/main/res/values/dimens.xml
View file

@ -55,4 +55,5 @@
<dimen name="adaptive_icon_size">48dp</dimen> <dimen name="adaptive_icon_size">48dp</dimen>
<dimen name="adaptive_icon_padding">12dp</dimen> <dimen name="adaptive_icon_padding">12dp</dimen>
<dimen name="about_card_radius">16dp</dimen> <dimen name="about_card_radius">16dp</dimen>
<dimen name="about_card_elevation">2dp</dimen>
</resources> </resources>

8
app/src/main/res/values/styles.xml
View file

@ -2,15 +2,17 @@
<style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base" /> <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base" />
<style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light" > <style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light">
<item name="android:windowBackground">@color/window_color_light</item> <item name="android:windowBackground">@color/window_color_light</item>
<item name="android:scrollbars">none</item>
</style> </style>
<style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black" > <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
<item name="android:windowBackground">@color/window_color_dark</item> <item name="android:windowBackground">@color/window_color_dark</item>
<item name="android:scrollbars">none</item>
</style> </style>
<style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive" > <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
<item name="android:windowBackground">@color/window_color</item> <item name="android:windowBackground">@color/window_color</item>
<item name="android:scrollbars">none</item> <item name="android:scrollbars">none</item>
</style> </style>

4
appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt
View file

@ -10,6 +10,7 @@ import code.name.monkey.appthemehelper.R
object MaterialValueHelper { object MaterialValueHelper {
@SuppressLint("PrivateResource") @SuppressLint("PrivateResource")
@JvmStatic
@ColorInt @ColorInt
fun getPrimaryTextColor(context: Context?, dark: Boolean): Int { fun getPrimaryTextColor(context: Context?, dark: Boolean): Int {
return if (dark) { return if (dark) {
@ -18,6 +19,7 @@ object MaterialValueHelper {
} }
@SuppressLint("PrivateResource") @SuppressLint("PrivateResource")
@JvmStatic
@ColorInt @ColorInt
fun getSecondaryTextColor(context: Context?, dark: Boolean): Int { fun getSecondaryTextColor(context: Context?, dark: Boolean): Int {
return if (dark) { return if (dark) {
@ -26,6 +28,7 @@ object MaterialValueHelper {
} }
@SuppressLint("PrivateResource") @SuppressLint("PrivateResource")
@JvmStatic
@ColorInt @ColorInt
fun getPrimaryDisabledTextColor(context: Context?, dark: Boolean): Int { fun getPrimaryDisabledTextColor(context: Context?, dark: Boolean): Int {
return if (dark) { return if (dark) {
@ -34,6 +37,7 @@ object MaterialValueHelper {
} }
@SuppressLint("PrivateResource") @SuppressLint("PrivateResource")
@JvmStatic
@ColorInt @ColorInt
fun getSecondaryDisabledTextColor(context: Context?, dark: Boolean): Int { fun getSecondaryDisabledTextColor(context: Context?, dark: Boolean): Int {
return if (dark) { return if (dark) {