diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b2c18527..2941835c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,14 +23,14 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.RetroMusic.Light" + android:theme="@style/Theme.RetroMusic.FollowSystem" android:usesCleartextTraffic="false" tools:ignore="AllowBackup,GoogleAppIndexingWarning" tools:targetApi="m"> + android:theme="@style/SplashTheme" + android:label="@string/app_name" > diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt index 88ed51c4..7fa5f979 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt @@ -42,132 +42,133 @@ import java.nio.charset.StandardCharsets class AboutActivity : AbsBaseActivity(), View.OnClickListener { - private val assetJsonData: String? - get() { - val json: String - try { - val inputStream = assets.open("contributors.json") - val size = inputStream.available() - val buffer = ByteArray(size) - inputStream.read(buffer) - inputStream.close() - json = String(buffer, StandardCharsets.UTF_8) - } catch (ex: IOException) { - ex.printStackTrace() - return null - } + private val assetJsonData: String? + get() { + val json: String + try { + val inputStream = assets.open("contributors.json") + val size = inputStream.available() + val buffer = ByteArray(size) + inputStream.read(buffer) + inputStream.close() + json = String(buffer, StandardCharsets.UTF_8) + } catch (ex: IOException) { + ex.printStackTrace() + return null + } - return json - } + return json + } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_about) - setStatusbarColorAuto() - setNavigationBarColorPrimary() - setLightNavigationBar(true) + override fun onCreate(savedInstanceState: Bundle?) { + setDrawUnderStatusBar() + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_about) + setStatusbarColorAuto() + setNavigationbarColorAuto() + setLightNavigationBar(true) - loadContributors() - setSupportActionBar(toolbar) - toolbar.apply { - setBackgroundColor(surfaceColor(context)) - setNavigationOnClickListener { onBackPressed() } - ToolbarContentTintHelper.colorBackButton(toolbar) - } - version.setSummary(getAppVersion()) - setUpView() - } + loadContributors() + setSupportActionBar(toolbar) + toolbar.apply { + setBackgroundColor(surfaceColor(context)) + setNavigationOnClickListener { onBackPressed() } + ToolbarContentTintHelper.colorBackButton(toolbar) + } + version.setSummary(getAppVersion()) + setUpView() + } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - if (item.itemId == android.R.id.home) { - onBackPressed() - return true - } - return super.onOptionsItemSelected(item) - } + override fun onOptionsItemSelected(item: MenuItem): Boolean { + if (item.itemId == android.R.id.home) { + onBackPressed() + return true + } + return super.onOptionsItemSelected(item) + } - private fun openUrl(url: String) { - val i = Intent(Intent.ACTION_VIEW) - i.data = Uri.parse(url) - i.flags = Intent.FLAG_ACTIVITY_NEW_TASK - startActivity(i) - } + private fun openUrl(url: String) { + val i = Intent(Intent.ACTION_VIEW) + i.data = Uri.parse(url) + i.flags = Intent.FLAG_ACTIVITY_NEW_TASK + startActivity(i) + } - private fun setUpView() { - appGithub.setOnClickListener(this) - faqLink.setOnClickListener(this) - telegramLink.setOnClickListener(this) - appRate.setOnClickListener(this) - appTranslation.setOnClickListener(this) - appShare.setOnClickListener(this) - donateLink.setOnClickListener(this) - instagramLink.setOnClickListener(this) - twitterLink.setOnClickListener(this) - changelog.setOnClickListener(this) - openSource.setOnClickListener(this) - pinterestLink.setOnClickListener(this) - bugReportLink.setOnClickListener(this) + private fun setUpView() { + appGithub.setOnClickListener(this) + faqLink.setOnClickListener(this) + telegramLink.setOnClickListener(this) + appRate.setOnClickListener(this) + appTranslation.setOnClickListener(this) + appShare.setOnClickListener(this) + donateLink.setOnClickListener(this) + instagramLink.setOnClickListener(this) + twitterLink.setOnClickListener(this) + changelog.setOnClickListener(this) + openSource.setOnClickListener(this) + pinterestLink.setOnClickListener(this) + bugReportLink.setOnClickListener(this) - } + } - override fun onClick(view: View) { - when (view.id) { - R.id.pinterestLink -> openUrl(PINTEREST) - R.id.faqLink -> openUrl(FAQ_LINK) - R.id.telegramLink -> openUrl(APP_TELEGRAM_LINK) - R.id.appGithub -> openUrl(GITHUB_PROJECT) - R.id.appTranslation -> openUrl(TRANSLATE) - R.id.appRate -> openUrl(RATE_ON_GOOGLE_PLAY) - R.id.appShare -> shareApp() - R.id.donateLink -> NavigationUtil.goToSupportDevelopment(this) - R.id.instagramLink -> openUrl(APP_INSTAGRAM_LINK) - R.id.twitterLink -> openUrl(APP_TWITTER_LINK) - R.id.changelog -> showChangeLogOptions() - R.id.openSource -> NavigationUtil.goToOpenSource(this) - R.id.bugReportLink -> NavigationUtil.bugReport(this) - } - } + override fun onClick(view: View) { + when (view.id) { + R.id.pinterestLink -> openUrl(PINTEREST) + R.id.faqLink -> openUrl(FAQ_LINK) + R.id.telegramLink -> openUrl(APP_TELEGRAM_LINK) + R.id.appGithub -> openUrl(GITHUB_PROJECT) + R.id.appTranslation -> openUrl(TRANSLATE) + R.id.appRate -> openUrl(RATE_ON_GOOGLE_PLAY) + R.id.appShare -> shareApp() + R.id.donateLink -> NavigationUtil.goToSupportDevelopment(this) + R.id.instagramLink -> openUrl(APP_INSTAGRAM_LINK) + R.id.twitterLink -> openUrl(APP_TWITTER_LINK) + R.id.changelog -> showChangeLogOptions() + R.id.openSource -> NavigationUtil.goToOpenSource(this) + R.id.bugReportLink -> NavigationUtil.bugReport(this) + } + } - private fun showChangeLogOptions() { - MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show { - cornerRadius(PreferenceUtil.getInstance(this@AboutActivity).dialogCorner) - listItems(items = listOf("Telegram Channel", "App")) { _, position, _ -> - if (position == 0) { - openUrl(TELEGRAM_CHANGE_LOG) - } else { - NavigationUtil.gotoWhatNews(this@AboutActivity) - } - } - } - } + private fun showChangeLogOptions() { + MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show { + cornerRadius(PreferenceUtil.getInstance(this@AboutActivity).dialogCorner) + listItems(items = listOf("Telegram Channel", "App")) { _, position, _ -> + if (position == 0) { + openUrl(TELEGRAM_CHANGE_LOG) + } else { + NavigationUtil.gotoWhatNews(this@AboutActivity) + } + } + } + } - private fun getAppVersion(): String { - return try { - val packageInfo = packageManager.getPackageInfo(packageName, 0) - packageInfo.versionName - } catch (e: PackageManager.NameNotFoundException) { - e.printStackTrace() - "0.0.0" - } - } + private fun getAppVersion(): String { + return try { + val packageInfo = packageManager.getPackageInfo(packageName, 0) + packageInfo.versionName + } catch (e: PackageManager.NameNotFoundException) { + e.printStackTrace() + "0.0.0" + } + } - private fun shareApp() { - ShareCompat.IntentBuilder.from(this).setType("text/plain") - .setChooserTitle(R.string.share_app) - .setText(String.format(getString(R.string.app_share), packageName)).startChooser() - } + private fun shareApp() { + ShareCompat.IntentBuilder.from(this).setType("text/plain") + .setChooserTitle(R.string.share_app) + .setText(String.format(getString(R.string.app_share), packageName)).startChooser() + } - private fun loadContributors() { - val data = assetJsonData - val type = object : TypeToken>() { + private fun loadContributors() { + val data = assetJsonData + val type = object : TypeToken>() { - }.type - val contributors = Gson().fromJson>(data, type) + }.type + val contributors = Gson().fromJson>(data, type) - val contributorAdapter = ContributorAdapter(contributors) - recyclerView.layoutManager = LinearLayoutManager(this) - recyclerView.itemAnimator = DefaultItemAnimator() - recyclerView.adapter = contributorAdapter - } + val contributorAdapter = ContributorAdapter(contributors) + recyclerView.layoutManager = LinearLayoutManager(this) + recyclerView.itemAnimator = DefaultItemAnimator() + recyclerView.adapter = contributorAdapter + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java index 39fb444b..00e742ac 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java @@ -57,10 +57,11 @@ public class LicenseActivity extends AbsBaseActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + setDrawUnderStatusBar(); super.onCreate(savedInstanceState); setContentView(R.layout.activity_license); setStatusbarColorAuto(); - setNavigationBarColorPrimary(); + setNavigationbarColorAuto(); setLightNavigationBar(true); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt index dc0a5410..e477eaf1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt @@ -34,7 +34,7 @@ class LockScreenActivity : AbsMusicServiceActivity() { hideStatusBar() setStatusbarColorAuto() - setNavigationBarColorPrimary() + setNavigationbarColorAuto() setTaskDescriptionColorAuto() setLightNavigationBar(true) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt index 2520171c..70551114 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt @@ -89,7 +89,7 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage setContentView(R.layout.activity_lyrics) setStatusbarColorAuto() setTaskDescriptionColorAuto() - setNavigationBarColorPrimary() + setNavigationbarColorAuto() applyToolbar(toolbar) fab.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this)) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt index 7e4774ad..54116385 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt @@ -33,10 +33,11 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() { } override fun onCreate(savedInstanceState: Bundle?) { + setDrawUnderStatusBar() super.onCreate(savedInstanceState) setContentView(R.layout.activity_playing_queue) setStatusbarColorAuto() - setNavigationBarColorPrimary() + setNavigationbarColorAuto() setTaskDescriptionColorAuto() setLightNavigationBar(true) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt index c0886275..419f81df 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt @@ -27,7 +27,7 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler { setContentView(R.layout.activity_pro_version) setDrawUnderStatusBar() setStatusbarColorAuto() - setNavigationBarColorPrimary() + setNavigationbarColorAuto() setTaskDescriptionColorAuto() setLightNavigationBar(true) 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 cf7d0856..d5b7dcf6 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 @@ -18,6 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.transition.TransitionManager 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.App @@ -26,7 +27,6 @@ import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity import code.name.monkey.retromusic.adapter.SearchAdapter import code.name.monkey.retromusic.mvp.presenter.SearchPresenter import code.name.monkey.retromusic.mvp.presenter.SearchView -import code.name.monkey.retromusic.util.RetroColorUtil import code.name.monkey.retromusic.util.RetroUtil import com.google.android.material.textfield.TextInputEditText import kotlinx.android.synthetic.main.activity_search.* @@ -45,14 +45,14 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch setDrawUnderStatusBar() super.onCreate(savedInstanceState) setContentView(R.layout.activity_search) - App.musicComponent.inject(this) - searchPresenter.attachView(this) - setStatusbarColorAuto() - setNavigationBarColorPrimary() + setNavigationbarColorAuto() setTaskDescriptionColorAuto() setLightNavigationBar(true) + App.musicComponent.inject(this) + searchPresenter.attachView(this) + setupRecyclerView() setUpToolBar() setupSearchView() @@ -64,7 +64,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch back.setOnClickListener { onBackPressed() } voiceSearch.setOnClickListener { startMicSearch() } clearText.setOnClickListener { searchView.clearText() } - searchContainer.setCardBackgroundColor(RetroColorUtil.toolbarColor(this)) + searchContainer.backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(this, R.attr.colorSurface)) keyboardPopup.setOnClickListener { val inputManager = getSystemService(Service.INPUT_METHOD_SERVICE) as InputMethodManager diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt index 1f559184..b1128732 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt @@ -17,10 +17,11 @@ class SettingsActivity : AbsBaseActivity() { private val fragmentManager = supportFragmentManager override fun onCreate(savedInstanceState: Bundle?) { + setDrawUnderStatusBar() super.onCreate(savedInstanceState) setContentView(R.layout.activity_settings) setStatusbarColorAuto() - setNavigationBarColorPrimary() + setNavigationbarColorAuto() setLightNavigationBar(true) setupToolbar() @@ -31,13 +32,13 @@ class SettingsActivity : AbsBaseActivity() { } private fun setupToolbar() { - setSupportActionBar(toolbar) setTitle(R.string.action_settings) toolbar.apply { setBackgroundColor(ATHUtil.resolveColor(this@SettingsActivity, R.attr.colorSurface)) setNavigationOnClickListener { onBackPressed() } ToolbarContentTintHelper.colorBackButton(toolbar) } + setSupportActionBar(toolbar) } fun setupFragment(fragment: Fragment, @StringRes titleName: Int) { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt index 737060e5..0f27363e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt @@ -59,7 +59,7 @@ class SupportDevelopmentActivity : AbsBaseActivity(), BillingProcessor.IBillingH setContentView(R.layout.activity_donation) setStatusbarColorAuto() - setNavigationBarColorPrimary() + setNavigationbarColorAuto() setTaskDescriptionColorAuto() setLightNavigationBar(true) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt index 7d760604..5da7633e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt @@ -48,7 +48,7 @@ class UserInfoActivity : AbsBaseActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_user_info) setStatusbarColorAuto() - setNavigationBarColorPrimary() + setNavigationbarColorAuto() setTaskDescriptionColorAuto() setLightNavigationBar(true) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java index d0206acf..b03ee721 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java @@ -49,11 +49,11 @@ public class WhatsNewActivity extends AbsBaseActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + setDrawUnderStatusBar(); super.onCreate(savedInstanceState); setContentView(R.layout.activity_whats_new); - setStatusbarColorAuto(); - setNavigationBarColorPrimary(); + setNavigationbarColorAuto(); setTaskDescriptionColorAuto(); webView = findViewById(R.id.webView); diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt index c690fc59..8a2c5309 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt @@ -100,13 +100,13 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable { else -> window.statusBarColor = ColorUtil.darkenColor(color) } } - setLightStatusbarAuto(ATHUtil.resolveColor(this, android.R.attr.windowBackground)) + setLightStatusbarAuto(ATHUtil.resolveColor(this, R.attr.colorSurface)) } fun setStatusbarColorAuto() { // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat //setStatusbarColor(ATHUtil.resolveColor(this, android.R.attr.windowBackground)) - setLightStatusbarAuto(ATHUtil.resolveColor(this, android.R.attr.windowBackground)) + setLightStatusbarAuto(ATHUtil.resolveColor(this, R.attr.colorSurface)) } open fun setTaskDescriptionColor(@ColorInt color: Int) { @@ -114,7 +114,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable { } fun setTaskDescriptionColorAuto() { - setTaskDescriptionColor(ATHUtil.resolveColor(this, android.R.attr.windowBackground)) + setTaskDescriptionColor(ATHUtil.resolveColor(this, R.attr.colorSurface)) } open fun setNavigationbarColor(color: Int) { @@ -125,12 +125,8 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable { } } - open fun setNavigationBarColorPrimary() { - ATH.setNavigationbarColor(this, ATHUtil.resolveColor(this, android.R.attr.windowBackground)) - } - fun setNavigationbarColorAuto() { - setNavigationbarColor(ATHUtil.resolveColor(this, android.R.attr.windowBackground)) + setNavigationbarColor(ATHUtil.resolveColor(this, R.attr.colorSurface)) } open fun setLightStatusbar(enabled: Boolean) { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt index e6b24f25..37106a52 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt @@ -62,6 +62,7 @@ open class BugReportActivity : AbsThemeActivity() { private var deviceInfo: DeviceInfo? = null override fun onCreate(savedInstanceState: Bundle?) { + setDrawUnderStatusBar() super.onCreate(savedInstanceState) setContentView(R.layout.activity_bug_report) setStatusbarColorAuto() diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt index 8beb3f96..fc20026a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt @@ -81,7 +81,7 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { dialog?.window?.let { - (requireActivity() as MainActivity).setNavigationBarColorPrimary() + (requireActivity() as MainActivity).setNavigationbarColorAuto() (requireActivity() as MainActivity).setLightNavigationBar(true) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt index 8bc6a10b..bfa10fb9 100755 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt @@ -1,18 +1,22 @@ package code.name.monkey.retromusic.fragments import android.content.Context -import android.graphics.* +import android.graphics.Color +import android.graphics.PorterDuff import android.media.AudioManager import android.os.Bundle -import android.view.* +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup import android.widget.SeekBar import androidx.fragment.app.Fragment import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.util.* -import code.name.monkey.retromusic.volume.* +import code.name.monkey.retromusic.util.PreferenceUtil +import code.name.monkey.retromusic.util.ViewUtil +import code.name.monkey.retromusic.volume.AudioVolumeObserver +import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener import kotlinx.android.synthetic.main.fragment_volume.* class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolumeChangedListener, View.OnClickListener { @@ -33,10 +37,6 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum setTintable(ThemeStore.accentColor(requireContext())) volumeDown.setOnClickListener(this) volumeUp.setOnClickListener(this) - - val iconColor = ATHUtil.resolveColor(requireContext(), R.attr.iconColor) - volumeDown.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN) - volumeUp.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN) } override fun onResume() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt index 54d672fb..7979397f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt @@ -1,6 +1,5 @@ package code.name.monkey.retromusic.fragments.base -import android.os.Build import android.os.Bundle import android.view.View import code.name.monkey.appthemehelper.util.ATHUtil @@ -29,8 +28,8 @@ abstract class AbsMainActivityFragment : AbsMusicServiceFragment() { private fun setStatusBarColor(view: View, color: Int) { val statusBar = view.findViewById(R.id.status_bar) if (statusBar != null) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - //statusBar.setBackgroundColor(color) + if (VersionUtils.hasMarshmallow()) { + statusBar.setBackgroundColor(color) mainActivity.setLightStatusbarAuto(color) } else { statusBar.setBackgroundColor(color) @@ -39,7 +38,7 @@ abstract class AbsMainActivityFragment : AbsMusicServiceFragment() { } fun setStatusBarColorAuto(view: View) { - val colorPrimary = ATHUtil.resolveColor(requireContext(), android.R.attr.windowBackground) + val colorPrimary = ATHUtil.resolveColor(requireContext(), R.attr.colorSurface) // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat if (VersionUtils.hasMarshmallow()) { setStatusBarColor(view, colorPrimary) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java index cc5f9663..33fd1bd4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java @@ -188,7 +188,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde .setMenu(menuRes) .setCloseDrawableRes(R.drawable.ic_close_white_24dp) .setBackgroundColor( - RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorPrimary))) + RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface))) .start(callback); return cab; } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java index a3fe49ae..7e40bb71 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java @@ -307,7 +307,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements cab = new MaterialCab(getMainActivity(), R.id.cab_stub) .setMenu(menuRes) .setCloseDrawableRes(R.drawable.ic_close_white_24dp) - .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorPrimary))) + .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface))) .start(callback); return cab; } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt index aa3c13b8..92fe4534 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt @@ -1,12 +1,14 @@ package code.name.monkey.retromusic.fragments.mainactivity.home import android.app.ActivityOptions +import android.content.res.ColorStateList import android.os.Bundle import android.util.DisplayMetrics import android.view.* import androidx.appcompat.widget.Toolbar import androidx.recyclerview.widget.LinearLayoutManager import code.name.monkey.appthemehelper.common.ATHToolbarActivity +import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.App @@ -98,11 +100,11 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba setupToolbar() - userImage.setOnClickListener { + userImage?.setOnClickListener { val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, userImage, getString(R.string.transition_user_image)) NavigationUtil.goToUserInfo(requireActivity(), options) } - titleWelcome.text = String.format("%s", PreferenceUtil.getInstance(requireContext()).userName) + titleWelcome?.text = String.format("%s", PreferenceUtil.getInstance(requireContext()).userName) App.musicComponent.inject(this) homeAdapter = HomeAdapter(mainActivity, displayMetrics) @@ -125,7 +127,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba private fun setupToolbar() { toolbar.apply { - setBackgroundColor(RetroColorUtil.toolbarColor(mainActivity)) + backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)) setNavigationIcon(R.drawable.ic_menu_white_24dp) setOnClickListener { val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, toolbarContainer, getString(R.string.transition_toolbar)) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt index 2077eead..e8268f23 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt @@ -143,9 +143,9 @@ class AdaptiveFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Call playerToolbar.apply { inflateMenu(R.menu.menu_player) setNavigationOnClickListener { requireActivity().onBackPressed() } - ToolbarContentTintHelper.colorizeToolbar(this, primaryColor, activity) + ToolbarContentTintHelper.colorizeToolbar(this, primaryColor, requireActivity()) setTitleTextColor(primaryColor) - setSubtitleTextColor(ThemeStore.textColorSecondary(context!!)) + setSubtitleTextColor(ThemeStore.textColorSecondary(requireContext())) setOnMenuItemClickListener(this@AdaptiveFragment) } } @@ -183,8 +183,8 @@ class AdaptiveFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Call override fun onColorChanged(color: Int) { playbackControlsFragment.setDark(color) lastColor = color - callbacks!!.onPaletteColorChanged() - ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), activity) + callbacks?.onPaletteColorChanged() + ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity()) } override fun onShow() { @@ -201,7 +201,7 @@ class AdaptiveFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Call } override fun toolbarIconColor(): Int { - return ATHUtil.resolveColor(context, R.attr.iconColor) + return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal) } override val paletteColor: Int diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt index b28808fb..f8f543c0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt @@ -8,14 +8,14 @@ import androidx.appcompat.widget.Toolbar import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.helper.MusicPlayerRemote +import code.name.monkey.retromusic.model.Song import kotlinx.android.synthetic.main.fragment_fit.* -class FitFragment : AbsPlayerFragment() { +class FitFragment : AbsPlayerFragment() { override fun playerToolbar(): Toolbar { return playerToolbar } @@ -40,15 +40,15 @@ class FitFragment : AbsPlayerFragment() { } override fun toolbarIconColor(): Int { - return ATHUtil.resolveColor(context, R.attr.iconColor) + return ATHUtil.resolveColor(context, R.attr.colorControlNormal) } override fun onColorChanged(color: Int) { playbackControlsFragment.setDark(color) lastColor = color - callbacks!!.onPaletteColorChanged() + callbacks?.onPaletteColorChanged() - ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), activity) + ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity()) } @@ -84,11 +84,11 @@ class FitFragment : AbsPlayerFragment() { } private fun setUpPlayerToolbar() { - playerToolbar!!.apply { + playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { activity!!.onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressed() } setOnMenuItemClickListener(this@FitFragment) - ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity) + ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity()) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt index 7e8cb7fb..a9422bb4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt @@ -41,10 +41,9 @@ class FlatPlayerFragment : AbsPlayerFragment() { private fun setUpPlayerToolbar() { playerToolbar.inflateMenu(R.menu.menu_player) - playerToolbar.setNavigationOnClickListener { _ -> activity!!.onBackPressed() } + playerToolbar.setNavigationOnClickListener { _ -> requireActivity().onBackPressed() } playerToolbar.setOnMenuItemClickListener(this) - ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, - R.attr.iconColor), activity) + ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity()) } private fun colorize(i: Int) { @@ -90,24 +89,21 @@ class FlatPlayerFragment : AbsPlayerFragment() { override fun toolbarIconColor(): Int { val isLight = ColorUtil.isColorLight(paletteColor) return if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) - MaterialValueHelper.getPrimaryTextColor(context, isLight) + MaterialValueHelper.getPrimaryTextColor(requireContext(), isLight) else - ATHUtil.resolveColor(context, R.attr.iconColor) + ATHUtil.resolveColor(context, R.attr.colorControlNormal) } override fun onColorChanged(color: Int) { lastColor = color flatPlaybackControlsFragment.setDark(color) - callbacks!!.onPaletteColorChanged() - + callbacks?.onPaletteColorChanged() val isLight = ColorUtil.isColorLight(color) - - //TransitionManager.beginDelayedTransition(mToolbar); val iconColor = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) - MaterialValueHelper.getPrimaryTextColor(context!!, isLight) + MaterialValueHelper.getPrimaryTextColor(requireContext(), isLight) else - ATHUtil.resolveColor(context!!, R.attr.iconColor) - ToolbarContentTintHelper.colorizeToolbar(playerToolbar, iconColor, activity) + ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal) + ToolbarContentTintHelper.colorizeToolbar(playerToolbar, iconColor, requireActivity()) if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) { colorize(color) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt index ed22b9a2..9a548fd6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt @@ -44,7 +44,7 @@ class MaterialFragment : AbsPlayerFragment() { } override fun toolbarIconColor(): Int { - return ATHUtil.resolveColor(requireContext(), R.attr.iconColor) + return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal) } override fun onColorChanged(color: Int) { @@ -52,7 +52,7 @@ class MaterialFragment : AbsPlayerFragment() { lastColor = color callbacks?.onPaletteColorChanged() - ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.iconColor), requireActivity()) + ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity()) } override fun toggleFavorite(song: Song) { @@ -89,7 +89,7 @@ class MaterialFragment : AbsPlayerFragment() { inflateMenu(R.menu.menu_player) setNavigationOnClickListener { requireActivity().onBackPressed() } setOnMenuItemClickListener(this@MaterialFragment) - ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity()) + ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.colorControlNormal), requireActivity()) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt index 017bbf4e..b70b94ac 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt @@ -3,7 +3,6 @@ package code.name.monkey.retromusic.fragments.player.normal import android.animation.ArgbEvaluator import android.animation.ValueAnimator import android.graphics.drawable.GradientDrawable -import android.os.Build import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -22,7 +21,7 @@ import code.name.monkey.retromusic.views.DrawableGradient import kotlinx.android.synthetic.main.fragment_player.* -class PlayerFragment : AbsPlayerFragment() { +class PlayerFragment : AbsPlayerFragment() { private var lastColor: Int = 0 override val paletteColor: Int @@ -34,15 +33,19 @@ class PlayerFragment : AbsPlayerFragment() { private fun colorize(i: Int) { if (valueAnimator != null) { - valueAnimator!!.cancel() + valueAnimator?.cancel() } - valueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), android.R.color.transparent, i) - valueAnimator!!.addUpdateListener { animation -> - val drawable = DrawableGradient(GradientDrawable.Orientation.TOP_BOTTOM, intArrayOf(animation.animatedValue as Int, android.R.color.transparent), 0) - colorGradientBackground?.background = drawable + valueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), ATHUtil.resolveColor(requireContext(), R.attr.colorSurface), i) + valueAnimator?.addUpdateListener { animation -> + if (isAdded) { + val drawable = DrawableGradient(GradientDrawable.Orientation.TOP_BOTTOM, + intArrayOf(animation.animatedValue as Int, + ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)), 0) + colorGradientBackground?.background = drawable + } } - valueAnimator!!.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong()).start() + valueAnimator?.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong())?.start() } override fun onShow() { @@ -59,25 +62,21 @@ class PlayerFragment : AbsPlayerFragment() { } override fun toolbarIconColor(): Int { - return ATHUtil.resolveColor(context, R.attr.iconColor) + return ATHUtil.resolveColor(context, R.attr.colorControlNormal) } override fun onColorChanged(color: Int) { playbackControlsFragment.setDark(color) lastColor = color - callbacks!!.onPaletteColorChanged() + callbacks?.onPaletteColorChanged() - ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), activity) + ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.colorControlNormal), activity) if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) { colorize(color) } } - private fun getCutOff(): Int { - return if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) 20 else 0 - } - override fun toggleFavorite(song: Song) { super.toggleFavorite(song) if (song.id == MusicPlayerRemote.currentSong.id) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt index c7d20815..09f6fa99 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt @@ -60,9 +60,9 @@ class PeakPlayerFragment : AbsPlayerFragment() { private fun setUpPlayerToolbar() { playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { activity!!.onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressed() } setOnMenuItemClickListener(this@PeakPlayerFragment) - ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity) + ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.colorControlNormal), requireActivity()) } } @@ -83,7 +83,7 @@ class PeakPlayerFragment : AbsPlayerFragment() { } override fun toolbarIconColor(): Int { - return ATHUtil.resolveColor(requireContext(), R.attr.iconColor) + return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal) } override val paletteColor: Int diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt index 3b3921d9..30eb755c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt @@ -15,13 +15,10 @@ object ThemeManager { @StyleRes fun getThemeResValue(context: Context): Int = when (PreferenceUtil.getInstance(context).generalThemeValue) { "light" -> R.style.Theme_RetroMusic_Light - "auto" -> R.style.Theme_RetroMusic_FollowSystem + "dark" -> R.style.Theme_RetroMusic_Base + "auto" -> R.style.Theme_RetroMusic_FollowSystem "black" -> R.style.Theme_RetroMusic_Black - else -> R.style.Theme_RetroMusic - /** - * To add a toggle for amoled theme just add an if statement such as - * if(PreferenceUtil.getInstance(context).useAmoled) blablabla - */ + else -> R.style.Theme_RetroMusic_FollowSystem } private fun isSystemDarkModeEnabled(context: Context): Boolean { diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt index 80eb8571..33b78ffe 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt @@ -42,7 +42,7 @@ class BottomNavigationBarTinted @JvmOverloads constructor( val accentColor = ThemeStore.accentColor(context) NavigationViewUtil.setItemIconColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor) NavigationViewUtil.setItemTextColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor) - itemBackground = RippleDrawable(RippleUtils.convertToRippleDrawableColor(ColorStateList.valueOf(ThemeStore.accentColor(context).addAlpha())), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background), null) + itemBackground = RippleDrawable(RippleUtils.convertToRippleDrawableColor(ColorStateList.valueOf(ThemeStore.accentColor(context).addAlpha())), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background_mask)) setOnApplyWindowInsetsListener(null) //itemRippleColor = ColorStateList.valueOf(accentColor) backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(context, android.R.attr.windowBackground)) diff --git a/app/src/main/res/drawable/bottom_navigation_item_background.xml b/app/src/main/res/drawable/bottom_navigation_item_background.xml index 59e47c01..48700e4d 100644 --- a/app/src/main/res/drawable/bottom_navigation_item_background.xml +++ b/app/src/main/res/drawable/bottom_navigation_item_background.xml @@ -1,6 +1,23 @@ - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bottom_navigation_item_background_mask.xml b/app/src/main/res/drawable/bottom_navigation_item_background_mask.xml new file mode 100644 index 00000000..fd8fd117 --- /dev/null +++ b/app/src/main/res/drawable/bottom_navigation_item_background_mask.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/round_selected.xml b/app/src/main/res/drawable/round_selected.xml index 7b468848..0a18d996 100644 --- a/app/src/main/res/drawable/round_selected.xml +++ b/app/src/main/res/drawable/round_selected.xml @@ -1,5 +1,5 @@ - + android:shape="oval"> + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml index 7a7d2765..9bf58251 100644 --- a/app/src/main/res/layout-land/fragment_banner_home.xml +++ b/app/src/main/res/layout-land/fragment_banner_home.xml @@ -17,33 +17,40 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?attr/colorSurface" android:orientation="vertical"> - + android:layout_height="wrap_content"> - + + + + + + android:orientation="vertical"> - + android:layout_height="228dp" + app:cardCornerRadius="24dp" + app:cardUseCompatPadding="true"> - + android:layout_height="wrap_content"> + - - - - - - - - - - + app:cardUseCompatPadding="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_scrollFlags="scroll|enterAlways" + app:shapeAppearance="@style/ToolbarCornerCardView"> - - - + - + - + - + + + + - - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml index c0006bda..a4fad57f 100644 --- a/app/src/main/res/layout-land/fragment_card_player.xml +++ b/app/src/main/res/layout-land/fragment_card_player.xml @@ -8,6 +8,11 @@ android:clickable="true" android:focusable="true"> + + + + - + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_material.xml b/app/src/main/res/layout-land/fragment_material.xml index 8695f825..17db73aa 100644 --- a/app/src/main/res/layout-land/fragment_material.xml +++ b/app/src/main/res/layout-land/fragment_material.xml @@ -7,6 +7,11 @@ android:clickable="true" android:focusable="true"> + + + + diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml index 523e6864..cdd43d54 100755 --- a/app/src/main/res/layout-land/fragment_player.xml +++ b/app/src/main/res/layout-land/fragment_player.xml @@ -7,6 +7,11 @@ android:clickable="true" android:focusable="true"> + + + + @@ -76,8 +77,56 @@ android:layout_marginEnd="@dimen/toolbar_margin_horizontal" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> - - + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge-land/fragment_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml index eb4898ea..2fd31c58 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_player.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml @@ -7,6 +7,11 @@ android:clickable="true" android:focusable="true"> + + @@ -149,7 +149,7 @@ android:paddingLeft="8dp" android:singleLine="true" android:textAppearance="@style/TextViewHeadline6" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" tools:ignore="RtlHardcoded,RtlSymmetry" tools:text="00:22" /> diff --git a/app/src/main/res/layout-xlarge/fragment_banner_home.xml b/app/src/main/res/layout-xlarge/fragment_banner_home.xml index ae9a95e5..3d89afc3 100644 --- a/app/src/main/res/layout-xlarge/fragment_banner_home.xml +++ b/app/src/main/res/layout-xlarge/fragment_banner_home.xml @@ -17,6 +17,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"> - + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml index a707a5b9..720ab992 100644 --- a/app/src/main/res/layout-xlarge/fragment_player.xml +++ b/app/src/main/res/layout-xlarge/fragment_player.xml @@ -7,6 +7,11 @@ android:clickable="true" android:focusable="true"> + + - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="0dp" + android:background="?attr/colorSurface" + tools:ignore="UnusedAttribute" /> - - - - - + android:background="?attr/colorSurface"> - - - \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml index 7024bca2..0f34dd97 100644 --- a/app/src/main/res/layout/activity_bug_report.xml +++ b/app/src/main/res/layout/activity_bug_report.xml @@ -1,62 +1,74 @@ - - + android:layout_height="0dp" + android:background="?attr/colorSurface" + tools:ignore="UnusedAttribute" /> - - - - - + android:layout_height="match_parent" + android:background="?attr/colorSurface"> - + app:liftOnScroll="true"> - + + + + + + + android:clipToPadding="false" + android:orientation="vertical"> - + - + - + - + - - \ 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 45029315..2ab3123c 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -1,37 +1,51 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="0dp" + android:background="?attr/colorSurface" + tools:ignore="UnusedAttribute" /> - - - - - + android:background="?attr/colorSurface"> - - - + android:layout_height="wrap_content" + android:background="?colorPrimary" + app:liftOnScroll="true"> + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml index 603de6b1..e1e76c65 100755 --- a/app/src/main/res/layout/activity_playing_queue.xml +++ b/app/src/main/res/layout/activity_playing_queue.xml @@ -1,77 +1,93 @@ - + android:background="?attr/colorSurface" + android:orientation="vertical" + tools:ignore="UnusedAttribute"> - + android:layout_height="wrap_content"> - + + + + + + android:background="@android:color/transparent" + android:elevation="0dp" + app:elevation="0dp" + app:liftOnScroll="true"> - - + + + + + + + + + + + + android:id="@android:id/empty" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/empty" + android:textAppearance="@style/TextViewNormal" + android:textColor="?colorOnSecondary" + android:visibility="gone" + tools:visibility="visible" /> - + - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index feebc8dd..22ed0a09 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -51,7 +51,6 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:clipToPadding="false" android:scrollbars="none" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index f30b4278..75ba4cd0 100755 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,35 +1,49 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="0dp" + android:background="?attr/colorSurface" + tools:ignore="UnusedAttribute" /> - + + - + android:layout_height="wrap_content" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> - + + - + - - + + + + + diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml index 49867292..a4003fa9 100644 --- a/app/src/main/res/layout/activity_whats_new.xml +++ b/app/src/main/res/layout/activity_whats_new.xml @@ -1,39 +1,53 @@ - + android:orientation="vertical"> - + android:layout_height="0dp" + android:background="?attr/colorSurface" + tools:ignore="UnusedAttribute" /> - - - - - + android:background="?attr/colorSurface"> - + app:liftOnScroll="true"> - - + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml index 958f55f9..0c290604 100644 --- a/app/src/main/res/layout/fragment_adaptive_player.xml +++ b/app/src/main/res/layout/fragment_adaptive_player.xml @@ -3,13 +3,15 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:clickable="true" - android:focusable="true"> + android:layout_height="match_parent"> + + - - - + android:layout_height="match_parent" + android:background="?attr/colorSurface" + android:orientation="vertical"> - + 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/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml index 8649b671..aa799fe5 100644 --- a/app/src/main/res/layout/fragment_card_player.xml +++ b/app/src/main/res/layout/fragment_card_player.xml @@ -4,10 +4,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:attr/windowBackground" android:clickable="true" android:focusable="true"> + + + + + + @@ -34,7 +34,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" tools:text="00:22" /> diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml index 4b198b59..a5399de8 100644 --- a/app/src/main/res/layout/fragment_flat_player.xml +++ b/app/src/main/res/layout/fragment_flat_player.xml @@ -8,6 +8,11 @@ android:focusable="true" android:orientation="vertical"> + + @@ -39,7 +39,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" /> diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml index 9506ff20..45c30875 100644 --- a/app/src/main/res/layout/fragment_full.xml +++ b/app/src/main/res/layout/fragment_full.xml @@ -7,6 +7,11 @@ android:clickable="true" android:focusable="true"> + + - + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 8ef7f9e4..d550ee75 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -17,6 +17,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"> + + @@ -42,7 +42,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" tools:text="00:22" /> @@ -100,7 +100,8 @@ android:layout_gravity="center" android:ellipsize="end" android:gravity="center" - android:maxLines="1" android:paddingStart="16dp" + android:maxLines="1" + android:paddingStart="16dp" android:paddingEnd="16dp" android:textAppearance="@style/TextViewBody1" app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer" diff --git a/app/src/main/res/layout/fragment_peak_control_player.xml b/app/src/main/res/layout/fragment_peak_control_player.xml index 0bbbb70d..7680a6e4 100644 --- a/app/src/main/res/layout/fragment_peak_control_player.xml +++ b/app/src/main/res/layout/fragment_peak_control_player.xml @@ -39,7 +39,7 @@ android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" tools:text="00:22" /> @@ -53,7 +53,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" tools:text="00:22" /> diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml index c32a0521..afda28a5 100644 --- a/app/src/main/res/layout/fragment_peak_player.xml +++ b/app/src/main/res/layout/fragment_peak_player.xml @@ -21,94 +21,103 @@ android:focusable="true" android:orientation="vertical"> - - - - - - - - + android:layout_height="wrap_content" + android:layout_weight="0" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + + + + + + + + - - - - - - - + app:layout_constraintTop_toBottomOf="@+id/imageContainer"> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml index 86f216cd..e0e89871 100644 --- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml @@ -26,7 +26,7 @@ android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" tools:text="00:22" /> @@ -40,7 +40,7 @@ android:gravity="center_vertical|right|end" android:paddingRight="8dp" android:singleLine="true" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" tools:text="00:22" /> diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index 5c643370..d0a66c0a 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -7,6 +7,11 @@ android:clickable="true" android:focusable="true"> + + diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 58bd4f28..3ff91670 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -7,6 +7,11 @@ android:clickable="true" android:focusable="true"> + + @@ -56,7 +56,7 @@ android:gravity="center_vertical|left|end" android:paddingLeft="8dp" android:singleLine="true" - android:textColor="?colorOnSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" tools:ignore="RtlHardcoded,RtlSymmetry" tools:text="00:22" /> @@ -101,7 +101,8 @@ android:layout_gravity="center" android:ellipsize="end" android:gravity="center" - android:maxLines="1" android:paddingStart="16dp" + android:maxLines="1" + android:paddingStart="16dp" android:paddingEnd="16dp" android:textAppearance="@style/TextViewBody1" android:textColor="?android:attr/textColorSecondary" @@ -205,9 +206,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" - android:paddingStart="8dp" - android:paddingEnd="8dp" app:layout_constraintBottom_toBottomOf="parent" - tools:backgroundTint="@color/md_red_400" + tools:background="@color/md_red_400" tools:layout_height="52dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml index fcbdf520..d0bfe301 100644 --- a/app/src/main/res/layout/fragment_simple_player.xml +++ b/app/src/main/res/layout/fragment_simple_player.xml @@ -8,6 +8,13 @@ android:focusable="true" android:orientation="vertical"> + + + android:paddingBottom="14dp" + android:paddingEnd="8dp" > - + app:tint="?attr/colorControlNormal" /> + android:textColor="?android:attr/textColorPrimary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/metal_section_recycler_view.xml b/app/src/main/res/layout/metal_section_recycler_view.xml index 7544ab26..57771cc8 100644 --- a/app/src/main/res/layout/metal_section_recycler_view.xml +++ b/app/src/main/res/layout/metal_section_recycler_view.xml @@ -9,15 +9,16 @@ + tools:text="@tools:sample/lorem" /> + tools:text="@tools:sample/lorem" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0c139953..6b3b42d4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -26,7 +26,7 @@ #ffffff #000000 #000000 - #17181a + #000000 #00000000 diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index 8f63f8ba..f9fe252d 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -2,7 +2,6 @@ -