From 6f362e1ab7c1f882e534eda7a9e0ef4beb1c6bdb Mon Sep 17 00:00:00 2001 From: h4h13 Date: Fri, 4 Oct 2019 16:28:28 +0530 Subject: [PATCH] Added peak theme --- .../base/AbsSlidingMusicPanelActivity.kt | 22 +- .../retromusic/fragments/NowPlayingScreen.kt | 4 +- .../base/AbsPlayerControlsFragment.kt | 8 +- .../material/MaterialControlsFragment.kt | 13 +- .../player/peak/PeakPlayerControlFragment.kt | 208 ++++++++++++++++++ .../player/peak/PeakPlayerFragment.kt | 130 +++++++++++ .../res/layout-land/fragment_plain_player.xml | 2 +- ...fragment_blur_player_playback_controls.xml | 2 +- ...fragment_card_player_playback_controls.xml | 2 +- ...ragment_color_player_playback_controls.xml | 2 +- .../layout/fragment_fit_playback_controls.xml | 2 +- .../fragment_material_playback_controls.xml | 4 +- .../layout/fragment_peak_control_player.xml | 167 ++++++++++++++ .../main/res/layout/fragment_peak_player.xml | 99 +++++++++ .../main/res/layout/fragment_plain_player.xml | 2 +- .../fragment_player_playback_controls.xml | 2 +- .../fragment_simple_controls_fragment.xml | 2 +- .../fragment_simple_slide_large_image.xml | 5 +- .../res/layout/sliding_music_panel_layout.xml | 2 +- app/src/main/res/values/strings.xml | 1 + 20 files changed, 641 insertions(+), 38 deletions(-) create mode 100644 app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt create mode 100644 app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt create mode 100644 app/src/main/res/layout/fragment_peak_control_player.xml create mode 100644 app/src/main/res/layout/fragment_peak_player.xml diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt index 7c57be05..edd72234 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt @@ -26,6 +26,7 @@ import code.name.monkey.retromusic.fragments.player.flat.FlatPlayerFragment import code.name.monkey.retromusic.fragments.player.full.FullPlayerFragment import code.name.monkey.retromusic.fragments.player.material.MaterialFragment import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment +import code.name.monkey.retromusic.fragments.player.peak.PeakPlayerFragment import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment @@ -136,14 +137,18 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), Sliding .addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener { override fun onGlobalLayout() { slidingLayout.viewTreeObserver.removeOnGlobalLayoutListener(this) - - if (panelState == SlidingUpPanelLayout.PanelState.EXPANDED) { - onPanelSlide(slidingLayout, 1f) - onPanelExpanded() - } else if (panelState == SlidingUpPanelLayout.PanelState.COLLAPSED) { - onPanelCollapsed() - } else { - playerFragment!!.onHide() + if (currentNowPlayingScreen != PEAK) { + val params = slidingPanel.layoutParams as ViewGroup.LayoutParams + params.height = ViewGroup.LayoutParams.MATCH_PARENT + slidingPanel.layoutParams = params + } + when (panelState) { + SlidingUpPanelLayout.PanelState.EXPANDED -> { + onPanelSlide(slidingLayout, 1f) + onPanelExpanded() + } + SlidingUpPanelLayout.PanelState.COLLAPSED -> onPanelCollapsed() + else -> playerFragment!!.onHide() } } }) @@ -197,6 +202,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), Sliding COLOR -> ColorFragment() TINY -> TinyPlayerFragment() CLASSIC -> ClassicPlayerFragment() + PEAK -> PeakPlayerFragment() else -> PlayerFragment() } // must implement AbsPlayerFragment supportFragmentManager.beginTransaction().replace(R.id.playerFragmentContainer, fragment).commit() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt index ae38ece4..77b6d288 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt @@ -22,7 +22,7 @@ enum class NowPlayingScreen constructor(@param:StringRes @field:StringRes PLAIN(R.string.plain, R.drawable.np_plain, 3), TINY(R.string.tiny, R.drawable.np_tiny, 7), SIMPLE(R.string.simple, R.drawable.np_simple, 8), - CLASSIC(R.string.classic, R.drawable.np_classic, 13); - //SLIDE(R.string.slide, R.drawable.np_slide, 13) + CLASSIC(R.string.classic, R.drawable.np_classic, 13), + PEAK(R.string.peak, R.drawable.np_slide, 14) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt index bbc79bfe..943fcf24 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt @@ -5,8 +5,8 @@ import android.view.View import android.view.animation.AccelerateInterpolator import android.view.animation.DecelerateInterpolator import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.fragments.VolumeFragment +import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.util.PreferenceUtil @@ -62,9 +62,9 @@ abstract class AbsPlayerControlsFragment : AbsMusicServiceFragment(), MusicProgr private fun hideVolumeIfAvailable() { if (PreferenceUtil.getInstance(requireContext()).volumeToggle) { - requireFragmentManager().beginTransaction().replace(R.id.volumeFragmentContainer, VolumeFragment()).commit() - requireFragmentManager().executePendingTransactions() - volumeFragment = requireFragmentManager().findFragmentById(R.id.volumeFragmentContainer) as VolumeFragment? + childFragmentManager.beginTransaction().replace(R.id.volumeFragmentContainer, VolumeFragment()).commit() + childFragmentManager.executePendingTransactions() + volumeFragment = childFragmentManager.findFragmentById(R.id.volumeFragmentContainer) as VolumeFragment? } } 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 eb889b6e..05e87a14 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 @@ -23,16 +23,7 @@ import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil -import kotlinx.android.synthetic.main.fragment_material_playback_controls.nextButton -import kotlinx.android.synthetic.main.fragment_material_playback_controls.playPauseButton -import kotlinx.android.synthetic.main.fragment_material_playback_controls.previousButton -import kotlinx.android.synthetic.main.fragment_material_playback_controls.progressSlider -import kotlinx.android.synthetic.main.fragment_material_playback_controls.repeatButton -import kotlinx.android.synthetic.main.fragment_material_playback_controls.shuffleButton -import kotlinx.android.synthetic.main.fragment_material_playback_controls.songCurrentProgress -import kotlinx.android.synthetic.main.fragment_material_playback_controls.songTotalTime -import kotlinx.android.synthetic.main.fragment_material_playback_controls.text -import kotlinx.android.synthetic.main.fragment_material_playback_controls.title +import kotlinx.android.synthetic.main.fragment_material_playback_controls.* /** * @author Hemanth S (h4h13). @@ -138,7 +129,7 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() { private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { - playPauseButton.setImageResource(R.drawable.ic_pause_white_64dp); + playPauseButton.setImageResource(R.drawable.ic_pause_white_64dp) } else { playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_64dp); } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt new file mode 100644 index 00000000..b6cab132 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt @@ -0,0 +1,208 @@ +/* + * Copyright (c) 2019 Hemanth Savarala. + * + * Licensed under the GNU General Public License v3 + * + * This is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by + * the Free Software Foundation either version 3 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + */ + +package code.name.monkey.retromusic.fragments.player.peak + +import android.animation.ObjectAnimator +import android.graphics.Color +import android.graphics.PorterDuff +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.animation.LinearInterpolator +import android.widget.SeekBar +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.appthemehelper.util.TintHelper +import code.name.monkey.retromusic.R +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.service.MusicService +import code.name.monkey.retromusic.util.MusicUtil +import code.name.monkey.retromusic.util.PreferenceUtil +import code.name.monkey.retromusic.util.ViewUtil +import kotlinx.android.synthetic.main.fragment_peak_control_player.* + +/** + * Created by hemanths on 2019-10-04. + */ + +class PeakPlayerControlFragment : AbsPlayerControlsFragment() { + + private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper + private var lastPlaybackControlsColor: Int = 0 + private var lastDisabledPlaybackControlsColor: Int = 0 + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + progressViewUpdateHelper = MusicProgressViewUpdateHelper(this) + } + + override fun onResume() { + super.onResume() + progressViewUpdateHelper.start() + } + + override fun onPause() { + super.onPause() + progressViewUpdateHelper.stop() + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + return inflater.inflate(R.layout.fragment_peak_control_player, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + setUpMusicControllers() + + } + + override fun show() { + + } + + override fun hide() { + + } + + override fun setDark(color: Int) { + val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground) + if (ColorUtil.isColorLight(colorBg)) { + lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true) + lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true) + } else { + lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), false) + lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false) + } + + val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) { + lastPlaybackControlsColor = color + color + } else { + ThemeStore.textColorSecondary(requireContext()) + } + + ViewUtil.setProgressDrawable(progressSlider, colorFinal, true) + volumeFragment?.setTintableColor(colorFinal) + playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) + updateRepeatState() + updateShuffleState() + updatePrevNextColor() + } + + override fun onUpdateProgressViews(progress: Int, total: Int) { + progressSlider.max = total + + val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress) + animator.duration = SLIDER_ANIMATION_TIME + animator.interpolator = LinearInterpolator() + animator.start() + + songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) + songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) + } + + private fun updatePlayPauseDrawableState() { + when { + MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + } + } + + + private fun setUpMusicControllers() { + setUpPlayPauseFab() + setUpPrevNext() + setUpRepeatButton() + setUpShuffleButton() + setUpProgressSlider() + } + + override fun setUpProgressSlider() { + progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() { + override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { + if (fromUser) { + MusicPlayerRemote.seekTo(progress) + onUpdateProgressViews(MusicPlayerRemote.songProgressMillis, MusicPlayerRemote.songDurationMillis) + } + } + }) + } + + private fun setUpPlayPauseFab() { + TintHelper.setTintAuto(playPauseButton, Color.WHITE, true) + TintHelper.setTintAuto(playPauseButton, Color.BLACK, false) + playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler()) + } + + private fun setUpPrevNext() { + updatePrevNextColor() + nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() } + previousButton.setOnClickListener { MusicPlayerRemote.back() } + } + + private fun updatePrevNextColor() { + nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) + previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) + } + + private fun setUpShuffleButton() { + shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() } + } + + override fun updateShuffleState() { + when (MusicPlayerRemote.shuffleMode) { + MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) + else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN) + } + } + + private fun setUpRepeatButton() { + repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() } + } + + override fun updateRepeatState() { + when (MusicPlayerRemote.repeatMode) { + MusicService.REPEAT_MODE_NONE -> { + repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN) + } + MusicService.REPEAT_MODE_ALL -> { + repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp) + repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) + } + MusicService.REPEAT_MODE_THIS -> { + repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp) + repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) + } + } + } + + override fun onPlayStateChanged() { + super.onPlayStateChanged() + updatePlayPauseDrawableState() + } + + override fun onServiceConnected() { + super.onServiceConnected() + updatePlayPauseDrawableState() + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..7dd92924 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2019 Hemanth Savarala. + * + * Licensed under the GNU General Public License v3 + * + * This is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by + * the Free Software Foundation either version 3 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + */ + +package code.name.monkey.retromusic.fragments.player.peak + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +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.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.glide.RetroMusicColoredTarget +import code.name.monkey.retromusic.glide.SongGlideRequest +import code.name.monkey.retromusic.helper.MusicPlayerRemote +import com.bumptech.glide.Glide +import kotlinx.android.synthetic.main.fragment_peak_player.* + +/** + * Created by hemanths on 2019-10-03. + */ + +class PeakPlayerFragment : AbsPlayerFragment() { + + private lateinit var playbackControlsFragment: PeakPlayerControlFragment + private var lastColor: Int = 0 + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + return inflater.inflate(R.layout.fragment_peak_player, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + setUpPlayerToolbar() + setUpSubFragments() + } + + private fun setUpSubFragments() { + playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as PeakPlayerControlFragment + } + + private fun setUpPlayerToolbar() { + playerToolbar.apply { + inflateMenu(R.menu.menu_player) + setNavigationOnClickListener { activity!!.onBackPressed() } + setOnMenuItemClickListener(this@PeakPlayerFragment) + ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity) + } + } + + override fun playerToolbar(): Toolbar { + return playerToolbar + } + + override fun onShow() { + + } + + override fun onHide() { + + } + + override fun onBackPressed(): Boolean { + return false + } + + override fun toolbarIconColor(): Int { + return ATHUtil.resolveColor(requireContext(), R.attr.iconColor) + } + + override val paletteColor: Int + get() = lastColor + + override fun onColorChanged(color: Int) { + playbackControlsFragment.setDark(color) + lastColor = color + callbacks?.onPaletteColorChanged() + } + + override fun onFavoriteToggled() { + + } + + private fun updateSong() { + val song = MusicPlayerRemote.currentSong + title.text = song.title + text.text = song.artistName + + SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong) + .checkIgnoreMediaStore(requireContext()) + .generatePalette(requireContext()) + .build() + .into(object : RetroMusicColoredTarget(playerImage) { + override fun onColorReady(color: Int) { + playbackControlsFragment.setDark(color) + } + }) + + } + + override fun onPlayStateChanged() { + super.onPlayStateChanged() + } + + override fun onServiceConnected() { + super.onServiceConnected() + updateSong() + } + + override fun onPlayingMetaChanged() { + super.onPlayingMetaChanged() + updateSong() + } + + + +} \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml index 7db64f1b..89d99e00 100644 --- a/app/src/main/res/layout-land/fragment_plain_player.xml +++ b/app/src/main/res/layout-land/fragment_plain_player.xml @@ -65,7 +65,7 @@ android:marqueeRepeatLimit="marquee_forever" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewHeadline5" + android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" tools:ignore="MissingPrefix" tools:text="Title" /> 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 e613e829..f2962b5d 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 @@ -91,7 +91,7 @@ android:scrollHorizontally="true" android:textStyle="bold" android:singleLine="true" - android:textAppearance="@style/TextViewSubtitle1" + android:textAppearance="@style/TextViewHeadline6" app:layout_constraintBottom_toTopOf="@+id/text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml index c7493afb..f0172226 100644 --- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml @@ -95,7 +95,7 @@ android:layout_marginBottom="2dp" android:ellipsize="end" android:maxLines="1" - android:textAppearance="@style/TextViewSubtitle1" + android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" tools:text="@tools:sample/lorem/random" /> diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml index 8f23d79f..930446e1 100644 --- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml @@ -73,7 +73,7 @@ android:paddingEnd="16dp" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewSubtitle1" + android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/text" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml index 2f0bfe9e..04d97a37 100644 --- a/app/src/main/res/layout/fragment_fit_playback_controls.xml +++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml @@ -72,7 +72,7 @@ android:paddingEnd="16dp" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewSubtitle1" + android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" tools:text="@tools:sample/lorem/random" /> diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml index 00fe75ea..6e9425a4 100644 --- a/app/src/main/res/layout/fragment_material_playback_controls.xml +++ b/app/src/main/res/layout/fragment_material_playback_controls.xml @@ -77,7 +77,7 @@ android:paddingEnd="16dp" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewSubtitle1" + android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/text" app:layout_constraintEnd_toEndOf="parent" @@ -96,7 +96,7 @@ android:maxLines="1" android:paddingStart="24dp" android:paddingEnd="24dp" - android:textAppearance="@style/TextViewBody2" + android:textAppearance="@style/TextViewBody1" app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/fragment_peak_control_player.xml b/app/src/main/res/layout/fragment_peak_control_player.xml new file mode 100644 index 00000000..721d9352 --- /dev/null +++ b/app/src/main/res/layout/fragment_peak_control_player.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml new file mode 100644 index 00000000..9a5a1544 --- /dev/null +++ b/app/src/main/res/layout/fragment_peak_player.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index 83c64e37..ae7b09f4 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -40,7 +40,7 @@ android:marqueeRepeatLimit="marquee_forever" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewHeadline5" + android:textAppearance="@style/TextViewHeadline6" android:textStyle="bold" tools:ignore="MissingPrefix" tools:text="Title" /> diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml index 90c19882..2bee144f 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -78,7 +78,7 @@ android:paddingEnd="16dp" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewSubtitle1" + android:textAppearance="@style/TextViewHeadline6" android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/text" 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 cc874c7e..fa21e4d0 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -22,7 +22,7 @@ android:paddingEnd="16dp" android:scrollHorizontally="true" android:singleLine="true" - android:textAppearance="@style/TextViewSubtitle1" + android:textAppearance="@style/TextViewHeadline6" android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/text" diff --git a/app/src/main/res/layout/fragment_simple_slide_large_image.xml b/app/src/main/res/layout/fragment_simple_slide_large_image.xml index e3ec9573..6027e0ca 100644 --- a/app/src/main/res/layout/fragment_simple_slide_large_image.xml +++ b/app/src/main/res/layout/fragment_simple_slide_large_image.xml @@ -24,15 +24,16 @@ android:padding="@dimen/mi_baseline"> + tools:ignore="ContentDescription" + tools:srcCompat="@tools:sample/backgrounds/scenic[4]" /> + android:layout_height="wrap_content"> Toggle shuffle mode Toggle favorite Dialog corner + Peak