diff --git a/app/app.iml b/app/app.iml index 3859914a4..caf1673d0 100644 --- a/app/app.iml +++ b/app/app.iml @@ -141,7 +141,6 @@ - @@ -158,7 +157,6 @@ - @@ -169,7 +167,6 @@ - diff --git a/app/build.gradle b/app/build.gradle index f5dc4e48e..53af907e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 252 + versionCode 253 versionName '2.2.100' multiDexEnabled true diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 1731cbcab..f5d4c381d 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

Are you subscribe to PewDiePie

You can view the changelog dialog again at any time from the about section.

Version 2.2.100

  • On library click on toolbar for accessing main menu
  • On home click on toolbar for accessing search
  • BottomSheetDialogue is now adaptable to screens, background colour and text size consistency.
  • Removed coloured navigation bar option to making app adapt the primary colour
  • Swipe up gesture for now playing removed, replaced with "tap to open", To achieve transparent navigation bar for desired themes.
  • Improved tablet UI and home screen by adding suggestions toggle banner issues.
  • Improving lyrics page

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

Are you subscribed to PewDiePie

You can view the changelog dialog again at any time from the about section.

Version 2.2.100

  • On library click on toolbar for accessing main menu
  • On home click on toolbar for accessing search
  • BottomSheetDialogue is now adaptable to screens, background colour and text size consistency.
  • Removed coloured navigation bar option to making app adapt the primary colour
  • Swipe up gesture for now playing removed, replaced with "tap to open", To achieve transparent navigation bar for desired themes.
  • Improved tablet UI and home screen by adding suggestions toggle banner issues.
  • Improving lyrics page

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java index 4049f8bbe..7c49781c3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java @@ -322,7 +322,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements Shared public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) { PreferenceUtil.getInstance().setLastPage(menuItem.getItemId()); selectedFragment(menuItem.getItemId()); - applyInsets(); return true; } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java index 4ae985ce1..3a3fbf0b0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java @@ -46,7 +46,6 @@ import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment; import code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlayerFragment; import code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlayerFragment; import code.name.monkey.retromusic.util.PreferenceUtil; -import code.name.monkey.retromusic.util.RetroUtil; import code.name.monkey.retromusic.util.ViewUtil; import code.name.monkey.retromusic.views.BottomNavigationBarTinted; import code.name.monkey.retromusic.views.FitSystemWindowsLayout; @@ -81,11 +80,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi @Override protected void onCreate(Bundle savedInstanceState) { - setDrawUnderNavigationBar(); super.onCreate(savedInstanceState); setContentView(createContentView()); ButterKnife.bind(this); - checkDisplayCutout(); choosFragmentForTheme(); setupSlidingUpPanel(); } @@ -120,12 +117,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } public void hideBottomBar(final boolean hide) { - //int heightOfBarWithTabs = getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded) + RetroUtil.getNavigationBarHeight(getResources()); - int height = RetroUtil.checkNavigationBarHeight() ? getResources().getDimensionPixelSize(R.dimen.mini_player_height) : getResources().getDimensionPixelSize(R.dimen.mini_player_height); - int heightOfBar = getResources().getDimensionPixelSize(R.dimen.mini_player_height) + RetroUtil.getNavigationBarHeight(this); - int heightOfBarWithTabs = - getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded) + - RetroUtil.getNavigationBarHeight(this); + int heightOfBar = getResources().getDimensionPixelSize(R.dimen.mini_player_height); + int heightOfBarWithTabs = getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded); + if (hide) { slidingUpPanelLayout.setPanelHeight(0); collapsePanel(); @@ -231,7 +225,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi slidingUpPanelLayout.addPanelSlideListener(this); - applyInsets(); } protected void applyInsets() { @@ -297,8 +290,8 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi public void onPanelSlide(View panel, float slideOffset) { bottomNavigationView.setTranslationY(slideOffset * 400); setMiniPlayerAlphaProgress(slideOffset); - if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel(); - super.setNavigationbarColor((int) argbEvaluator.evaluate(slideOffset, navigationbarColor, Color.TRANSPARENT)); + //if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel(); + //super.setNavigationbarColor((int) argbEvaluator.evaluate(slideOffset, navigationbarColor, Color.TRANSPARENT)); } @Override @@ -323,6 +316,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi super.setNavigationbarColor(ThemeStore.primaryColor(this)); super.setLightNavigationBar(lightNavigationBar); + playerFragment.setMenuVisibility(false); playerFragment.setUserVisibleHint(false); playerFragment.onHide(); @@ -330,15 +324,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi public void onPanelExpanded(View panel) { int playerFragmentColor = playerFragment.getPaletteColor(); - super.setTaskDescriptionColor(playerFragmentColor); - if (currentNowPlayingScreen == NowPlayingScreen.COLOR) { - super.setNavigationbarColor(playerFragmentColor); - } else { - super.setNavigationbarColor(Color.TRANSPARENT); - } + super.setLightStatusbar(lightStatusbar); - onPaletteColorChanged(); playerFragment.setMenuVisibility(true); playerFragment.setUserVisibleHint(true); playerFragment.onShow(); @@ -441,11 +429,13 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } else if (currentNowPlayingScreen == NowPlayingScreen.COLOR) { super.setLightStatusbar(isColorLight); super.setLightNavigationBar(isColorLight); + super.setNavigationbarColor(paletteColor); } else if (currentNowPlayingScreen == NowPlayingScreen.BLUR || currentNowPlayingScreen == NowPlayingScreen.BLUR_CARD) { super.setLightStatusbar(false); + super.setLightNavigationBar(true); } else if (currentNowPlayingScreen == NowPlayingScreen.CARD || currentNowPlayingScreen == NowPlayingScreen.FULL) { - super.setNavigationbarColor(Color.TRANSPARENT); super.setLightStatusbar(false); + super.setLightNavigationBar(ColorUtil.isColorLight(ThemeStore.primaryColor(this))); } else if (currentNowPlayingScreen == NowPlayingScreen.FIT) { super.setNavigationbarColor(Color.TRANSPARENT); super.setLightStatusbar(false); diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java index 070e2ba6b..5d6d9bdc5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java @@ -34,8 +34,6 @@ import code.name.monkey.retromusic.util.MusicUtil; import code.name.monkey.retromusic.util.NavigationUtil; import code.name.monkey.retromusic.util.PreferenceUtil; import code.name.monkey.retromusic.util.RetroUtil; -import code.name.monkey.retromusic.util.SystemUtils; -import code.name.monkey.retromusic.views.FitSystemWindowsLayout; public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implements Toolbar.OnMenuItemClickListener, PaletteColorHolder { public static final String TAG = AbsPlayerFragment.class.getSimpleName(); @@ -53,17 +51,6 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen } } - protected void addSafeArea(View view) { - FitSystemWindowsLayout safeArea = view.findViewById(R.id.safeArea); - if (safeArea != null) { - //ViewGroup.MarginLayoutParams params = ((ViewGroup.MarginLayoutParams) safeArea.getLayoutParams()); - //params.topMargin = RetroUtil.getStatusBarHeight(); - //params.bottomMargin = RetroUtil.getNavigationBarHeight(); - //if (PreferenceUtil.getInstance().getFullScreenMode()) safeArea.setFit(false); - //else safeArea.setFit(true); - } - } - @Override public void onDetach() { super.onDetach(); diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java index fa0b9ea75..aa7d6859d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java @@ -70,9 +70,6 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA @BindView(R.id.toolbar) Toolbar toolbar; - /*@BindView(R.id.app_bar) - AppBarLayout appbar; -*/ @BindView(R.id.image) @Nullable ImageView imageView; @@ -80,9 +77,6 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA @BindView(R.id.user_image) CircularImageView userImage; - /* @BindView(R.id.collapsing_toolbar) - CollapsingToolbarLayout toolbarLayout;*/ - @BindView(R.id.recycler_view) RecyclerView recentArtistRV; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java index dfd79f4e9..5c3daa35a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java @@ -42,14 +42,12 @@ public class FullPlayerFragment extends AbsPlayerFragment implements PlayerAlbum @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_full, container, false); unbinder = ButterKnife.bind(this, view); - return view; } @Override public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - setUpSubFragments(); setUpPlayerToolbar(); } @@ -64,7 +62,6 @@ public class FullPlayerFragment extends AbsPlayerFragment implements PlayerAlbum playerAlbumCoverFragment.setCallbacks(this); playerAlbumCoverFragment.removeSlideEffect(); } - } @Override diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml index 384466a22..2f6268133 100644 --- a/app/src/main/res/layout-land/fragment_banner_home.xml +++ b/app/src/main/res/layout-land/fragment_banner_home.xml @@ -3,8 +3,8 @@ @@ -60,6 +60,50 @@ android:focusableInTouchMode="true" android:orientation="vertical"> + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml index 44cc2d432..0fbd4df96 100644 --- a/app/src/main/res/layout-land/fragment_blur.xml +++ b/app/src/main/res/layout-land/fragment_blur.xml @@ -27,10 +27,13 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml index 4212ab17b..0ac7f7329 100644 --- a/app/src/main/res/layout-land/fragment_card_blur_player.xml +++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml @@ -21,66 +21,64 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - - - - - - - - - - - - - + + android:layout_weight="0"> + + + + + + android:layout_height="wrap_content" /> - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml index eb6af438e..5c2bd1d8e 100644 --- a/app/src/main/res/layout-land/fragment_card_player.xml +++ b/app/src/main/res/layout-land/fragment_card_player.xml @@ -20,61 +20,57 @@ android:layout_height="match_parent" tools:layout="@layout/fragment_album_cover" /> - - + + + + + + + + + + android:layout_weight="1" /> + + android:layout_height="match_parent"> - + - - - - - - - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml index 66a54e8c7..a4d4d721e 100644 --- a/app/src/main/res/layout-land/fragment_color_player.xml +++ b/app/src/main/res/layout-land/fragment_color_player.xml @@ -14,10 +14,12 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml index 11d376566..eb1040a6d 100644 --- a/app/src/main/res/layout-land/fragment_flat_player.xml +++ b/app/src/main/res/layout-land/fragment_flat_player.xml @@ -15,10 +15,13 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml index 13329b24b..b629d13af 100644 --- a/app/src/main/res/layout-land/fragment_home.xml +++ b/app/src/main/res/layout-land/fragment_home.xml @@ -2,8 +2,8 @@ @@ -40,6 +40,50 @@ android:focusableInTouchMode="true" android:orientation="vertical"> + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-land/fragment_material.xml b/app/src/main/res/layout-land/fragment_material.xml index 94257bbb8..0e76525a7 100644 --- a/app/src/main/res/layout-land/fragment_material.xml +++ b/app/src/main/res/layout-land/fragment_material.xml @@ -9,10 +9,13 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + 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 fb1a0482b..15ed6db09 100644 --- a/app/src/main/res/layout-land/fragment_plain_player.xml +++ b/app/src/main/res/layout-land/fragment_plain_player.xml @@ -10,10 +10,13 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml index 4b3025dfc..f9455a57b 100755 --- a/app/src/main/res/layout-land/fragment_player.xml +++ b/app/src/main/res/layout-land/fragment_player.xml @@ -14,10 +14,12 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_simple_player.xml b/app/src/main/res/layout-land/fragment_simple_player.xml index da4ec270c..bcf97f8e3 100644 --- a/app/src/main/res/layout-land/fragment_simple_player.xml +++ b/app/src/main/res/layout-land/fragment_simple_player.xml @@ -16,10 +16,13 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + - + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/abs_playlists.xml b/app/src/main/res/layout-sw600dp/abs_playlists.xml index c331768b3..1e7fbb617 100644 --- a/app/src/main/res/layout-sw600dp/abs_playlists.xml +++ b/app/src/main/res/layout-sw600dp/abs_playlists.xml @@ -3,43 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> - - - - - - - - - - diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml index 136a5f349..582d556ee 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml @@ -21,6 +21,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml index c4c1dac7e..e0067f12b 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml @@ -35,10 +35,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + - + + + + + + + + + + + + + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + - - - - - - + - + tools:layout="@layout/fragment_player_album_cover" /> + - - - - + android:layout_height="match_parent" + tools:layout="@layout/fragment_player_playback_controls" /> - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml index 8a8b45179..7ee0867bf 100644 --- a/app/src/main/res/layout-xlarge/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge/fragment_blur.xml @@ -25,60 +25,58 @@ android:layout_height="match_parent" android:background="@drawable/shadow_up" /> - - + + + + + + + + + + android:layout_weight="1" + tools:background="@color/md_white_1000"> - - - - - - + tools:layout="@layout/fragment_blur_playback_controls" /> + - - + - + + + - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml index 339bebb57..789aa4385 100644 --- a/app/src/main/res/layout-xlarge/fragment_home.xml +++ b/app/src/main/res/layout-xlarge/fragment_home.xml @@ -2,8 +2,8 @@ @@ -21,7 +21,50 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + + + + + - + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:gravity="center_horizontal" + android:orientation="vertical"> - + + - - - - - - - - - - - + tools:layout="@layout/fragment_player_album_cover" /> + - - - - + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml index cb23f9a19..54545b0c3 100644 --- a/app/src/main/res/layout/abs_playlists.xml +++ b/app/src/main/res/layout/abs_playlists.xml @@ -1,45 +1,10 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml index 5e9eab0d1..c14a64e97 100644 --- a/app/src/main/res/layout/fragment_adaptive_player.xml +++ b/app/src/main/res/layout/fragment_adaptive_player.xml @@ -9,65 +9,62 @@ - - + + + + + + + + + + + android:layout_weight="1" + app:cardCornerRadius="8dp" + app:cardElevation="8dp" + app:cardUseCompatPadding="true"> - + android:layout_height="match_parent" /> - + - + - - - - - - - - - - - - + tools:layout="@layout/fragment_adaptive_player_playback_controls" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml index 5f40073ac..d3ae45e0e 100644 --- a/app/src/main/res/layout/fragment_banner_home.xml +++ b/app/src/main/res/layout/fragment_banner_home.xml @@ -2,8 +2,8 @@ @@ -18,6 +18,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml index aa2e113a7..a96e4c749 100644 --- a/app/src/main/res/layout/fragment_blur.xml +++ b/app/src/main/res/layout/fragment_blur.xml @@ -23,55 +23,51 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + + + + + + + + + + + android:layout_weight="1" + tools:background="@color/md_white_1000"> - - - - - - - - - - - - - - - - + android:layout_height="match_parent" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml index 24c4581b6..e27385c79 100644 --- a/app/src/main/res/layout/fragment_card_blur_player.xml +++ b/app/src/main/res/layout/fragment_card_blur_player.xml @@ -21,68 +21,66 @@ - - + android:layout_height="wrap_content" + android:orientation="vertical"> - - - - - - - - - - - - - + + android:layout_weight="0"> + + + + + + android:layout_height="wrap_content" /> + + + + + + - + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml index 6d3ad8048..5f0d236f9 100644 --- a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml @@ -5,8 +5,8 @@ android:id="@+id/playback_controls" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="32dp" - android:paddingEnd="32dp" + android:paddingStart="24dp" + android:paddingEnd="24dp" android:paddingBottom="32dp"> - - - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + + + + + + + android:layout_weight="1" /> + + android:layout_height="match_parent"> - - - - - - - - - - - - - - - + android:layout_height="match_parent" + tools:layout="@layout/fragment_card_player_playback_controls" /> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml index c53409d9b..d4f658bf2 100644 --- a/app/src/main/res/layout/fragment_color_player.xml +++ b/app/src/main/res/layout/fragment_color_player.xml @@ -15,107 +15,103 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + app:cardCornerRadius="8dp" + app:cardElevation="4dp" + app:cardPreventCornerOverlap="false" + app:cardUseCompatPadding="true"> - - - - + android:layout_gravity="center_horizontal"> - - - - - - - - - - - - - - - - - - - + android:scaleType="centerCrop" + tools:ignore="ContentDescription,UnusedAttribute" /> - + + + + + + + + + + + + + + + + android:layout_height="match_parent" + tools:layout="@layout/fragment_player_playback_controls" /> + + + - + + + + - - - \ 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 ac369b74c..6ccb87ff1 100644 --- a/app/src/main/res/layout/fragment_flat_player.xml +++ b/app/src/main/res/layout/fragment_flat_player.xml @@ -15,55 +15,52 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + android:layout_height="wrap_content" + android:layout_weight="0"> - + + + + + + tools:layout="@layout/fragment_player_album_cover" /> + - - + - + android:layout_height="match_parent" + tools:layout="@layout/fragment_flat_player_playback_controls" /> + + - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml index 0782b84bf..c81c13ca5 100644 --- a/app/src/main/res/layout/fragment_full.xml +++ b/app/src/main/res/layout/fragment_full.xml @@ -18,10 +18,7 @@ android:layout_height="match_parent" android:background="#50000000" /> - + - + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index bf7a38e16..6b2666a90 100755 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -2,9 +2,9 @@ + + + + + + + + + + + + + + - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + android:layout_height="wrap_content"> - - - - - - + tools:layout="@layout/fragment_album_cover" /> + - - + - + android:layout_height="match_parent" + tools:layout="@layout/fragment_material_playback_controls" /> + + + + + + + - - - - diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index ef894b1c2..c2e8d47ae 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -9,90 +9,86 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + android:layout_weight="1"> - - - - - - - - - - - - - + tools:layout="@layout/fragment_plain_controls_fragment" /> + - - + - - - - - - + + + \ 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 3fd5919c9..9c133212d 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -14,56 +14,54 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + android:layout_height="wrap_content"> - - - - - - + tools:layout="@layout/fragment_album_cover" /> + - - + - + android:layout_height="match_parent" + tools:layout="@layout/fragment_player_playback_controls" /> + + + + + + + - - - - diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml index 44c46eab4..6f913a969 100644 --- a/app/src/main/res/layout/fragment_simple_player.xml +++ b/app/src/main/res/layout/fragment_simple_player.xml @@ -15,16 +15,12 @@ - - + - + \ No newline at end of file