From f9536e985ee919f62d937aa5dd7d389b717b5618 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Tue, 29 Oct 2019 11:36:08 +0530 Subject: [PATCH] Fix marquee text --- .../full/FullPlaybackControlsFragment.kt | 4 +- .../normal/PlayerPlaybackControlsFragment.kt | 3 +- ...fragment_blur_player_playback_controls.xml | 46 +++-- ...ragment_color_player_playback_controls.xml | 46 +++-- ...fragment_flat_player_playback_controls.xml | 52 ++--- .../layout/fragment_full_player_controls.xml | 2 +- .../fragment_material_playback_controls.xml | 45 +++-- .../main/res/layout/fragment_mini_player.xml | 2 +- .../main/res/layout/fragment_peak_player.xml | 37 ++-- .../fragment_player_playback_controls.xml | 48 +++-- .../fragment_simple_controls_fragment.xml | 50 +++-- .../main/res/layout/fragment_tiny_player.xml | 190 +++++++++--------- 12 files changed, 282 insertions(+), 243 deletions(-) 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 5492f4b5..0aae7ae7 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 @@ -22,13 +22,13 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.ripAlpha +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil @@ -281,7 +281,7 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(), PopupMenu.OnMe override fun doInBackground(vararg params: Song): Boolean? { val activity = activity return if (activity != null) { - MusicUtil.isFavorite(getActivity()!!, params[0]) + MusicUtil.isFavorite(requireActivity(), params[0]) } else { cancel(false) null 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 90c48f19..ba458c90 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 @@ -48,8 +48,6 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setUpMusicControllers() - title.isSelected = true - text.isSelected = true playPauseButton.setOnClickListener { if (MusicPlayerRemote.isPlaying) { MusicPlayerRemote.pauseSong() @@ -58,6 +56,7 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { } showBonceAnimation(playPauseButton) } + title.isSelected = true } override fun setDark(color: Int) { diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml index 984cc048..27e20704 100644 --- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml @@ -75,29 +75,37 @@ tools:text="00:22" /> - + app:layout_constraintTop_toBottomOf="@+id/progressContainer"> + + + + - + app:layout_constraintTop_toBottomOf="@+id/progressContainer"> + + + + diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml index 8cd38017..a15012d8 100644 --- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml @@ -74,40 +74,46 @@ android:textSize="12sp" android:textStyle="bold" app:layout_constrainedWidth="true" - app:layout_constraintBottom_toTopOf="@+id/title" + app:layout_constraintBottom_toTopOf="@+id/titleContainer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/progressContainer" tools:text="@tools:sample/lorem/random" /> - + app:layout_constraintTop_toBottomOf="@+id/text"> + + + diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml index e8c2d194..090b4c88 100644 --- a/app/src/main/res/layout/fragment_full_player_controls.xml +++ b/app/src/main/res/layout/fragment_full_player_controls.xml @@ -39,7 +39,7 @@ app:layout_constraintEnd_toStartOf="@+id/songFavourite" app:layout_constraintStart_toEndOf="@+id/playerMenu" app:layout_constraintTop_toTopOf="parent" - tools:text="@string/for_you" /> + tools:text="@tools:sample/lorem/random" /> - + app:layout_constraintTop_toBottomOf="@+id/progressContainer"> + + + + tools:text="@tools:sample/lorem/random" /> - + app:layout_constraintTop_toBottomOf="@+id/toolbarContainer"> + + + - - + app:layout_constraintTop_toBottomOf="@+id/progressContainer"> + + + + diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml index fa21e4d0..9ed6694a 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -6,29 +6,35 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml index a4b8ddba..17a60e26 100644 --- a/app/src/main/res/layout/fragment_tiny_player.xml +++ b/app/src/main/res/layout/fragment_tiny_player.xml @@ -1,5 +1,5 @@ - + + + + + + + + + + + + + android:id="@+id/playbackControlsFragmentContainer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:orientation="vertical" + app:layout_constraintBottom_toTopOf="@id/toolbarContainer" + app:layout_constraintEnd_toEndOf="parent"> - + android:layout_height="wrap_content" + tools:layout="@layout/fragment_tiny_controls_fragment" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + \ No newline at end of file