Code clean

2020-02-22 17:40:12 +05:30 · 2020-02-22 17:40:12 +05:30 · 00b16a27c9
commit 00b16a27c9
parent f84fe5d612
61 changed files with 715 additions and 685 deletions
--- a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
@ -12,7 +12,6 @@ import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
 import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
-import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.helper.menu.GenreMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Genre
@ -80,7 +79,8 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet
    }

    private fun setUpToolBar() {
-        applyToolbar(toolbar)
+        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setSupportActionBar(toolbar)
        title = genre.name
    }

--- a/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
@ -1,5 +1,6 @@
 package code.name.monkey.retromusic.activities

+import android.R.attr
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.os.AsyncTask
@ -20,6 +21,7 @@ import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
@ -390,8 +392,8 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
                val context = activity!!
                setCurrentPlayLineColor(ThemeStore.accentColor(context))
                setIndicatorTextColor(ThemeStore.accentColor(context))
-                setCurrentIndicateLineTextColor(ThemeStore.textColorPrimary(context))
-                setNoLrcTextColor(ThemeStore.textColorPrimary(context))
+                setCurrentIndicateLineTextColor(resolveColor(activity, attr.textColorPrimary))
+                setNoLrcTextColor(resolveColor(activity, attr.textColorPrimary))
                setOnPlayIndicatorLineListener(object : LrcView.OnPlayIndicatorLineListener {
                    override fun onPlay(time: Long, content: String) {
                        MusicPlayerRemote.seekTo(time.toInt())
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java
@ -26,6 +26,7 @@ import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.Menu;
@ -36,6 +37,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
+import androidx.transition.TransitionManager;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 import code.name.monkey.retromusic.R;
@ -72,6 +74,7 @@ import com.afollestad.materialcab.MaterialCab;
 import com.afollestad.materialcab.MaterialCab.Callback;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
@ -98,6 +101,8 @@ public class MainActivity extends AbsSlidingMusicPanelActivity

    private AppBarLayout mAppBarLayout;

+    private MaterialTextView mAppTitle;
+
    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(final Context context, final Intent intent) {
@ -144,6 +149,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
        }

        mToolbarContainer = findViewById(R.id.toolbarContainer);
+        mAppTitle = findViewById(R.id.appTitle);
        mToolbar = findViewById(R.id.toolbar);
        mAppBarLayout = findViewById(R.id.appBarLayout);

@ -752,6 +758,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
    }

    private void setupToolbar() {
+        setTitle(null);
        mToolbar.setBackgroundColor(Color.TRANSPARENT);
        mToolbarContainer.setCardBackgroundColor(
                ColorStateList.valueOf(ATHUtil.INSTANCE.resolveColor(this, R.attr.colorSurface)));
@ -773,5 +780,15 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
                                .show(getSupportFragmentManager(), "Main_Menu");
                    }
                });
+
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                TransitionManager.beginDelayedTransition(mToolbar);
+                Log.i(TAG, "run: " + Thread.currentThread().getName());
+                mAppTitle.setVisibility(View.GONE);
+                setTitle(R.string.action_search);
+            }
+        }, 1500);
    }
 }
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
@ -6,12 +6,12 @@ import android.view.MenuItem
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 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.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.util.MusicUtil
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
@ -20,7 +20,6 @@ import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeMana
 import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
 import kotlinx.android.synthetic.main.activity_playing_queue.clearQueue
-import kotlinx.android.synthetic.main.activity_playing_queue.playerQueueSubHeader
 import kotlinx.android.synthetic.main.activity_playing_queue.recyclerView
 import kotlinx.android.synthetic.main.activity_playing_queue.toolbar

@ -128,7 +127,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
    }

    private fun updateCurrentSong() {
-        playerQueueSubHeader.text = getUpNextAndQueueTime()
+        toolbar.subtitle = getUpNextAndQueueTime()
    }

    override fun onPlayingMetaChanged() {
@ -138,7 +137,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
    private fun updateQueuePosition() {
        playingQueueAdapter?.setCurrent(MusicPlayerRemote.position)
        resetToCurrentPosition()
-        playerQueueSubHeader.text = getUpNextAndQueueTime()
+        toolbar.subtitle = getUpNextAndQueueTime()
    }

    private fun updateQueue() {
@ -176,20 +175,14 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
    }

    private fun setupToolbar() {
-        playerQueueSubHeader.text = getUpNextAndQueueTime()
-        playerQueueSubHeader.setTextColor(ThemeStore.accentColor(this))
+        toolbar.subtitle = getUpNextAndQueueTime()

-        applyToolbar(toolbar)
-        clearQueue.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
+        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setSupportActionBar(toolbar)
+        val accentColor = ThemeStore.accentColor(this)
+        clearQueue.backgroundTintList = ColorStateList.valueOf(accentColor)
        ColorStateList.valueOf(
-            MaterialValueHelper.getPrimaryTextColor(
-                this,
-                ColorUtil.isColorLight(
-                    ThemeStore.accentColor(
-                        this
-                    )
-                )
-            )
+            MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(accentColor))
        ).apply {
            clearQueue.setTextColor(this)
            clearQueue.iconTint = this
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
@ -6,12 +6,12 @@ import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
 import android.widget.Toast
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.BuildConfig
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
-import code.name.monkey.retromusic.extensions.applyToolbar
 import com.anjlab.android.iab.v3.BillingProcessor
 import com.anjlab.android.iab.v3.TransactionDetails
 import kotlinx.android.synthetic.main.activity_pro_version.purchaseButton
@ -31,7 +31,8 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
        setStatusbarColorAuto()
        setNavigationbarColorAuto()
        setLightNavigationBar(true)
-        applyToolbar(toolbar)
+        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setSupportActionBar(toolbar)

        restoreButton.isEnabled = false
        purchaseButton.isEnabled = false
--- a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
@ -23,6 +23,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.BuildConfig
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.extensions.textColorPrimary
+import code.name.monkey.retromusic.extensions.textColorSecondary
 import com.anjlab.android.iab.v3.BillingProcessor
 import com.anjlab.android.iab.v3.SkuDetails
 import com.anjlab.android.iab.v3.TransactionDetails
@ -216,11 +218,8 @@ class SkuDetailsAdapter(
        val titleTextColor = if (purchased) ATHUtil.resolveColor(
            donationsDialog,
            android.R.attr.textColorHint
-        ) else ThemeStore.textColorPrimary(donationsDialog)
-        val contentTextColor = if (purchased) titleTextColor else ThemeStore.textColorSecondary(
-            donationsDialog
-        )
-
+        ) else textColorPrimary(donationsDialog)
+        val contentTextColor = if (purchased) titleTextColor else textColorSecondary(donationsDialog)

        viewHolder.title.setTextColor(titleTextColor)
        viewHolder.text.setTextColor(contentTextColor)
--- a/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
@ -14,6 +14,7 @@ import android.text.TextUtils
 import android.view.MenuItem
 import android.widget.Toast
 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.MaterialUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
@ -22,7 +23,6 @@ import code.name.monkey.retromusic.Constants.USER_BANNER
 import code.name.monkey.retromusic.Constants.USER_PROFILE
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
-import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.util.Compressor
 import code.name.monkey.retromusic.util.ImageUtil.getResizedBitmap
 import code.name.monkey.retromusic.util.PreferenceUtil
@ -30,7 +30,13 @@ import com.afollestad.materialdialogs.LayoutMode
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
-import kotlinx.android.synthetic.main.activity_user_info.*
+import kotlinx.android.synthetic.main.activity_user_info.bannerImage
+import kotlinx.android.synthetic.main.activity_user_info.bannerSelect
+import kotlinx.android.synthetic.main.activity_user_info.name
+import kotlinx.android.synthetic.main.activity_user_info.nameContainer
+import kotlinx.android.synthetic.main.activity_user_info.next
+import kotlinx.android.synthetic.main.activity_user_info.toolbar
+import kotlinx.android.synthetic.main.activity_user_info.userImage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@ -49,7 +55,8 @@ class UserInfoActivity : AbsBaseActivity() {
        setTaskDescriptionColorAuto()
        setLightNavigationBar(true)

-        applyToolbar(toolbar)
+        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setSupportActionBar(toolbar)

        MaterialUtil.setTint(nameContainer, false)
        name.setText(PreferenceUtil.getInstance(this).userName)
@ -64,7 +71,12 @@ class UserInfoActivity : AbsBaseActivity() {
            MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
                cornerRadius(PreferenceUtil.getInstance(this@UserInfoActivity).dialogCorner)
                title(text = getString(R.string.set_photo))
-                listItems(items = listOf(getString(R.string.new_profile_photo), getString(R.string.remove_profile_photo))) { _, position, _ ->
+                listItems(
+                    items = listOf(
+                        getString(R.string.new_profile_photo),
+                        getString(R.string.remove_profile_photo)
+                    )
+                ) { _, position, _ ->
                    when (position) {
                        0 -> pickNewPhoto()
                        1 -> PreferenceUtil.getInstance(this@UserInfoActivity).saveProfileImage("")
@ -76,7 +88,12 @@ class UserInfoActivity : AbsBaseActivity() {
            MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
                cornerRadius(PreferenceUtil.getInstance(this@UserInfoActivity).dialogCorner)
                title(R.string.select_banner_photo)
-                listItems(items = listOf(getString(R.string.new_banner_photo), getString(R.string.remove_banner_photo)))
+                listItems(
+                    items = listOf(
+                        getString(R.string.new_banner_photo),
+                        getString(R.string.remove_banner_photo)
+                    )
+                )
                { _, position, _ ->
                    when (position) {
                        0 -> selectBannerImage()
@ -96,11 +113,16 @@ class UserInfoActivity : AbsBaseActivity() {
            finish()
        }
        next.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
-        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this))))
-                .apply {
-                    next.setTextColor(this)
-                    next.iconTint = this
-                }
+        ColorStateList.valueOf(
+            MaterialValueHelper.getPrimaryTextColor(
+                this,
+                ColorUtil.isColorLight(ThemeStore.accentColor(this))
+            )
+        )
+            .apply {
+                next.setTextColor(this)
+                next.iconTint = this
+            }
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -143,14 +165,13 @@ class UserInfoActivity : AbsBaseActivity() {
                    try {
                        data.data?.let {
                            val bitmap = getResizedBitmap(
-                                    getBitmap(contentResolver, it),
-                                    PROFILE_ICON_SIZE
+                                getBitmap(contentResolver, it),
+                                PROFILE_ICON_SIZE
                            )
                            val profileImagePath = saveToInternalStorage(bitmap, USER_PROFILE)
                            PreferenceUtil.getInstance(this).saveProfileImage(profileImagePath)
                            loadImageFromStorage(profileImagePath)
                        }
-
                    } catch (e: IOException) {
                        e.printStackTrace()
                    }
@ -187,8 +208,8 @@ class UserInfoActivity : AbsBaseActivity() {
        CoroutineScope(Dispatchers.IO).launch {
            withContext(Dispatchers.IO) {
                val bitmap = Compressor(this@UserInfoActivity).setQuality(100)
-                        .setCompressFormat(Bitmap.CompressFormat.WEBP)
-                        .compressToBitmap(File(profileImagePath, USER_BANNER))
+                    .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                    .compressToBitmap(File(profileImagePath, USER_BANNER))
                withContext(Dispatchers.Main) { bannerImage.setImageBitmap(bitmap) }
            }
        }
@ -198,11 +219,11 @@ class UserInfoActivity : AbsBaseActivity() {
        CoroutineScope(Dispatchers.IO).launch {
            withContext(Dispatchers.IO) {
                val bitmap = Compressor(this@UserInfoActivity)
-                        .setMaxHeight(300)
-                        .setMaxWidth(300)
-                        .setQuality(75)
-                        .setCompressFormat(Bitmap.CompressFormat.WEBP)
-                        .compressToBitmap(File(path, USER_PROFILE))
+                    .setMaxHeight(300)
+                    .setMaxWidth(300)
+                    .setQuality(75)
+                    .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                    .compressToBitmap(File(path, USER_PROFILE))
                withContext(Dispatchers.Main) { userImage.setImageBitmap(bitmap) }
            }
        }
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
@ -16,7 +16,6 @@ import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.appHandleColor
-import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.loaders.AlbumLoader
@ -93,8 +92,8 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
    private var lastFMRestClient: LastFMRestClient? = null

    private fun setupToolbar() {
-        applyToolbar(toolbar)
-        supportActionBar?.setDisplayShowHomeEnabled(true)
+        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setSupportActionBar(toolbar)
    }

    override fun onCreate(savedInstanceState: Bundle?) {
@ -141,10 +140,6 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
        deleteAlbumArt = false
    }

-    override fun onPause() {
-        super.onPause()
-    }
-
    private fun toastLoadingFailed() {
        Toast.makeText(
            this@AlbumTagEditorActivity,
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
@ -4,10 +4,10 @@ import android.net.Uri
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.appHandleColor
-import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.loaders.SongLoader
 import kotlinx.android.synthetic.main.activity_song_tag_editor.albumArtistContainer
 import kotlinx.android.synthetic.main.activity_song_tag_editor.albumArtistText
@ -42,8 +42,8 @@ class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher {

        setNoImageMode()
        setUpViews()
-        applyToolbar(toolbar)
-
+        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setSupportActionBar(toolbar)
    }

    private fun setUpViews() {