diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index a4346a452..97e68bbed 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.4.000

v3.3.200

v.3.3.100

v3.3.000

v3.2.240

v3.2.220

v3.2.203

v3.2.135

v3.2.125

v3.2.120

v3.2.105

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

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

\ No newline at end of file +

v3.4.000

v3.3.200

v.3.3.100

v3.3.000

v3.2.240

v3.2.220

v3.2.203

v3.2.135

v3.2.125

v3.2.120

v3.2.105

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not 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/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt index dd5c0b5b3..72a59f471 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt @@ -113,7 +113,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView { } private fun setupRecyclerView() { - simpleSongAdapter = SimpleSongAdapter(this, ArrayList(), R.layout.item_song, false) + simpleSongAdapter = SimpleSongAdapter(this, ArrayList(), R.layout.item_song) recyclerView.apply { layoutManager = LinearLayoutManager(this@AlbumDetailsActivity) itemAnimator = DefaultItemAnimator() diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt index beff59537..75a3ed479 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt @@ -172,7 +172,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView { layoutManager = GridLayoutManager(this.context, 1, GridLayoutManager.HORIZONTAL, false) adapter = albumAdapter } - songAdapter = SimpleSongAdapter(this, ArrayList(), R.layout.item_song, false) + songAdapter = SimpleSongAdapter(this, ArrayList(), R.layout.item_song) recyclerView.apply { itemAnimator = DefaultItemAnimator() layoutManager = LinearLayoutManager(this.context) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt index ccf13a5a0..4193c58a4 100755 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt @@ -4,8 +4,6 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.annotation.LayoutRes import androidx.appcompat.app.AppCompatActivity -import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import java.util.* @@ -13,14 +11,8 @@ import java.util.* class SimpleSongAdapter(context: AppCompatActivity, songs: ArrayList, - @LayoutRes i: Int, - val useNumbers: Boolean) : SongAdapter(context, songs, i, false, null) { + @LayoutRes i: Int) : SongAdapter(context, songs, i, false, null) { - private var textColor: Int = 0 - - init { - textColor = ThemeStore.textColorPrimary(context) - } override fun swapDataSet(dataSet: ArrayList) { this.dataSet.clear() @@ -36,33 +28,11 @@ class SimpleSongAdapter(context: AppCompatActivity, super.onBindViewHolder(holder, position) val fixedTrackNumber = MusicUtil.getFixedTrackNumber(dataSet[position].trackNumber) - if (holder.imageText != null) { - if (useNumbers) { - holder.imageText!!.text = (position + 1).toString() - } else { - holder.imageText!!.text = if (fixedTrackNumber > 0) fixedTrackNumber.toString() else "-" - } - holder.imageText!!.setTextColor(textColor) - } - - if (holder.time != null) { - holder.time!!.text = MusicUtil.getReadableDurationString(dataSet[position].duration) - holder.time!!.setTextColor(textColor) - } - if (holder.title != null) { - holder.title!!.setTextColor(textColor) - } - if (holder.menu != null) { - TintHelper.setTintAuto(holder.menu!!, textColor, false) - } + holder.imageText?.text = if (fixedTrackNumber > 0) fixedTrackNumber.toString() else "-" + holder.time?.text = MusicUtil.getReadableDurationString(dataSet[position].duration) } override fun getItemCount(): Int { return dataSet.size } - - fun setTextColor(textColor: Int) { - this.textColor = textColor - notifyDataSetChanged() - } } diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml index 787aead9e..5a1f6b013 100644 --- a/app/src/main/res/layout-land/activity_album_tag_editor.xml +++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml @@ -17,7 +17,7 @@ - - diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml index 90b075efc..53b138bc3 100644 --- a/app/src/main/res/layout-land/fragment_blur.xml +++ b/app/src/main/res/layout-land/fragment_blur.xml @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:layout_weight="0" > - - - - - - - - - diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml index cdebf1f58..1fc1f861f 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml @@ -85,7 +85,7 @@ app:layout_collapseMode="pin" app:layout_scrollFlags="scroll|enterAlways"> - - - + + + + + + + + + android:id="@+id/albumCoverContainer" + android:layout_width="match_parent" + android:layout_height="0dp" + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/playerToolbar"> + android:layout_height="wrap_content" + android:layout_weight="1"> - - - - - - - - + android:layout_weight="1" /> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml new file mode 100755 index 000000000..8ef65f02b --- /dev/null +++ b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/activity_artist_details.xml b/app/src/main/res/layout-xlarge/activity_artist_details.xml index 6f4827a72..21994b6a9 100644 --- a/app/src/main/res/layout-xlarge/activity_artist_details.xml +++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" app:layout_collapseMode="parallax" /> - diff --git a/app/src/main/res/layout-xlarge/activity_user_info.xml b/app/src/main/res/layout-xlarge/activity_user_info.xml index 251fe764e..ca3b01aea 100644 --- a/app/src/main/res/layout-xlarge/activity_user_info.xml +++ b/app/src/main/res/layout-xlarge/activity_user_info.xml @@ -12,7 +12,7 @@ android:elevation="0dp" app:elevation="0dp"> - - - - - diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml index 7cef9a3cc..ec497dab7 100644 --- a/app/src/main/res/layout/activity_bug_report.xml +++ b/app/src/main/res/layout/activity_bug_report.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index a95515047..9d95c23aa 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -13,7 +13,7 @@ android:background="?colorPrimary" app:liftOnScroll="true"> - - - - - - - - - - - - - - - - - - + - - - - - - - @@ -59,6 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" + android:textColor="?colorOnSecondary" android:fontFeatureSettings="onum" android:padding="4dp" tools:text="22:00" /> @@ -71,6 +73,6 @@ android:layout_margin="0dp" android:layout_weight="0" android:rotation="90" - app:tint="?colorOnBackground" + app:tint="?colorOnSecondary" tools:visibility="visible" /> \ No newline at end of file diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index 502ed82bc..1e12b1242 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -49,6 +49,7 @@ @color/darkColorPrimary @color/darkColorPrimary @color/mi_text_color_primary_dark + @color/mi_text_color_secondary_dark @color/md_deep_purple_A200 @@ -85,7 +86,7 @@ @color/md_deep_purple_A200 @color/md_green_500 - @color/mi_text_color_secondary_light + @color/mi_text_color_secondary_dark @color/md_green_A700 @color/blackColorBackground diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEToolbar.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEToolbar.java deleted file mode 100644 index 995326d68..000000000 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEToolbar.java +++ /dev/null @@ -1,37 +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 com.google.android.material.appbar.MaterialToolbar; - -/** - * Created by hemanths on 2019-09-02. - */ -public class ATEToolbar extends MaterialToolbar { - public ATEToolbar(Context context) { - super(context); - } - - public ATEToolbar(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public ATEToolbar(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } -}