From c00895d094c0233c96e9421dd023d7d2593b55b3 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Tue, 12 May 2020 03:54:09 +0530 Subject: [PATCH] Fix 16:9 screen now playing themes --- app/build.gradle | 4 +- .../retromusic/activities/MainActivity.java | 13 +- .../player/classic/ClassicPlayerFragment.kt | 1 - .../main/res/layout/fragment_album_cover.xml | 19 ++- app/src/main/res/layout/fragment_blur.xml | 98 +++++------ ...fragment_blur_player_playback_controls.xml | 58 ++++--- .../res/layout/fragment_classic_player.xml | 72 ++++---- .../main/res/layout/fragment_color_player.xml | 98 ++++++----- .../main/res/layout/fragment_flat_player.xml | 94 +++++------ app/src/main/res/layout/fragment_material.xml | 90 +++++----- .../main/res/layout/fragment_plain_player.xml | 155 +++++++++--------- app/src/main/res/layout/fragment_player.xml | 97 +++++------ .../fragment_player_playback_controls.xml | 1 + .../res/layout/fragment_simple_player.xml | 91 +++++----- 14 files changed, 438 insertions(+), 453 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index beb358ef..9272c5b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 426 - versionName '3.5.210' + versionCode 428 + versionName '3.5.300' multiDexEnabled true diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java index 2b4b634a..dbf430e1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java @@ -156,13 +156,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity hideStatusBar(); setBottomBarVisibility(View.VISIBLE); - getBottomNavigationView().setSelectedItemId(PreferenceUtil.getInstance(this).getLastPage()); - getBottomNavigationView().setOnNavigationItemSelectedListener(item -> { - PreferenceUtil.getInstance(MainActivity.this).setLastPage(item.getItemId()); - selectedFragment(item.getItemId()); - return true; - }); - if (savedInstanceState == null) { selectedFragment(PreferenceUtil.getInstance(this).getLastPage()); } else { @@ -178,6 +171,12 @@ public class MainActivity extends AbsSlidingMusicPanelActivity setupToolbar(); checkUpdate(); updateTabs(); + getBottomNavigationView().setSelectedItemId(PreferenceUtil.getInstance(this).getLastPage()); + getBottomNavigationView().setOnNavigationItemSelectedListener(item -> { + PreferenceUtil.getInstance(MainActivity.this).setLastPage(item.getItemId()); + selectedFragment(item.getItemId()); + return true; + }); } 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 8253ad58..95f4cb68 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 @@ -55,7 +55,6 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener, private var lastPlaybackControlsColor: Int = 0 private var lastDisabledPlaybackControlsColor: Int = 0 private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper - private lateinit var queueAdapter: PlayingQueueAdapter private var volumeFragment: VolumeFragment? = null private lateinit var shapeDrawable: MaterialShapeDrawable private lateinit var wrappedAdapter: RecyclerView.Adapter<*> diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml index 53fde556..d2cf3882 100644 --- a/app/src/main/res/layout/fragment_album_cover.xml +++ b/app/src/main/res/layout/fragment_album_cover.xml @@ -1,16 +1,21 @@ - - + app:cardElevation="8dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintDimensionRatio="1:1" + 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_blur.xml b/app/src/main/res/layout/fragment_blur.xml index dea5b2c1..96a470d3 100644 --- a/app/src/main/res/layout/fragment_blur.xml +++ b/app/src/main/res/layout/fragment_blur.xml @@ -1,5 +1,5 @@ - + android:background="@drawable/shadow_up_full_theme" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:layout_height="wrap_content" + 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_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml index 8ffd9bd9..1769391e 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 @@ -41,7 +41,6 @@ android:id="@+id/progressSlider" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="8" android:splitTrack="false" app:haloColor="@color/md_white_semi_transparent" app:haloRadius="0dp" @@ -73,9 +72,9 @@ + tools:text="@tools:sample/lorem" /> - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/titleContainer"> + + + - - + + + android:layout_height="56dp" + android:background="@drawable/shadow_down_strong" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + + + android:layout_height="wrap_content"> - + + - + + - - - - - - - - - + - + android:layout_height="match_parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:layout_height="wrap_content" + 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_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml index a5399de8..390b788b 100644 --- a/app/src/main/res/layout/fragment_flat_player.xml +++ b/app/src/main/res/layout/fragment_flat_player.xml @@ -1,73 +1,69 @@ - - - + android:layout_height="match_parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + - - - + - - - - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - + - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml index cbc33a35..a07ce51e 100644 --- a/app/src/main/res/layout/fragment_material.xml +++ b/app/src/main/res/layout/fragment_material.xml @@ -1,67 +1,57 @@ - - - - + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + - - - + - - + - - - - - - - - - - + + diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index 760b7ae3..64b44268 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -1,102 +1,95 @@ - - - + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + - - + - + android:ellipsize="marquee" + android:focusable="true" + android:focusableInTouchMode="true" + android:freezesText="true" + android:marqueeRepeatLimit="marquee_forever" + android:paddingTop="8dp" + android:scrollHorizontally="true" + android:singleLine="true" + android:textAppearance="@style/TextViewHeadline6" + android:textStyle="bold" + tools:ignore="MissingPrefix" + tools:text="Title" /> - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="1" + android:paddingTop="8dp" + tools:text="Text" /> - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index f497e2ee..5a4142e8 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -1,76 +1,69 @@ - - - + android:layout_height="match_parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + android:layout_height="wrap_content" + 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 464d3c09..2a78b51a 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -108,6 +108,7 @@ android:ellipsize="end" android:gravity="center" android:maxLines="2" + android:paddingBottom="8dp" android:paddingHorizontal="16dp" android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml index d0bfe301..1eabf24b 100644 --- a/app/src/main/res/layout/fragment_simple_player.xml +++ b/app/src/main/res/layout/fragment_simple_player.xml @@ -1,69 +1,60 @@ - - - + android:layout_height="wrap_content" + 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