From 8f1672b38eed8fd6a6d4dff2ff6af1edf7da894b Mon Sep 17 00:00:00 2001 From: h4h13 Date: Wed, 5 Jun 2019 13:47:45 +0530 Subject: [PATCH] Fix Buy pro CardView --- app/build.gradle | 22 ++-- app/src/main/assets/contributors.json | 8 +- app/src/main/assets/retro-changelog.html | 2 +- .../retromusic/appwidgets/AppWidgetBig.kt | 4 +- .../retromusic/appwidgets/AppWidgetCard.kt | 6 +- .../retromusic/appwidgets/AppWidgetClassic.kt | 4 +- .../retromusic/appwidgets/AppWidgetSmall.kt | 4 +- .../retromusic/appwidgets/AppWidgetText.kt | 4 +- .../fragments/MiniPlayerFragment.kt | 2 +- .../mainactivity/home/BannerHomeFragment.kt | 12 +- .../AdaptivePlaybackControlsFragment.kt | 2 +- .../blur/BlurPlaybackControlsFragment.kt | 2 +- .../card/CardPlaybackControlsFragment.kt | 2 +- .../CardBlurPlaybackControlsFragment.kt | 2 +- .../ClassicPlayerPlaybackControlsFragment.kt | 2 +- .../color/ColorPlaybackControlsFragment.kt | 2 +- .../player/fit/FitPlaybackControlsFragment.kt | 2 +- .../flat/FlatPlaybackControlsFragment.kt | 2 +- .../full/FullPlaybackControlsFragment.kt | 2 +- .../LockScreenPlayerControlsFragment.kt | 2 +- .../material/MaterialControlsFragment.kt | 2 +- .../normal/PlayerPlaybackControlsFragment.kt | 2 +- .../plain/PlainPlaybackControlsFragment.kt | 2 +- .../simple/SimplePlaybackControlsFragment.kt | 2 +- .../settings/MainSettingsFragment.kt | 14 ++- .../settings/PersonaizeSettingsFragment.kt | 5 + .../retromusic/helper/MusicPlayerRemote.kt | 19 ++- .../notification/PlayingNotificationImpl.kt | 2 +- .../notification/PlayingNotificationImpl24.kt | 2 +- .../notification/PlayingNotificationOreo.kt | 2 +- .../drawable/ic_cellphone_lock_white_24dp.xml | 24 ++++ .../res/drawable/ic_cellphone_white_24dp.xml | 24 ++++ .../drawable/ic_diamond_stone_white_24dp.xml | 26 ++++ .../res/drawable/ic_file_music_white_24dp.xml | 18 ++- .../res/drawable/ic_play_arrow_white_32dp.xml | 25 ++++ ...e_big.xml => ic_play_arrow_white_64dp.xml} | 0 app/src/main/res/drawable/promotional.webp | Bin 0 -> 28738 bytes .../res/layout-land/fragment_slide_player.xml | 2 +- app/src/main/res/layout-land/pager_item.xml | 2 +- .../res/layout-xlarge-land/pager_item.xml | 2 +- app/src/main/res/layout-xlarge/pager_item.xml | 2 +- app/src/main/res/layout/app_widget_big.xml | 2 +- app/src/main/res/layout/app_widget_card.xml | 2 +- .../main/res/layout/app_widget_classic.xml | 2 +- app/src/main/res/layout/app_widget_small.xml | 2 +- app/src/main/res/layout/app_widget_text.xml | 2 +- ...ment_adaptive_player_playback_controls.xml | 2 +- .../fragment_blur_playback_controls.xml | 2 +- .../res/layout/fragment_main_settings.xml | 114 +++++++++--------- .../main/res/layout/fragment_slide_player.xml | 2 +- app/src/main/res/layout/media_button.xml | 2 +- app/src/main/res/layout/pager_item.xml | 2 +- app/src/main/res/xml/pref_audio.xml | 2 +- app/src/main/res/xml/pref_notification.xml | 3 +- .../main/res/xml/pref_now_playing_screen.xml | 2 +- app/src/main/res/xml/pref_window.xml | 6 + 56 files changed, 280 insertions(+), 132 deletions(-) create mode 100644 app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_cellphone_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_play_arrow_white_32dp.xml rename app/src/main/res/drawable/{ic_play_arrow_white_big.xml => ic_play_arrow_white_64dp.xml} (100%) create mode 100644 app/src/main/res/drawable/promotional.webp diff --git a/app/build.gradle b/app/build.gradle index be002f75..1488c21a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -129,38 +129,46 @@ dependencies { implementation 'androidx.preference:preference:1.1.0-alpha05' implementation "androidx.legacy:legacy-support-v13:1.0.0" implementation "androidx.legacy:legacy-preference-v14:1.0.0" - implementation 'com.google.android.material:material:1.1.0-alpha07' implementation 'androidx.palette:palette-ktx:1.0.0' + + implementation 'com.google.android.material:material:1.1.0-alpha07' + implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.retrofit2:converter-gson:2.5.0' implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0' + implementation 'com.afollestad.material-dialogs:core:3.0.0-alpha1' implementation 'com.afollestad.material-dialogs:input:3.0.0-alpha1' implementation 'com.afollestad.material-dialogs:color:3.0.0-alpha1' implementation 'com.afollestad.material-dialogs:bottomsheets:3.0.0-alpha1' implementation 'com.afollestad:material-cab:0.1.12' + implementation 'com.github.bumptech.glide:glide:4.8.0' kapt 'com.github.bumptech.glide:compiler:4.8.0' implementation 'com.github.bumptech.glide:okhttp3-integration:4.8.0' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'io.reactivex.rxjava2:rxjava:2.2.8' + implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') { transitive = true } - implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0' - implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod' + implementation 'com.anjlab.android.iab.v3:library:1.0.44' /*UI Library*/ implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1' implementation 'com.r0adkll:slidableactivity:2.0.6' - /*Backend all*/ - implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.0-kmod3' - implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3' - implementation 'org.nanohttpd:nanohttpd:2.3.1' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:3.4.0.201406110918-r' + implementation 'com.github.jetradarmobile:android-snowfall:1.2.0' implementation 'com.github.takahirom.downloadable.calligraphy:downloadable-calligraphy:0.1.3' + implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0' + implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod' + implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.0-kmod3' + implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' implementation project(':appthemehelper') } diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json index 4c0ee556..72ad6ebd 100644 --- a/app/src/main/assets/contributors.json +++ b/app/src/main/assets/contributors.json @@ -19,7 +19,7 @@ }, { "name": "Gaming Inc.", - "summary": "Discord server maintainer", + "summary": "Telegram & Discord server maintainer", "link": "https://discord.gg/qTecXXn", "profile_image": "https://i.imgur.com/FMqPDSS.png" }, @@ -34,5 +34,11 @@ "summary": "Telegram and Design contributor", "link": "https://t.me/Allstargaurav", "profile_image": "https://i.imgur.com/EertxDu.jpg" + }, + { + "name": "Abilas Sathiya", + "summary": "Design & Suggestions", + "link": "https://t.me/@abs2606", + "profile_image": "https://i.imgur.com/MUyEWlx.jpg" } ] \ No newline at end of file diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 487e19cf..ad4ca0a2 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

We're really sorry for Announcing this Retro Music is driving towards pure Android Material Design guidelines we don't want any unnecessary UI elements that don't need for Music player.

Artist images are not loading because last.fm changed policy for image downloading

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

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 +

We're really sorry for Announcing this Retro Music is driving towards pure Android Material Design guidelines we don't want any unnecessary UI elements that don't need for Music player.

Artist images are not loading because last.fm changed policy for image downloading

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

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/appwidgets/AppWidgetBig.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt index f3f7d4f4..e42f8b88 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt @@ -57,7 +57,7 @@ class AppWidgetBig : BaseAppWidget() { RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, false))!!, 1f)) appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.Companion.createBitmap( - RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, + RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_32dp, MaterialValueHelper.getPrimaryTextColor(context, false))!!, 1f)) linkButtons(context, appWidgetView) @@ -84,7 +84,7 @@ class AppWidgetBig : BaseAppWidget() { } // Set correct drawable for pause state - val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_24dp + val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap( RetroUtil.getTintedVectorDrawable(service, playPauseRes, MaterialValueHelper.getPrimaryTextColor(service, false))!!, 1f)) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt index a23d2589..37e8d42e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt @@ -52,7 +52,7 @@ class AppWidgetCard : BaseAppWidget() { appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art) appWidgetView.setImageViewBitmap(R.id.button_next, BaseAppWidget.Companion.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) appWidgetView.setImageViewBitmap(R.id.button_prev, BaseAppWidget.Companion.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.Companion.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.Companion.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_32dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) linkButtons(context, appWidgetView) pushUpdate(context, appWidgetIds, appWidgetView) @@ -78,7 +78,7 @@ class AppWidgetCard : BaseAppWidget() { } // Set correct drawable for pause state - val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_24dp + val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.Companion.createBitmap( RetroUtil.getTintedVectorDrawable(service, playPauseRes, MaterialValueHelper.getSecondaryTextColor(service, true))!!, 1f)) @@ -127,7 +127,7 @@ class AppWidgetCard : BaseAppWidget() { // Set correct drawable for pause state val playPauseRest = if (isPlaying) R.drawable.ic_pause_white_24dp else - R.drawable.ic_play_arrow_white_24dp + R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(service, playPauseRest, color)!!, 1f)) // Set prev/next button drawables appWidgetView.setImageViewBitmap(R.id.button_next, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, color)!!, 1f)) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt index c63a27ad..90b1bc9b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt @@ -51,7 +51,7 @@ class AppWidgetClassic : BaseAppWidget() { appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art) appWidgetView.setImageViewBitmap(R.id.button_next, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) appWidgetView.setImageViewBitmap(R.id.button_prev, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_32dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) linkButtons(context, appWidgetView) pushUpdate(context, appWidgetIds, appWidgetView) @@ -114,7 +114,7 @@ class AppWidgetClassic : BaseAppWidget() { val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else - R.drawable.ic_play_arrow_white_24dp + R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(service, playPauseRes, color)!!, 1f)) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt index bc2a765d..92e01abb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt @@ -51,7 +51,7 @@ class AppWidgetSmall : BaseAppWidget() { appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art) appWidgetView.setImageViewBitmap(R.id.button_next, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) appWidgetView.setImageViewBitmap(R.id.button_prev, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_32dp, MaterialValueHelper.getSecondaryTextColor(context, true))!!, 1f)) linkButtons(context, appWidgetView) pushUpdate(context, appWidgetIds, appWidgetView) @@ -120,7 +120,7 @@ class AppWidgetSmall : BaseAppWidget() { val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else - R.drawable.ic_play_arrow_white_24dp + R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.Companion.createBitmap(RetroUtil.getTintedVectorDrawable(service, playPauseRes, color)!!, 1f)) // Set prev/next button drawables diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt index 9382faa0..0acee199 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt @@ -36,7 +36,7 @@ class AppWidgetText : BaseAppWidget() { appWidgetView.setImageViewBitmap(R.id.button_next, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, ContextCompat.getColor(context, R.color.md_white_1000)), 1f)) appWidgetView.setImageViewBitmap(R.id.button_prev, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, ContextCompat.getColor(context, R.color.md_white_1000)), 1f)) - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, ContextCompat.getColor(context, R.color.md_white_1000)), 1f)) + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_32dp, ContextCompat.getColor(context, R.color.md_white_1000)), 1f)) appWidgetView.setTextColor(R.id.title, ContextCompat.getColor(context, R.color.md_white_1000)) appWidgetView.setTextColor(R.id.text, ContextCompat.getColor(context, R.color.md_white_1000)) @@ -94,7 +94,7 @@ class AppWidgetText : BaseAppWidget() { val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else - R.drawable.ic_play_arrow_white_24dp + R.drawable.ic_play_arrow_white_32dp appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, playPauseRes, ContextCompat.getColor(context, R.color.md_white_1000)), 1f)) appWidgetView.setImageViewBitmap(R.id.button_next, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, ContextCompat.getColor(context, R.color.md_white_1000)), 1f)) appWidgetView.setImageViewBitmap(R.id.button_prev, BaseAppWidget.createBitmap(RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, ContextCompat.getColor(context, R.color.md_white_1000)), 1f)) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt index e7ace8b6..777d0b79 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt @@ -124,7 +124,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda if (MusicPlayerRemote.isPlaying) { miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_pause_white_24dp) } else { - miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_play_arrow_white_24dp) + miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } 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 481e417e..a583a67e 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 @@ -152,10 +152,18 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba (recyclerView.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin = (marginSpan * 2.3f).toInt() } + private fun toolbarColor(): Int { + return if (PreferenceUtil.getInstance().isHomeBanner) { + toolbarContainer.setBackgroundColor(Color.TRANSPARENT) + ColorUtil.withAlpha(RetroUtil.toolbarColor(mainActivity), 0.85f) + } else { + RetroUtil.toolbarColor(mainActivity) + } + } + private fun setupToolbar() { - toolbarContainer.setBackgroundColor(Color.TRANSPARENT) toolbar.apply { - setBackgroundColor(ColorUtil.withAlpha(RetroUtil.toolbarColor(mainActivity), 0.85f)) + setBackgroundColor(toolbarColor()) setNavigationIcon(R.drawable.ic_menu_white_24dp) setOnClickListener { val pairImageView = Pair.create(toolbarContainer, resources.getString(R.string.transition_toolbar)) 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 1998c6e4..1cd64bb9 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 @@ -120,7 +120,7 @@ class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } 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 be8907a7..d465b5df 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 @@ -135,7 +135,7 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt index e75ed286..5954f6b2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt @@ -149,7 +149,7 @@ class CardPlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt index e6e441e4..e2a22642 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt @@ -75,7 +75,7 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { when { MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) - else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt index 83930366..52f3524e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt @@ -97,7 +97,7 @@ class ClassicPlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playerPlayPauseFab.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playerPlayPauseFab.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playerPlayPauseFab.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt index 013ae905..2be99a8d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt @@ -132,7 +132,7 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { when { MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) - else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt index 9abbd3ec..2d24d31c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt @@ -137,7 +137,7 @@ class FitPlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt index 7fbcdc57..0eee0793 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt @@ -153,7 +153,7 @@ class FlatPlaybackControlsFragment : AbsPlayerControlsFragment(), Callback { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt index ca2a19ba..9ca74482 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt @@ -154,7 +154,7 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(), PopupMenu.OnMe if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt index 6c8e39dc..52511340 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt @@ -144,7 +144,7 @@ class LockScreenPlayerControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } 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 e40c82e6..96e66e28 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 @@ -129,7 +129,7 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_big); } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_big); + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_64dp); } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt index 9dd78cef..3c445d7f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt @@ -134,7 +134,7 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt index 4a71afb7..ef5e6206 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt @@ -238,7 +238,7 @@ class PlainPlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt index a6f8017b..ce27c5fb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt @@ -213,7 +213,7 @@ class SimplePlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt index 7f7031a0..bb61c777 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt @@ -14,6 +14,7 @@ package code.name.monkey.retromusic.fragments.settings +import android.content.res.ColorStateList import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -22,10 +23,13 @@ import androidx.annotation.StringRes import androidx.fragment.app.Fragment import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ColorUtil +import code.name.monkey.appthemehelper.util.MaterialUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.SettingsActivity +import code.name.monkey.retromusic.extensions.hide +import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.util.NavigationUtil import kotlinx.android.synthetic.main.fragment_main_settings.* @@ -64,8 +68,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener { aboutSettings.setOnClickListener(this) buyProContainer.apply { - setCardBackgroundColor(ThemeStore.accentColor(context!!)) - visibility = if (!App.isProVersion) View.VISIBLE else View.GONE + if (!App.isProVersion) show() else hide() setOnClickListener { NavigationUtil.goToProVersion(context) } @@ -73,11 +76,12 @@ class MainSettingsFragment : Fragment(), View.OnClickListener { buyPremium.setOnClickListener { NavigationUtil.goToProVersion(context!!) } - val primaryColor = MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(ThemeStore.accentColor(context!!))) + MaterialUtil.setTint(buyPremium) + val primaryColor = MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(ThemeStore.primaryColor(context!!))) text.setTextColor(ColorUtil.withAlpha(primaryColor, 0.75f)) - title.setTextColor(primaryColor) + //title.setTextColor(primaryColor) text2.setTextColor(primaryColor) - text3.setTextColor(primaryColor) + text3.imageTintList = ColorStateList.valueOf(primaryColor) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt index 49899de6..ee8a997f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt @@ -36,6 +36,11 @@ class PersonaizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSh activity!!.recreate() return@setOnPreferenceChangeListener true } + val toggleFullScreen: TwoStatePreference = findPreference("toggle_full_screen")!! + toggleFullScreen.setOnPreferenceChangeListener { _, _ -> + activity!!.recreate() + true + } } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt index 3b65f126..5f1ade9c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt @@ -96,8 +96,7 @@ object MusicPlayerRemote { val isServiceConnected: Boolean get() = musicService != null - fun bindToService(context: Context, - callback: ServiceConnection): ServiceToken? { + fun bindToService(context: Context, callback: ServiceConnection): ServiceToken? { var realActivity: Activity? = (context as Activity).parent if (realActivity == null) { @@ -105,6 +104,7 @@ object MusicPlayerRemote { } val contextWrapper = ContextWrapper(realActivity) + contextWrapper.startService(Intent(contextWrapper, MusicService::class.java)) val binder = ServiceBinder(callback) @@ -129,24 +129,21 @@ object MusicPlayerRemote { } private fun getFilePathFromUri(context: Context, uri: Uri): String? { - + var cursor: Cursor? = null val column = "_data" val projection = arrayOf(column) - var cursor: Cursor? = null + try { cursor = context.contentResolver.query(uri, projection, null, null, null) - cursor.use { - if (it.moveToFirst()) { - val columnIndex = it.getColumnIndexOrThrow(column) - return it.getString(columnIndex) - } + if (cursor != null && cursor.moveToFirst()) { + val column_index = cursor.getColumnIndexOrThrow(column) + return cursor.getString(column_index) } } catch (e: Exception) { Log.e(TAG, e.message) } finally { - cursor!!.close() + cursor?.close() } - return null } diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt index 7d1e08a0..e6d612f8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt @@ -173,7 +173,7 @@ class PlayingNotificationImpl : PlayingNotification() { if (isPlaying) R.drawable.ic_pause_white_24dp else - R.drawable.ic_play_arrow_white_24dp, primary)!!, 1.5f) + R.drawable.ic_play_arrow_white_32dp, primary)!!, 1.5f) notificationLayout.setTextColor(R.id.title, primary) notificationLayout.setTextColor(R.id.text, secondary) diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt index 137d314a..3577b583 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt @@ -52,7 +52,7 @@ class PlayingNotificationImpl24 : PlayingNotification() { val playButtonResId = if (isPlaying) R.drawable.ic_pause_white_24dp else - R.drawable.ic_play_arrow_white_24dp + R.drawable.ic_play_arrow_white_32dp val action = Intent(service, MainActivity::class.java) action.putExtra("expand", true) diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt index 5d722e16..d57f5b44 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt @@ -163,7 +163,7 @@ class PlayingNotificationOreo : PlayingNotification() { if (isPlaying) R.drawable.ic_pause_white_24dp else - R.drawable.ic_play_arrow_white_24dp, primary)!!, PlayingNotification.NOTIFICATION_CONTROLS_SIZE_MULTIPLIER) + R.drawable.ic_play_arrow_white_32dp, primary)!!, PlayingNotification.NOTIFICATION_CONTROLS_SIZE_MULTIPLIER) notificationLayout.setTextColor(R.id.title, primary) notificationLayout.setTextColor(R.id.subtitle, secondary) diff --git a/app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml b/app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml new file mode 100644 index 00000000..727f837d --- /dev/null +++ b/app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_cellphone_white_24dp.xml b/app/src/main/res/drawable/ic_cellphone_white_24dp.xml new file mode 100644 index 00000000..af68ec02 --- /dev/null +++ b/app/src/main/res/drawable/ic_cellphone_white_24dp.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml b/app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml new file mode 100644 index 00000000..7a27f671 --- /dev/null +++ b/app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_file_music_white_24dp.xml b/app/src/main/res/drawable/ic_file_music_white_24dp.xml index efb25ba9..1cc66b8d 100644 --- a/app/src/main/res/drawable/ic_file_music_white_24dp.xml +++ b/app/src/main/res/drawable/ic_file_music_white_24dp.xml @@ -1,8 +1,22 @@ + + + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml new file mode 100644 index 00000000..8ed511c7 --- /dev/null +++ b/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_play_arrow_white_big.xml b/app/src/main/res/drawable/ic_play_arrow_white_64dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_play_arrow_white_big.xml rename to app/src/main/res/drawable/ic_play_arrow_white_64dp.xml diff --git a/app/src/main/res/drawable/promotional.webp b/app/src/main/res/drawable/promotional.webp new file mode 100644 index 0000000000000000000000000000000000000000..321f68d96e709465e400055c3b92fa997d57c6e7 GIT binary patch literal 28738 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 x diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml index 920de1e1..01ba6aa4 100644 --- a/app/src/main/res/layout-land/pager_item.xml +++ b/app/src/main/res/layout-land/pager_item.xml @@ -29,7 +29,7 @@ android:background="@drawable/color_circle_gradient" android:backgroundTint="@color/eighty_percent_black_overlay" android:padding="8dp" - app:srcCompat="@drawable/ic_play_arrow_white_24dp" /> + app:srcCompat="@drawable/ic_play_arrow_white_32dp" /> + app:srcCompat="@drawable/ic_play_arrow_white_32dp" /> + app:srcCompat="@drawable/ic_play_arrow_white_32dp" /> + app:srcCompat="@drawable/ic_play_arrow_white_32dp" /> diff --git a/app/src/main/res/layout/fragment_blur_playback_controls.xml b/app/src/main/res/layout/fragment_blur_playback_controls.xml index 1f676fc2..b32c4d30 100644 --- a/app/src/main/res/layout/fragment_blur_playback_controls.xml +++ b/app/src/main/res/layout/fragment_blur_playback_controls.xml @@ -171,7 +171,7 @@ android:background="@drawable/color_circle_gradient" android:elevation="4dp" android:padding="16dp" - app:srcCompat="@drawable/ic_play_arrow_white_24dp" /> + app:srcCompat="@drawable/ic_play_arrow_white_32dp" /> diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml index eda67e3b..c3faac56 100644 --- a/app/src/main/res/layout/fragment_main_settings.xml +++ b/app/src/main/res/layout/fragment_main_settings.xml @@ -17,83 +17,83 @@ android:id="@+id/buyProContainer" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/md_grey_400" app:cardCornerRadius="8dp" app:cardElevation="6dp" app:cardUseCompatPadding="true"> - - - - - - - - - - + android:layout_weight="1" + android:orientation="vertical" + app:layout_constraintEnd_toStartOf="@+id/text3" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + android:paddingStart="16dp" + android:paddingEnd="0dp" + android:text="@string/pro_summary" + android:textColor="@color/md_white_1000" /> + + - - + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:text="@string/premium" + app:icon="@drawable/ic_diamond_stone_white_24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/titleContainer" /> + diff --git a/app/src/main/res/layout/media_button.xml b/app/src/main/res/layout/media_button.xml index 668414ea..e2907bfc 100644 --- a/app/src/main/res/layout/media_button.xml +++ b/app/src/main/res/layout/media_button.xml @@ -81,6 +81,6 @@ android:background="@drawable/color_circle_gradient" android:elevation="4dp" android:padding="16dp" - app:srcCompat="@drawable/ic_play_arrow_white_24dp" /> + app:srcCompat="@drawable/ic_play_arrow_white_32dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml index 25f8719d..55184962 100644 --- a/app/src/main/res/layout/pager_item.xml +++ b/app/src/main/res/layout/pager_item.xml @@ -29,7 +29,7 @@ android:background="@drawable/color_circle_gradient" android:backgroundTint="@color/eighty_percent_black_overlay" android:padding="8dp" - app:srcCompat="@drawable/ic_play_arrow_white_24dp" /> + app:srcCompat="@drawable/ic_play_arrow_white_32dp" /> + app:icon="@drawable/ic_play_arrow_white_32dp" /> + app:enableCopying="true" + app:icon="@drawable/ic_cellphone_lock_white_24dp" /> diff --git a/app/src/main/res/xml/pref_window.xml b/app/src/main/res/xml/pref_window.xml index ef1397af..676d1046 100644 --- a/app/src/main/res/xml/pref_window.xml +++ b/app/src/main/res/xml/pref_window.xml @@ -14,5 +14,11 @@ app:enableCopying="true" app:icon="@drawable/ic_rounded_corner" /> + \ No newline at end of file