From 034767dfda8c9128b249c6b40e93e37d65804930 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Wed, 2 Oct 2019 22:04:39 +0530 Subject: [PATCH] Fix text alignment --- app/build.gradle | 4 +- .../ClassicPlayerPlaybackControlsFragment.kt | 11 +- .../res/layout-land/fragment_plain_player.xml | 3 +- ...fragment_blur_player_playback_controls.xml | 79 +++++------ ...fragment_card_player_playback_controls.xml | 3 +- .../main/res/layout/fragment_color_player.xml | 2 +- ...ragment_color_player_playback_controls.xml | 71 +++++----- .../layout/fragment_fit_playback_controls.xml | 9 +- ...fragment_flat_player_playback_controls.xml | 85 ++++++------ .../layout/fragment_full_player_controls.xml | 3 +- .../fragment_material_playback_controls.xml | 73 +++++----- .../main/res/layout/fragment_plain_player.xml | 3 +- .../fragment_player_playback_controls.xml | 73 +++++----- .../fragment_simple_controls_fragment.xml | 129 +++++++----------- 14 files changed, 256 insertions(+), 292 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d950574c..2aec8e79 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 376 - versionName '3.4.100-beta02' + versionCode 377 + versionName '3.4.200-beta03' multiDexEnabled true 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 bc339aa6..e264016b 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 @@ -53,6 +53,11 @@ class ClassicPlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { updateShuffleState() updatePrevNextColor() updateProgressTextColor() + + val fabColor = Color.WHITE + TintHelper.setTintAuto(playerPlayPauseFab, fabColor, true) + TintHelper.setTintAuto(playerPlayPauseFab, MaterialValueHelper.getPrimaryTextColor(requireContext(), ColorUtil.isColorLight(fabColor)), false) + } @@ -63,7 +68,7 @@ class ClassicPlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(code.name.monkey.retromusic.R.layout.fragment_classic_player_playback_controls, container, false) + return inflater.inflate(R.layout.fragment_classic_player_playback_controls, container, false) } override fun onCreate(savedInstanceState: Bundle?) { @@ -103,10 +108,6 @@ class ClassicPlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { } private fun setUpPlayPauseFab() { - val fabColor = Color.WHITE - TintHelper.setTintAuto(playerPlayPauseFab, fabColor, true) - - playerPlayPauseFab.setColorFilter(MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN) playerPlayPauseFab.setOnClickListener(PlayPauseButtonOnClickHandler()) playerPlayPauseFab.post { if (playerPlayPauseFab != null) { 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 01b48148..7db64f1b 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:textSize="24sp" + android:textAppearance="@style/TextViewHeadline5" android:textStyle="bold" tools:ignore="MissingPrefix" tools:text="Title" /> @@ -76,6 +76,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" + android:paddingTop="8dp" tools:text="Text" /> 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 9fdfc610..0e607ac6 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,55 +75,46 @@ tools:text="00:22" /> - + + - - - - - + app:layout_constraintTop_toBottomOf="@+id/title" + tools:text="@tools:sample/lorem/random" /> 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 7289105a..eb1f59fd 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 @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/playback_controls" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:clickable="true" android:focusable="true" android:orientation="vertical" @@ -54,7 +54,6 @@ android:id="@+id/volumeFragmentContainer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="0" android:paddingStart="8dp" android:paddingEnd="8dp" /> diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml index 6234f67e..6b289cf1 100644 --- a/app/src/main/res/layout/fragment_color_player.xml +++ b/app/src/main/res/layout/fragment_color_player.xml @@ -99,7 +99,7 @@ android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment" android:layout_width="match_parent" android:layout_height="match_parent" - tools:layout="@layout/fragment_player_playback_controls" /> + tools:layout="@layout/fragment_color_player_playback_controls" /> - + + + app:layout_constraintTop_toBottomOf="@+id/title" + tools:text="@tools:sample/lorem/random" /> - - - - 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 6293aa65..4b6ce598 100644 --- a/app/src/main/res/layout/fragment_fit_playback_controls.xml +++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/playback_controls" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="vertical" tools:ignore="MissingPrefix"> @@ -80,12 +80,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginTop="4dp" android:ellipsize="end" android:gravity="center" android:maxLines="1" - android:paddingStart="16dp" - android:paddingEnd="16dp" + android:paddingStart="24dp" + android:paddingTop="12dp" + android:paddingEnd="24dp" + android:textAppearance="@style/TextViewBody2" tools:text="@tools:sample/lorem/random" /> 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 b8de6b3a..c2663a1d 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 @@ -56,52 +56,53 @@ tools:progress="20" /> - + + + app:layout_constraintTop_toBottomOf="@+id/text" + tools:text="@tools:sample/full_names" /> - - - - - 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 8d525b40..0fac707c 100644 --- a/app/src/main/res/layout/fragment_full_player_controls.xml +++ b/app/src/main/res/layout/fragment_full_player_controls.xml @@ -25,7 +25,6 @@ - + + - - - - - + app:layout_constraintTop_toBottomOf="@+id/title" + tools:text="@tools:sample/lorem/random" /> diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index 090a10b3..83c64e37 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:textSize="22sp" + android:textAppearance="@style/TextViewHeadline5" android:textStyle="bold" tools:ignore="MissingPrefix" tools:text="Title" /> @@ -50,6 +50,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="end" + android:paddingTop="8dp" android:maxLines="1" android:textColor="?colorOnBackground" tools:text="Text" /> 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 6a14891a..6c11b711 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -62,48 +62,49 @@ tools:text="00:22" /> - + + + app:layout_constraintTop_toBottomOf="@+id/title" + tools:text="@tools:sample/lorem/random" /> - - - - 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 0754f647..e67422c4 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -6,96 +6,68 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + + + + app:layout_constraintTop_toBottomOf="@+id/text" + tools:layout_editor_absoluteX="16dp" + tools:text="22.00/ 33.00" /> - - - - - - @@ -181,7 +153,6 @@ 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