From 6d84ad102885c7e086b35d99a7c84bc506a731e4 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Sun, 4 Aug 2019 15:38:34 +0530 Subject: [PATCH] Fix some error --- app/build.gradle | 4 ++-- app/src/main/assets/contributors.json | 2 +- .../activities/WhatsNewActivity.java | 3 ++- .../activities/bugreport/BugReportActivity.kt | 2 +- .../dialogs/RemoveFromPlaylistDialog.kt | 18 ++++++++++-------- .../retromusic/dialogs/SongShareDialog.kt | 6 +++--- .../AdaptivePlaybackControlsFragment.kt | 5 +++-- .../blur/BlurPlaybackControlsFragment.kt | 8 ++++---- .../material/MaterialControlsFragment.kt | 6 +++--- .../preferences/LibraryPreference.kt | 2 +- 10 files changed, 30 insertions(+), 26 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 74f1749c..104a8f9a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 348 - versionName '3.3.000' + versionCode 352 + versionName '3.3.100' multiDexEnabled true diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json index 9f6efa63..7c852af0 100644 --- a/app/src/main/assets/contributors.json +++ b/app/src/main/assets/contributors.json @@ -19,7 +19,7 @@ }, { "name": "ᴍɪʟɪɴᴅ ɢᴏᴇʟ | ᴘʟ2", - "summary": "Telegram group helper", + "summary": "Github & Telegram maintainer", "link": "https://t.me/MilindGoel15", "profile_image": "https://i.imgur.com/ZIdLHYx.jpg" }, 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 42a3887e..38ead6d8 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 @@ -7,6 +7,7 @@ import android.os.Bundle; import android.webkit.WebView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import com.google.android.material.appbar.AppBarLayout; @@ -45,7 +46,7 @@ public class WhatsNewActivity extends AbsBaseActivity { } @Override - protected void onCreate(Bundle savedInstanceState) { + protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_whats_new); 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 c7f28c40..4fa1b25d 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 @@ -151,7 +151,7 @@ open class BugReportActivity : AbsThemeActivity() { private fun copyDeviceInfoToClipBoard() { val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clip = ClipData.newPlainText(getString(R.string.device_info), deviceInfo!!.toMarkdown()) - clipboard.primaryClip = clip + clipboard.setPrimaryClip(clip) Toast.makeText(this@BugReportActivity, R.string.copied_device_info_to_clipboard, Toast.LENGTH_LONG).show() } diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt index b2636d4e..b6d6208d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt @@ -30,14 +30,16 @@ class RemoveFromPlaylistDialog : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val songs = arguments!!.getParcelableArrayList("songs") - val title: Int - val content: CharSequence - if (songs.size > 1) { - title = R.string.remove_songs_from_playlist_title - content = Html.fromHtml(getString(code.name.monkey.retromusic.R.string.remove_x_songs_from_playlist, songs.size)) - } else { - title = R.string.remove_song_from_playlist_title - content = Html.fromHtml(getString(code.name.monkey.retromusic.R.string.remove_song_x_from_playlist, songs[0].title)) + var title = 0 + var content: CharSequence = "" + if (songs != null) { + if (songs.size > 1) { + title = R.string.remove_songs_from_playlist_title + content = Html.fromHtml(getString(code.name.monkey.retromusic.R.string.remove_x_songs_from_playlist, songs.size)) + } else { + title = R.string.remove_song_from_playlist_title + content = Html.fromHtml(getString(code.name.monkey.retromusic.R.string.remove_song_x_from_playlist, songs[0].title)) + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt index 1c3cf6ae..3a3dc98a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt @@ -64,8 +64,8 @@ class SongShareDialog : DialogFragment() { }*/ override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val song: Song = arguments!!.getParcelable("song") - val currentlyListening: String = getString(R.string.currently_listening_to_x_by_x, song.title, song.artistName) + val song: Song? = arguments!!.getParcelable("song") + val currentlyListening: String = getString(R.string.currently_listening_to_x_by_x, song?.title, song?.artistName) return MaterialDialog(activity!!, BottomSheet()) .title(R.string.what_do_you_want_to_share) @@ -73,7 +73,7 @@ class SongShareDialog : DialogFragment() { listItems(items = listOf(getString(code.name.monkey.retromusic.R.string.the_audio_file), "\u201C" + currentlyListening + "\u201D")) { dialog, index, text -> when (index) { 0 -> { - startActivity(Intent.createChooser(MusicUtil.createShareSongFileIntent(song, context), null)) + startActivity(Intent.createChooser(song?.let { MusicUtil.createShareSongFileIntent(it, context) }, null)) } 1 -> { activity!!.startActivity( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt index ed4cefb1..efa306d1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt @@ -101,8 +101,9 @@ class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() { val colorFinal = if (PreferenceUtil.getInstance().adaptiveColor) { color } else { - ThemeStore.accentColor(context!!).ripAlpha() - } + ThemeStore.accentColor(context!!) + }.ripAlpha() + TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(colorFinal)), false) TintHelper.setTintAuto(playPauseButton, colorFinal, true) ViewUtil.setProgressDrawable(progressSlider, colorFinal, true) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt index bd1950e7..0e7d36c7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt @@ -117,13 +117,13 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { val colorFinal = if (PreferenceUtil.getInstance().adaptiveColor) { color } else { - ThemeStore.accentColor(requireContext()) - }.ripAlpha() + ThemeStore.textColorSecondary(requireContext()) + } text.setTextColor(colorFinal) - TintHelper.setTintAuto(progressSlider, colorFinal, false) + TintHelper.setTintAuto(progressSlider, colorFinal.ripAlpha(), false) volumeFragment?.setTintableColor(Color.WHITE) - setFabColor(colorFinal) + setFabColor(colorFinal.ripAlpha()) } private fun setFabColor(i: Int) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt index b4a0159f..81eb4d45 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt @@ -119,12 +119,12 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() { color } else { ThemeStore.textColorSecondary(context!!) - }.ripAlpha() + } text.setTextColor(colorFinal) - ViewUtil.setProgressDrawable(progressSlider, colorFinal, false) + ViewUtil.setProgressDrawable(progressSlider, colorFinal.ripAlpha(), true) - volumeFragment?.setTintable(colorFinal) + volumeFragment?.setTintable(colorFinal.ripAlpha()) updatePlayPauseColor() updatePrevNextColor() diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt index d05e39df..449321ea 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt @@ -61,7 +61,7 @@ class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() { val categoryInfos: List if (savedInstanceState != null) { - categoryInfos = savedInstanceState.getParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES) + categoryInfos = savedInstanceState.getParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES)!! } else { categoryInfos = PreferenceUtil.getInstance().libraryCategoryInfos }