diff --git a/app/build.gradle b/app/build.gradle
index c7879949..d530e270 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ android {
vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic"
- versionCode 342
- versionName '3.2.136'
+ versionCode 343
+ versionName '3.2.200'
multiDexEnabled true
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index 9d3807db..96a43f89 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-
v3.2.135
- Fix crashing on sharing song
v3.2.125
- Fix crashing on selecting profile picture
- Semi transparent color fix(s) on now playing themes
v3.2.120
- Fix crashing on choosing a theme
- Fix color theme selection without pro enabled
- Fix icon tint some places
v3.2.105
v3.2.100
- Fix crashing on Sleep timer
- Toolbar elevation removed added stroke instead
- Show empty indication for home
v3.2.000
- Implemented Artist image loading all thanks to VinylMusicPlayer
- Fixed buttons in Genre details
- Fixed color buttons in Album and Artist details screen
v3.1.900
- Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist
Details etc.
- Home toolbar is semi transparent in Banner mode
- Added new Buy Retro Music pro in settings
- Improved dark color in Dark theme
v3.1.850
- Toolbar will be clickable for Search
v3.1.800
- Search bar CardView background
- Improve volume zero
- Now playing and Album theme picker rollback to dialog
- Fix sharing app link
- Fix scanning dialog
- Added settings icons for options
v3.1.700
- Cleaned internal code
- Removed full screen option
- Added Toolbar elevation
- To access menu either tap on Toolbar or Hamburger icon
- Fix back button not working on playing queue
- Fix crashing on What's New screen
- Fix lyrics dialog
- Changed toggles to line icons
- Custom UserImageView for loading user profile image
- Fix crashing on artist list for number format error
- Fix blacklist dialog crashing
- Rearranged icons and main menu access
- Fix some crashes when device is locked or background
- Folder screen have main options access
- Dialogs are now using Material Dialogs v3(BottomSheet)
- Fix Shuffle icon for Artist, Album, Genre and Playlist details
v3.1.400
- Removed sync lyrics for Android 5
- Fix Seek-bar color in settings
- Added keyboard to popup on search
- Added keyboard to popup on search
- Improved lock-screen behavior and UI
- Improved text appearance
- Fix bio text not showing in settings
- Fix not showing slider(blur, filter song) amount in settings
- Fix setting ringtone
- Fix file sharing crash
- Fix some crashes
- Fix playlist icon on small devices
- Fix empty lyrics text color
- Fix album cover background purple color in color theme
v3.1.300
- Fix rename playlist text color
- Fix same album showing in details page
- Fix lyrics text alignment on sync and lyrics reading improved
- Improved home sections loading
- Removed library options which are duplicated (it's available from profile menu)
- Replaced collapsing Fab with Android Floating Extended Fab
- Replaced home with for you
- Fixed profile image not loading in about
- Improved selecting user profile image
- Added bio to enter custom message
- Improved some UI screens
v3.1.240
- Fix Search not showing from home screen
- Fix Volume controls color issue
- Fix Seek bar alignment
- Added tiny theme
- Improved full theme appearances
- Now playing theme preview updated
- Fix composer error
- Bottom Options improved(internal)
v3.1.200
- Added composer sort and editing
- Fix Crash in Album tag editor while selecting options
- Added Filter song length
- Added Favourites playlist icon will be accent color
- Added Colorful settings icons
- Added Corners for dialog
v3.0.570
- Fix Album/Artist square image
- Fix Delete dialog text format
- Fix Profile picture not showing after coming back from folders
- Fix Play button color i Simple and Plain themes
- Fix Sleep timer dialog crashing
- Fix Share song dialog title and text
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.2.200
- Carousel effect improved
- Settings icons are now tint accent color
- Settings title, back arrow and icons are now tint accent color
- Equalizer is removed
- Fix keyboard not popping on Search
- Curated the main options
- Folder toolbar outlined, folder icon background fix and separate line removed
v3.2.135
- Fix crashing on sharing song
v3.2.125
- Fix crashing on selecting profile picture
- Semi transparent color fix(s) on now playing themes
v3.2.120
- Fix crashing on choosing a theme
- Fix color theme selection without pro enabled
- Fix icon tint some places
v3.2.105
v3.2.100
- Fix crashing on Sleep timer
- Toolbar elevation removed added stroke instead
- Show empty indication for home
v3.2.000
- Implemented Artist image loading all thanks to VinylMusicPlayer
- Fixed buttons in Genre details
- Fixed color buttons in Album and Artist details screen
v3.1.900
- Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist
Details etc.
- Home toolbar is semi transparent in Banner mode
- Added new Buy Retro Music pro in settings
- Improved dark color in Dark theme
v3.1.850
- Toolbar will be clickable for Search
v3.1.800
- Search bar CardView background
- Improve volume zero
- Now playing and Album theme picker rollback to dialog
- Fix sharing app link
- Fix scanning dialog
- Added settings icons for options
v3.1.700
- Cleaned internal code
- Removed full screen option
- Added Toolbar elevation
- To access menu either tap on Toolbar or Hamburger icon
- Fix back button not working on playing queue
- Fix crashing on What's New screen
- Fix lyrics dialog
- Changed toggles to line icons
- Custom UserImageView for loading user profile image
- Fix crashing on artist list for number format error
- Fix blacklist dialog crashing
- Rearranged icons and main menu access
- Fix some crashes when device is locked or background
- Folder screen have main options access
- Dialogs are now using Material Dialogs v3(BottomSheet)
- Fix Shuffle icon for Artist, Album, Genre and Playlist details
v3.1.400
- Removed sync lyrics for Android 5
- Fix Seek-bar color in settings
- Added keyboard to popup on search
- Added keyboard to popup on search
- Improved lock-screen behavior and UI
- Improved text appearance
- Fix bio text not showing in settings
- Fix not showing slider(blur, filter song) amount in settings
- Fix setting ringtone
- Fix file sharing crash
- Fix some crashes
- Fix playlist icon on small devices
- Fix empty lyrics text color
- Fix album cover background purple color in color theme
v3.1.300
- Fix rename playlist text color
- Fix same album showing in details page
- Fix lyrics text alignment on sync and lyrics reading improved
- Improved home sections loading
- Removed library options which are duplicated (it's available from profile menu)
- Replaced collapsing Fab with Android Floating Extended Fab
- Replaced home with for you
- Fixed profile image not loading in about
- Improved selecting user profile image
- Added bio to enter custom message
- Improved some UI screens
v3.1.240
- Fix Search not showing from home screen
- Fix Volume controls color issue
- Fix Seek bar alignment
- Added tiny theme
- Improved full theme appearances
- Now playing theme preview updated
- Fix composer error
- Bottom Options improved(internal)
v3.1.200
- Added composer sort and editing
- Fix Crash in Album tag editor while selecting options
- Added Filter song length
- Added Favourites playlist icon will be accent color
- Added Colorful settings icons
- Added Corners for dialog
v3.0.570
- Fix Album/Artist square image
- Fix Delete dialog text format
- Fix Profile picture not showing after coming back from folders
- Fix Play button color i Simple and Plain themes
- Fix Sleep timer dialog crashing
- Fix Share song dialog title and text
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/EqualizerActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/EqualizerActivity.kt
deleted file mode 100644
index 6feda4ce..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/EqualizerActivity.kt
+++ /dev/null
@@ -1,186 +0,0 @@
-package code.name.monkey.retromusic.activities
-
-import android.os.Bundle
-import android.transition.TransitionManager
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.SeekBar
-import android.widget.TextView
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.extensions.applyToolbar
-import code.name.monkey.retromusic.helper.EqualizerHelper
-import code.name.monkey.retromusic.util.ViewUtil
-import kotlinx.android.synthetic.main.activity_equalizer.*
-import kotlinx.android.synthetic.main.activity_equalizer.appBarLayout
-import kotlinx.android.synthetic.main.activity_equalizer.toolbar
-import kotlinx.android.synthetic.main.activity_playing_queue.*
-
-/**
- * @author Hemanth S (h4h13).
- */
-
-class EqualizerActivity : AbsMusicServiceActivity(), AdapterView.OnItemSelectedListener {
-
- private val seekBarChangeListener = object : SeekBar.OnSeekBarChangeListener {
- override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
- if (fromUser) {
- if (seekBar === bassBoostStrength) {
- bassBoost.isEnabled = progress > 0
- EqualizerHelper.instance!!.bassBoostStrength = progress
- EqualizerHelper.instance!!.isBassBoostEnabled = progress > 0
- } else if (seekBar === virtualizerStrength) {
- virtualizer.isEnabled = progress > 0
- EqualizerHelper.instance!!.isVirtualizerEnabled = progress > 0
- EqualizerHelper.instance!!.virtualizerStrength = progress
- }
- }
- }
-
- override fun onStartTrackingTouch(seekBar: SeekBar) {
-
- }
-
- override fun onStopTrackingTouch(seekBar: SeekBar) {
-
- }
- }
-
- private var presetsNamesAdapter: ArrayAdapter? = null
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_equalizer)
-
- setStatusbarColorAuto()
- setNavigationbarColorAuto()
- setTaskDescriptionColorAuto()
- setLightNavigationBar(true)
-
- setupToolbar()
-
- equalizerSwitch.isChecked = EqualizerHelper.instance!!.equalizer.enabled
- equalizerSwitch.setBackgroundColor(ThemeStore.accentColor(this))
- val widgetColor = MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this)))
- equalizerSwitch.setTextColor(widgetColor)
- TintHelper.setTintAuto(equalizerSwitch, widgetColor, false)
- equalizerSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
- when (buttonView.id) {
- R.id.equalizerSwitch -> {
- EqualizerHelper.instance!!.equalizer.enabled = isChecked
- TransitionManager.beginDelayedTransition(content)
- content.visibility = if (isChecked) View.VISIBLE else View.GONE
- }
- }
- }
-
- presetsNamesAdapter = ArrayAdapter(this, android.R.layout.simple_list_item_1)
- presets.adapter = presetsNamesAdapter
- presets.onItemSelectedListener = this
-
- bassBoostStrength.progress = EqualizerHelper.instance!!.bassBoostStrength
- ViewUtil.setProgressDrawable(bassBoostStrength, ThemeStore.accentColor(this))
- bassBoostStrength.setOnSeekBarChangeListener(seekBarChangeListener)
-
- virtualizerStrength.progress = EqualizerHelper.instance!!.virtualizerStrength
- ViewUtil.setProgressDrawable(virtualizerStrength, ThemeStore.accentColor(this))
- virtualizerStrength.setOnSeekBarChangeListener(seekBarChangeListener)
-
- setupUI()
- addPresets()
- }
-
- override fun onOptionsItemSelected(item: MenuItem): Boolean {
- if (item.itemId == android.R.id.home) {
- onBackPressed()
- return true
- }
- return super.onOptionsItemSelected(item)
- }
-
- private fun setupToolbar() {
- val primaryColor = ThemeStore.primaryColor(this)
- appBarLayout.setBackgroundColor(primaryColor)
- applyToolbar(toolbar)
- }
-
- private fun addPresets() {
- presetsNamesAdapter!!.clear()
- presetsNamesAdapter!!.add("Custom")
- for (j in 0 until EqualizerHelper.instance!!.equalizer.numberOfPresets) {
- presetsNamesAdapter!!
- .add(EqualizerHelper.instance!!.equalizer.getPresetName(j.toShort()))
- presetsNamesAdapter!!.notifyDataSetChanged()
- }
- presets.setSelection(EqualizerHelper.instance!!.equalizer.currentPreset.toInt() + 1)
- }
-
- private fun setupUI() {
- frequencyBands.removeAllViews()
- val bands: Short
- try {
- // get number of supported bands
- bands = EqualizerHelper.instance!!.numberOfBands.toShort()
-
- // for each of the supported bands, we will set up a slider from -10dB to 10dB boost/attenuation,
- // as well as text labels to assist the user
- for (i in 0 until bands) {
-
- val view = LayoutInflater.from(this).inflate(R.layout.retro_seekbar, frequencyBands, false)
- val freqTextView = view.findViewById(R.id.hurtz)
- freqTextView.text = String.format("%d Hz", EqualizerHelper.instance!!.getCenterFreq(i) / 1000)
-
- val minDbTextView = view.findViewById(R.id.minus_db)
- minDbTextView.text = String.format("%d dB", EqualizerHelper.instance!!.bandLevelLow / 100)
-
- val maxDbTextView = view.findViewById(R.id.plus_db)
- maxDbTextView.text = String.format("%d dB", EqualizerHelper.instance!!.bandLevelHigh / 100)
-
- val bar = view.findViewById(R.id.seekbar)
- ViewUtil.setProgressDrawable(bar, ThemeStore.accentColor(this))
- bar.max = EqualizerHelper.instance!!.bandLevelHigh - EqualizerHelper.instance!!
- .bandLevelLow
- bar.progress = EqualizerHelper.instance!!.getBandLevel(i) - EqualizerHelper.instance!!
- .bandLevelLow
- bar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
- override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
- EqualizerHelper.instance!!.setBandLevel(i,
- progress + EqualizerHelper.instance!!.bandLevelLow)
- if (fromUser) {
- presets.setSelection(0)
- }
- }
-
- override fun onStartTrackingTouch(seekBar: SeekBar) {}
-
- override fun onStopTrackingTouch(seekBar: SeekBar) {}
- })
-
- frequencyBands.addView(view)
- }
- } catch (e: Exception) {
- e.printStackTrace()
- }
-
- }
-
- override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
- if (position == 0) {
- return
- }
- EqualizerHelper.instance!!.equalizer.usePreset((position - 1).toShort())
- setupUI()
- }
-
- override fun onNothingSelected(parent: AdapterView<*>) {
-
- }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt
index 967ff329..f6586f1d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt
@@ -64,7 +64,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
keyboardPopup.setOnClickListener {
val inputManager = getSystemService(Service.INPUT_METHOD_SERVICE) as InputMethodManager
- inputManager.showSoftInput(searchView, 0)
+ inputManager.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT)
}
keyboardPopup.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
index ef2a62f3..29006206 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
@@ -23,6 +23,7 @@ import androidx.preference.Preference
import androidx.preference.TwoStatePreference
import code.name.monkey.appthemehelper.*
import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEColorPreference
+import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
import code.name.monkey.appthemehelper.util.ColorUtil
import code.name.monkey.appthemehelper.util.VersionUtils
import code.name.monkey.retromusic.App
@@ -41,12 +42,21 @@ import com.afollestad.materialdialogs.color.colorChooser
class ThemeSettingsFragment : AbsSettingsFragment() {
override fun invalidateSettings() {
- val primaryColorPref: ATEColorPreference? = findPreference("primary_color")
- primaryColorPref?.let {
- it.isVisible = PreferenceUtil.getInstance().generalTheme == R.style.Theme_RetroMusic_Color
- val primaryColor = ThemeStore.primaryColor(activity!!)
- it.setColor(primaryColor, ColorUtil.darkenColor(primaryColor))
- it.setOnPreferenceClickListener {
+
+ val categoryColor: ATEPreferenceCategory? = findPreference("category_color")
+ val primaryColorPref = ATEColorPreference(preferenceScreen.context)
+
+ val primaryColor = ThemeStore.primaryColor(activity!!)
+
+ primaryColorPref.apply {
+ key = "primary_color"
+ isPersistent = false
+ setSummary(R.string.primary_color_desc)
+ setTitle(R.string.primary_color)
+ isCopyingEnabled = true
+ setIcon(R.drawable.ic_colorize_white_24dp)
+ setColor(primaryColor, ColorUtil.darkenColor(primaryColor))
+ setOnPreferenceClickListener {
MaterialDialog(activity!!, BottomSheet()).show {
title(R.string.primary_color)
positiveButton(R.string.set)
@@ -83,10 +93,6 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
return@setOnPreferenceChangeListener false
}
- if (theme == "color") {
- primaryColorPref?.isVisible = true
- }
-
setSummary(generalTheme, newValue)
when (theme) {
@@ -144,6 +150,9 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
}
}
+ if (PreferenceUtil.getInstance().generalTheme == R.style.Theme_RetroMusic_Color && App.isProVersion) {
+ categoryColor?.addPreference(primaryColorPref)
+ }
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 7d2b0f07..1df3bbd5 100755
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -41,7 +41,7 @@
app:srcCompat="@drawable/ic_keyboard_backspace_black_24dp" />
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file