Dark theme

app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt

@@ -246,7 +246,8 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
             R.id.action_tag_editor -> {
                 val intent = Intent(this, AlbumTagEditorActivity::class.java)
                 intent.putExtra(AbsTagEditorActivity.EXTRA_ID, album.id)
-                startActivityForResult(intent, TAG_EDITOR_REQUEST)
+                val options = ActivityOptions.makeSceneTransitionAnimation(this, image, getString(R.string.transition_album_art))
+                startActivityForResult(intent, TAG_EDITOR_REQUEST, options.toBundle())
                 return true
             }
             /*Sort*/

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt

@@ -2,20 +2,28 @@ package code.name.monkey.retromusic.activities.tageditor
 
 import android.app.Activity
 import android.content.res.ColorStateList
-import android.graphics.*
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
-import android.text.*
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
 import android.widget.Toast
-import code.name.monkey.appthemehelper.util.*
+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.glide.palette.*
+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
 import code.name.monkey.retromusic.rest.LastFMRestClient
 import code.name.monkey.retromusic.rest.model.LastFmAlbum
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.ImageUtil
+import code.name.monkey.retromusic.util.LastFMUtil
 import code.name.monkey.retromusic.util.RetroColorUtil.generatePalette
 import code.name.monkey.retromusic.util.RetroColorUtil.getColor
 import com.bumptech.glide.Glide
@@ -43,16 +51,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 				) {
 					getColor(resource?.palette, Color.TRANSPARENT)
 					albumArtBitmap = resource?.bitmap?.let { ImageUtil.resizeBitmap(it, 2048) }
-					setImageBitmap(
+					setImageBitmap(albumArtBitmap, getColor(resource?.palette, ATHUtil.resolveColor(this@AlbumTagEditorActivity, R.attr.defaultFooterColor)))
-							albumArtBitmap,
-							getColor(
-									resource?.palette,
-									ATHUtil.resolveColor(
-											this@AlbumTagEditorActivity,
-											R.attr.defaultFooterColor
-									)
-							)
-					)
 					deleteAlbumArt = false
 					dataChanged()
 					setResult(Activity.RESULT_OK)
@@ -72,8 +71,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 	private val disposable = CompositeDisposable()
 
 	private fun setupToolbar() {
-		toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
+		applyToolbar(toolbar)
-		setSupportActionBar(toolbar)
 		supportActionBar?.setDisplayShowHomeEnabled(true)
 	}
 

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt

@@ -2,12 +2,12 @@ package code.name.monkey.retromusic.activities.tageditor
 
 import android.net.Uri
 import android.os.Bundle
-import android.text.*
+import android.text.Editable
-import androidx.core.content.ContextCompat
+import android.text.TextWatcher
-import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.MaterialUtil
-import code.name.monkey.appthemehelper.util.*
 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.*
 import org.jaudiotagger.tag.FieldKey
@@ -18,33 +18,13 @@ class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
     override val contentViewLayout: Int
         get() = R.layout.activity_song_tag_editor
 
-	private fun setupToolbar() {
-		appBarLayout.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
-		toolbar.apply {
-			setBackgroundColor(
-					ATHUtil.resolveColor(
-							this@SongTagEditorActivity,
-							R.attr.colorPrimary
-					)
-			)
-			navigationIcon = TintHelper.createTintedDrawable(
-					ContextCompat.getDrawable(
-							context,
-							R.drawable.ic_keyboard_backspace_black_24dp
-					), ThemeStore.textColorPrimary(context)
-			)
-			setNavigationOnClickListener { onBackPressed() }
-			setSupportActionBar(toolbar)
-		}
-		title = null
-	}
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setNoImageMode()
         setUpViews()
-		setupToolbar()
+        applyToolbar(toolbar)
         setStatusbarColorAuto()
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt

@@ -63,7 +63,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
         aboutSettings.setOnClickListener(this)
 
         buyProContainer.apply {
-            if (App.isProVersion()) show() else hide()
+            if (!App.isProVersion()) show() else hide()
             setOnClickListener {
                 NavigationUtil.goToProVersion(requireContext())
             }

app/src/main/res/layout-land/activity_album_tag_editor.xml

@@ -2,6 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gradient_background"
+    android:background="?attr/colorSurface"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

app/src/main/res/layout/activity_album.xml

@@ -57,8 +57,7 @@
                     android:id="@+id/albumCoverContainer"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_margin="16dp"
-                    android:layout_marginEnd="16dp"
                     android:transitionName="@string/transition_album_art"
                     app:cardCornerRadius="24dp"
                     app:cardElevation="8dp"

app/src/main/res/layout/activity_album_tag_editor.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical"
     tools:ignore="UnusedAttribute">
 
@@ -18,6 +19,9 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp"
         app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
@@ -44,10 +48,10 @@
                 android:id="@+id/imageContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="16dp"
                 android:transitionName="@string/transition_album_art"
                 app:cardCornerRadius="24dp"
                 app:cardElevation="8dp"
-                app:cardUseCompatPadding="true"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">

app/src/main/res/layout/activity_artist_details.xml

@@ -56,8 +56,7 @@
                     android:id="@+id/albumCoverContainer"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_margin="16dp"
-                    android:layout_marginEnd="16dp"
                     android:transitionName="@string/transition_artist_image"
                     app:cardCornerRadius="24dp"
                     app:cardElevation="8dp"

app/src/main/res/layout/activity_song_tag_editor.xml

@@ -10,6 +10,9 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp"
         app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar