From 1b57adde6b3d35ef1c1eed2da02568ca9d4d0148 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Thu, 1 Aug 2019 19:43:00 +0530 Subject: [PATCH] Fix alignment controls --- app/src/main/assets/contributors.json | 36 +-- .../retromusic/activities/AboutActivity.kt | 2 + .../blur/BlurPlaybackControlsFragment.kt | 4 +- .../player/classic/ClassicPlayerFragment.kt | 2 +- .../ClassicPlayerPlaybackControlsFragment.kt | 4 +- .../color/ColorPlaybackControlsFragment.kt | 9 +- .../player/fit/FitPlaybackControlsFragment.kt | 1 - .../LockScreenPlayerControlsFragment.kt | 29 +-- .../normal/PlayerPlaybackControlsFragment.kt | 2 +- .../plain/PlainPlaybackControlsFragment.kt | 8 +- .../simple/SimplePlaybackControlsFragment.kt | 1 - .../settings/ThemeSettingsFragment.kt | 26 +- app/src/main/res/layout/card_credit.xml | 5 +- app/src/main/res/layout/card_other.xml | 3 +- app/src/main/res/layout/card_retro_info.xml | 3 +- app/src/main/res/layout/card_social.xml | 3 +- ...fragment_blur_player_playback_controls.xml | 198 +++++++++++---- .../res/layout/fragment_classic_player.xml | 5 +- ...ragment_color_player_playback_controls.xml | 125 +++++++++- ...fragment_flat_player_playback_controls.xml | 52 ++-- ...fragment_lock_screen_playback_controls.xml | 192 ++++++++++---- .../fragment_material_playback_controls.xml | 48 +++- .../fragment_plain_controls_fragment.xml | 111 ++++++++- .../fragment_player_playback_controls.xml | 118 ++++++++- .../fragment_simple_controls_fragment.xml | 235 +++++++++++++----- app/src/main/res/layout/media_button.xml | 1 - app/src/main/res/values/strings.xml | 1 + 27 files changed, 925 insertions(+), 299 deletions(-) diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json index b2b6baab..9f6efa63 100644 --- a/app/src/main/assets/contributors.json +++ b/app/src/main/assets/contributors.json @@ -1,39 +1,27 @@ [ + { + "name": "Hemanth Savarala", + "summary": "Lead developer", + "link": "https://github.com/h4h13", + "profile_image": "https://i.imgur.com/AoVs9oj.jpg" + }, { "name": "Lennart Glamann", - "summary": "Design contributor", + "summary": "Design helper", "link": "https://t.me/FlixbusLennart", "profile_image": "https://i.imgur.com/Q5Nsx1R.jpg" }, - { - "name": "Vitor Monteriro", - "summary": "Telegram contributor", - "link": "https://t.me/mluizvitor", - "profile_image": "https://i.imgur.com/vvpE4nn.jpg" - }, - { - "name": "Elvan Putra", - "summary": "Design contributor", - "link": "https://t.me/ElvanMacko", - "profile_image": "https://i.imgur.com/w7rnEEw.jpg" - }, { "name": "Gaming Inc.", - "summary": "Telegram & Discord server maintainer", + "summary": "Telegram group maintainer", "link": "https://t.me/Gaming_Inc", "profile_image": "https://i.imgur.com/pfvN7d9.png" }, { - "name": "Marko Ivanović", - "summary": "Github contributor", - "link": "https://t.me/markoivanovic", - "profile_image": "https://avatars2.githubusercontent.com/u/35743654?s=400&u=f8b4a90a352a661625ae71d455a82aaa9bc3316b&v=4" - }, - { - "name": "Gaurav Singh", - "summary": "Telegram and Design contributor", - "link": "https://t.me/Allstargaurav", - "profile_image": "https://i.imgur.com/EertxDu.jpg" + "name": "ᴍɪʟɪɴᴅ ɢᴏᴇʟ | ᴘʟ2", + "summary": "Telegram group helper", + "link": "https://t.me/MilindGoel15", + "profile_image": "https://i.imgur.com/ZIdLHYx.jpg" }, { "name": "Abilas Sathiya", 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 ce313874..8b3db87c 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 @@ -23,6 +23,7 @@ import code.name.monkey.retromusic.Constants.TRANSLATE import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsBaseActivity import code.name.monkey.retromusic.adapter.ContributorAdapter +import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.model.Contributor import code.name.monkey.retromusic.util.NavigationUtil import com.afollestad.materialdialogs.MaterialDialog @@ -110,6 +111,7 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener { openSource.setOnClickListener(this) pinterestLink.setOnClickListener(this) bugReportLink.setOnClickListener(this) + } override fun onClick(view: View) { 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 2fbc0ab5..bd1950e7 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 @@ -27,8 +27,6 @@ import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_blur_player_playback_controls.* -import kotlinx.android.synthetic.main.media_button.* - class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { @@ -124,7 +122,7 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { text.setTextColor(colorFinal) TintHelper.setTintAuto(progressSlider, colorFinal, false) - volumeFragment?.setTintableColor(colorFinal) + volumeFragment?.setTintableColor(Color.WHITE) setFabColor(colorFinal) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt index a5f8b221..1b7bf9fa 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt @@ -145,7 +145,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Call }) // for some reason the xml attribute doesn't get applied here. - playingQueueCard.setCardBackgroundColor(ATHUtil.resolveColor(activity, code.name.monkey.retromusic.R.attr.cardBackgroundColor)) + playingQueueCard.setCardBackgroundColor(ThemeStore.primaryColor(requireContext())) } private fun setUpPlayerToolbar() { 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 52f3524e..e4c6bab1 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 @@ -197,13 +197,13 @@ class ClassicPlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { } override fun onServiceConnected() { - updatePlayPauseDrawableState( ) + updatePlayPauseDrawableState() updateRepeatState() updateShuffleState() } override fun onPlayStateChanged() { - updatePlayPauseDrawableState( ) + updatePlayPauseDrawableState() } override fun onRepeatModeChanged() { 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 904140c7..542da5bd 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 @@ -1,10 +1,8 @@ package code.name.monkey.retromusic.fragments.player.color import android.animation.ObjectAnimator -import android.content.res.ColorStateList import android.graphics.Color import android.graphics.PorterDuff -import android.graphics.drawable.LayerDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -23,14 +21,13 @@ 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.ViewUtil -import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.* import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.progressSlider import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.songCurrentProgress import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.songTotalTime import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.text import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.title import kotlinx.android.synthetic.main.fragment_player_playback_controls.* -import kotlinx.android.synthetic.main.media_button.* + class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() { @@ -106,9 +103,9 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() { title!!.setTextColor(lastPlaybackControlsColor) text!!.setTextColor(lastDisabledPlaybackControlsColor) - ViewUtil.setProgressDrawable(progressSlider, lastPlaybackControlsColor) + ViewUtil.setProgressDrawable(progressSlider, lastPlaybackControlsColor, true) - volumeFragment?.setTintableColor(lastPlaybackControlsColor) + volumeFragment?.setTintableColor(color) songCurrentProgress.setTextColor(lastDisabledPlaybackControlsColor) songTotalTime.setTextColor(lastDisabledPlaybackControlsColor) 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 fffa948f..8c42f337 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 @@ -26,7 +26,6 @@ import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_player_playback_controls.* -import kotlinx.android.synthetic.main.media_button.* class FitPlaybackControlsFragment : AbsPlayerControlsFragment() { 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 cf04ea3e..7e01865c 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 @@ -40,7 +40,7 @@ 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_lock_screen_playback_controls.* -import kotlinx.android.synthetic.main.media_button.* + /** * @author Hemanth S (h4h13). @@ -70,7 +70,6 @@ class LockScreenPlayerControlsFragment : AbsPlayerControlsFragment() { private fun updateSong() { val song = MusicPlayerRemote.currentSong - title.text = song.title text.text = String.format("%s - %s", song.artistName, song.albumName) @@ -112,29 +111,31 @@ class LockScreenPlayerControlsFragment : AbsPlayerControlsFragment() { override fun setDark(color: Int) { - val colorBg = ATHUtil.resolveColor(context!!, android.R.attr.colorBackground) + val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground) if (ColorUtil.isColorLight(colorBg)) { - lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(context!!, true) - lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(context!!, true) + lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true) + lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true) } else { - lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(context!!, false) - lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(context!!, false) + lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), false) + lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false) } val colorFinal = if (PreferenceUtil.getInstance().adaptiveColor) { color } else { - ThemeStore.textColorSecondary(context!!) - } + ThemeStore.textColorSecondary(requireContext()) + }.ripAlpha() + volumeFragment?.setTintable(colorFinal) - ViewUtil.setProgressDrawable(progressSlider, colorFinal.ripAlpha(), true) + ViewUtil.setProgressDrawable(progressSlider, colorFinal, true) updatePrevNextColor() - val isDark = ColorUtil.isColorLight(color) - text!!.setTextColor(color) - TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(context!!, isDark), false) - TintHelper.setTintAuto(playPauseButton, color, true) + val isDark = ColorUtil.isColorLight(colorFinal) + text.setTextColor(colorFinal) + + TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(requireContext(), isDark), false) + TintHelper.setTintAuto(playPauseButton, colorFinal, true) } private fun setUpPlayPauseFab() { 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 a671380c..57174c4b 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 @@ -26,7 +26,7 @@ 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_player_playback_controls.* -import kotlinx.android.synthetic.main.media_button.* + class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { 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 bbc1743f..3bcfd003 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 @@ -1,7 +1,6 @@ package code.name.monkey.retromusic.fragments.player.plain import android.animation.ObjectAnimator -import android.content.res.ColorStateList import android.graphics.PorterDuff import android.os.Bundle import android.view.LayoutInflater @@ -18,21 +17,16 @@ 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.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 -import kotlinx.android.synthetic.main.fragment_flat_player_playback_controls.* import kotlinx.android.synthetic.main.fragment_plain_controls_fragment.* -import kotlinx.android.synthetic.main.fragment_plain_controls_fragment.progressSlider -import kotlinx.android.synthetic.main.fragment_plain_controls_fragment.songCurrentProgress -import kotlinx.android.synthetic.main.fragment_plain_controls_fragment.songTotalTime -import kotlinx.android.synthetic.main.media_button.* import kotlinx.android.synthetic.main.media_button.playPauseButton import kotlinx.android.synthetic.main.media_button.repeatButton import kotlinx.android.synthetic.main.media_button.shuffleButton 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 ce27c5fb..ced7c6f0 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 @@ -20,7 +20,6 @@ import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_simple_controls_fragment.* -import kotlinx.android.synthetic.main.media_button.* /** * @author Hemanth S (h4h13). diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt index 29006206..f2a63ea4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt @@ -46,7 +46,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { val categoryColor: ATEPreferenceCategory? = findPreference("category_color") val primaryColorPref = ATEColorPreference(preferenceScreen.context) - val primaryColor = ThemeStore.primaryColor(activity!!) + val primaryColor = ThemeStore.primaryColor(requireContext()) primaryColorPref.apply { key = "primary_color" @@ -57,7 +57,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { setIcon(R.drawable.ic_colorize_white_24dp) setColor(primaryColor, ColorUtil.darkenColor(primaryColor)) setOnPreferenceClickListener { - MaterialDialog(activity!!, BottomSheet()).show { + MaterialDialog(requireContext(), BottomSheet()).show { title(R.string.primary_color) positiveButton(R.string.set) colorChooser(initialSelection = BLUE, @@ -74,7 +74,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { if (VersionUtils.hasNougatMR()) DynamicShortcutManager(context).updateDynamicShortcuts() - activity!!.recreate() + requireActivity().recreate() } } true @@ -96,19 +96,19 @@ class ThemeSettingsFragment : AbsSettingsFragment() { setSummary(generalTheme, newValue) when (theme) { - "light" -> ThemeStore.editTheme(context!!).primaryColor(Color.WHITE).commit() - "black" -> ThemeStore.editTheme(context!!).primaryColor(Color.BLACK).commit() - "dark" -> ThemeStore.editTheme(context!!).primaryColor(ContextCompat.getColor(context!!, R.color.md_grey_900)).commit() - "color" -> ThemeStore.editTheme(context!!).primaryColor(ContextCompat.getColor(context!!, R.color.md_blue_grey_800)).commit() + "light" -> ThemeStore.editTheme(requireContext()).primaryColor(Color.WHITE).commit() + "black" -> ThemeStore.editTheme(requireContext()).primaryColor(Color.BLACK).commit() + "dark" -> ThemeStore.editTheme(requireContext()).primaryColor(ContextCompat.getColor(requireContext(), R.color.md_grey_900)).commit() + "color" -> ThemeStore.editTheme(requireContext()).primaryColor(ContextCompat.getColor(requireContext(), R.color.md_blue_grey_800)).commit() } - ThemeStore.editTheme(activity!!) + ThemeStore.editTheme(requireContext()) .activityTheme(PreferenceUtil.getThemeResFromPrefValue(theme)) .commit() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { activity?.setTheme(PreferenceUtil.getThemeResFromPrefValue(theme)) - DynamicShortcutManager(activity!!).updateDynamicShortcuts() + DynamicShortcutManager(requireContext()).updateDynamicShortcuts() } activity?.recreate() true @@ -116,11 +116,11 @@ class ThemeSettingsFragment : AbsSettingsFragment() { } val accentColorPref: ATEColorPreference = findPreference("accent_color")!! - val accentColor = ThemeStore.accentColor(activity!!) + val accentColor = ThemeStore.accentColor(requireContext()) accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor)) accentColorPref.setOnPreferenceClickListener { - MaterialDialog(activity!!, BottomSheet()).show { + MaterialDialog(requireContext(), BottomSheet()).show { title(R.string.accent_color) positiveButton(R.string.set) colorChooser(colors = ACCENT_COLORS, allowCustomArgb = true, subColors = ACCENT_COLORS_SUB) { _, color -> @@ -131,7 +131,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { ThemeStore.editTheme(context).accentColor(color).commit() if (VersionUtils.hasNougatMR()) DynamicShortcutManager(context).updateDynamicShortcuts() - activity!!.recreate() + requireActivity().recreate() } } return@setOnPreferenceClickListener true @@ -145,7 +145,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { colorAppShortcuts.setOnPreferenceChangeListener { _, newValue -> // Save preference PreferenceUtil.getInstance().setColoredAppShortcuts(newValue as Boolean) - DynamicShortcutManager(activity!!).updateDynamicShortcuts() + DynamicShortcutManager(requireContext()).updateDynamicShortcuts() true } } diff --git a/app/src/main/res/layout/card_credit.xml b/app/src/main/res/layout/card_credit.xml index 8b823cb3..bfd08301 100644 --- a/app/src/main/res/layout/card_credit.xml +++ b/app/src/main/res/layout/card_credit.xml @@ -15,14 +15,13 @@ - + android:text="@string/credit_title" + android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/card_other.xml b/app/src/main/res/layout/card_other.xml index 8ed12949..3f16af69 100644 --- a/app/src/main/res/layout/card_other.xml +++ b/app/src/main/res/layout/card_other.xml @@ -16,7 +16,8 @@ + android:text="@string/others" + android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" /> + android:text="@string/support_development" + android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" /> + android:text="@string/social" + android:textAppearance="@style/TextAppearance.MaterialComponents.Overline" /> - - - - - - - - + android:paddingEnd="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + android:paddingEnd="8dp" + app:layout_constraintBottom_toBottomOf="parent" + tools:backgroundTint="@color/md_red_400" + tools:layout_height="52dp" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml index e1fda879..c6063e83 100644 --- a/app/src/main/res/layout/fragment_classic_player.xml +++ b/app/src/main/res/layout/fragment_classic_player.xml @@ -96,15 +96,14 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="-8dp" - app:cardBackgroundColor="?cardBackgroundColor" + app:cardBackgroundColor="?colorPrimary" app:cardElevation="@dimen/card_elevation" app:cardUseCompatPadding="false" sothree:cardCornerRadius="12dp"> + android:layout_height="wrap_content" > - + android:paddingEnd="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:orientation="vertical" + app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + 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 14c861ce..aa78f89b 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 @@ -1,5 +1,5 @@ - + android:paddingEnd="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:paddingEnd="16dp" + app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/progressContainer"> + app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/titleContainer" + tools:ignore="ContentDescription,UnusedAttribute" + tools:showIn="@layout/fragment_player_playback_controls"> - - + + diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml index 9140d27c..f3a51b2f 100644 --- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml +++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml @@ -1,5 +1,6 @@ - - - - - - - - + android:paddingEnd="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + + + + + + + + + + + + + + + + - + android:paddingStart="8dp" + android:paddingEnd="8dp" + app:layout_constraintBottom_toBottomOf="parent" + tools:backgroundTint="@color/md_red_400" + tools:layout_height="52dp" /> + 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 34d019cd..1c56895c 100644 --- a/app/src/main/res/layout/fragment_material_playback_controls.xml +++ b/app/src/main/res/layout/fragment_material_playback_controls.xml @@ -1,5 +1,5 @@ - + android:paddingEnd="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/progressContainer"> + android:layout_height="wrap_content" + android:layoutDirection="ltr" + android:paddingStart="4dp" + android:paddingEnd="4dp" + app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/titleContainer" + tools:ignore="ContentDescription,UnusedAttribute" + tools:showIn="@layout/fragment_player_playback_controls"> - - + + 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 a03d4acf..2835d296 100644 --- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml @@ -1,5 +1,6 @@ - + android:paddingEnd="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + - - \ No newline at end of file + + + + + + + + + + + + + + + + \ No newline at end of file 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 7fa64266..9e1c4f5a 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -1,5 +1,6 @@ - + android:paddingEnd="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:orientation="vertical" + app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/progressContainer"> - + + + + + + + + + + + + + + + - - - \ No newline at end of file + android:paddingEnd="8dp" + app:layout_constraintBottom_toBottomOf="parent" + tools:backgroundTint="@color/md_red_400" + tools:layout_height="52dp" /> + \ No newline at end of file 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 c97c54b0..a4dcd69d 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -1,67 +1,186 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - \ No newline at end of file + android:layout_weight="0" + android:paddingStart="8dp" + android:paddingEnd="8dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/playerMediaControllerContainer" + tools:backgroundTint="@color/md_red_400" + tools:layout_height="52dp" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/media_button.xml b/app/src/main/res/layout/media_button.xml index 5250dc30..9ec630e1 100644 --- a/app/src/main/res/layout/media_button.xml +++ b/app/src/main/res/layout/media_button.xml @@ -2,7 +2,6 @@ Tap \'select\' button at the bottom of the screen Do not open any sub-folders Deleting songs + Hemanth Savarala