Redesign in the album section

app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java

@@ -2,24 +2,37 @@ package com.cappielloantonio.play.ui.fragment;
 
 import android.graphics.PorterDuff;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.adapter.SongResultSearchAdapter;
 import com.cappielloantonio.play.databinding.FragmentAlbumPageBinding;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
+import com.cappielloantonio.play.helper.MusicPlayerRemote;
+import com.cappielloantonio.play.repository.QueueRepository;
 import com.cappielloantonio.play.ui.activities.MainActivity;
 import com.cappielloantonio.play.viewmodel.AlbumPageViewModel;
 
+import java.util.Collections;
+
 public class AlbumPageFragment extends Fragment {
+    private static final String TAG = "AlbumPageFragment";
 
     private FragmentAlbumPageBinding bind;
     private MainActivity activity;
@@ -67,28 +80,58 @@ public class AlbumPageFragment extends Fragment {
 
     private void initAppBar() {
         activity.setSupportActionBar(bind.animToolbar);
-        if (activity.getSupportActionBar() != null)
+
+        if (activity.getSupportActionBar() != null) {
             activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            activity.getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
 
-        bind.collapsingToolbar.setTitle(albumPageViewModel.getAlbum().getTitle());
+        bind.albumNameLabel.setText(albumPageViewModel.getAlbum().getTitle());
-        bind.animToolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp());
+        bind.albumArtistLabel.setText(albumPageViewModel.getAlbum().getArtistName());
-        bind.collapsingToolbar.setCollapsedTitleTextColor(getResources().getColor(R.color.titleTextColor, null));
+        bind.albumReleaseYearLabel.setText(String.valueOf(albumPageViewModel.getAlbum().getYear()));
 
-        bind.appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
+        albumPageViewModel.getAlbumSongList().observe(requireActivity(), songs -> {
-            if ((bind.collapsingToolbar.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.collapsingToolbar))) {
+            if(bind != null) {
-                bind.animToolbar.getNavigationIcon().setColorFilter(getResources().getColor(R.color.titleTextColor, null), PorterDuff.Mode.SRC_ATOP);
+                bind.albumPagePlayButton.setOnClickListener(v -> {
-            } else {
+                    QueueRepository queueRepository = new QueueRepository(App.getInstance());
-                bind.animToolbar.getNavigationIcon().setColorFilter(getResources().getColor(R.color.white, null), PorterDuff.Mode.SRC_ATOP);
+                    queueRepository.insertAllAndStartNew(songs);
+
+                    activity.isBottomSheetInPeek(true);
+                    activity.setBottomSheetMusicInfo(songs.get(0));
+
+                    MusicPlayerRemote.openQueue(songs, 0, true);
+                });
+
+                bind.albumPageShuffleButton.setOnClickListener(v -> {
+                    Collections.shuffle(songs);
+
+                    QueueRepository queueRepository = new QueueRepository(App.getInstance());
+                    queueRepository.insertAllAndStartNew(songs);
+
+                    activity.isBottomSheetInPeek(true);
+                    activity.setBottomSheetMusicInfo(songs.get(0));
+
+                    MusicPlayerRemote.openQueue(songs, 0, true);
+                });
             }
         });
 
+        bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
+            if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.animToolbar))) {
+                bind.animToolbar.setTitle(albumPageViewModel.getAlbum().getTitle());
+            } else {
+                bind.animToolbar.setTitle("Album");
+            }
+        });
+
+        bind.animToolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp());
     }
 
     private void initBackCover() {
         CustomGlideRequest.Builder
                 .from(requireContext(), albumPageViewModel.getAlbum().getPrimary(), albumPageViewModel.getAlbum().getBlurHash(), CustomGlideRequest.PRIMARY, CustomGlideRequest.TOP_QUALITY, CustomGlideRequest.ALBUM_PIC)
                 .build()
-                .into(bind.albumBackCoverImageView);
+                .into(bind.albumCoverImageView);
     }
 
     private void initSongsView() {
@@ -97,6 +140,9 @@ public class AlbumPageFragment extends Fragment {
 
         songResultSearchAdapter = new SongResultSearchAdapter(activity, requireContext(), getChildFragmentManager());
         bind.songRecyclerView.setAdapter(songResultSearchAdapter);
-        albumPageViewModel.getAlbumSongList().observe(requireActivity(), songs -> songResultSearchAdapter.setItems(songs));
+
+        albumPageViewModel.getAlbumSongList().observe(requireActivity(), songs -> {
+            songResultSearchAdapter.setItems(songs);
+        });
     }
 }

app/src/main/res/drawable/ic_arrow_back.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/titleTextColor"
+      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>

app/src/main/res/drawable/ic_downloading.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/titleTextColor"
+      android:pathData="M18.32,4.26C16.84,3.05 15.01,2.25 13,2.05v2.02c1.46,0.18 2.79,0.76 3.9,1.62L18.32,4.26zM19.93,11h2.02c-0.2,-2.01 -1,-3.84 -2.21,-5.32L18.31,7.1C19.17,8.21 19.75,9.54 19.93,11zM18.31,16.9l1.43,1.43c1.21,-1.48 2.01,-3.32 2.21,-5.32h-2.02C19.75,14.46 19.17,15.79 18.31,16.9zM13,19.93v2.02c2.01,-0.2 3.84,-1 5.32,-2.21l-1.43,-1.43C15.79,19.17 14.46,19.75 13,19.93zM15.59,10.59L13,13.17V7h-2v6.17l-2.59,-2.59L7,12l5,5l5,-5L15.59,10.59zM11,19.93v2.02c-5.05,-0.5 -9,-4.76 -9,-9.95s3.95,-9.45 9,-9.95v2.02C7.05,4.56 4,7.92 4,12S7.05,19.44 11,19.93z"/>
+</vector>

app/src/main/res/drawable/ic_shuffle.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/titleTextColor"
+      android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z"/>
+</vector>

app/src/main/res/layout/fragment_album_page.xml

@@ -1,59 +1,195 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/appbar"
+        android:id="@+id/anim_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/appbar_header_height"
+        android:layout_height="?attr/actionBarSize"
-        android:fitsSystemWindows="true"
+        app:titleTextColor="@color/titleTextColor"
-        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
+        app:layout_collapseMode="pin"
+        app:navigationIcon="@drawable/ic_arrow_back"
+        app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/collapsing_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:elevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/album_info_sector"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+                android:clipChildren="false">
+
+                <ImageView
+                    android:id="@+id/album_cover_image_view"
+                    android:layout_width="156dp"
+                    android:layout_height="156dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
+
+                <TextView
+                    android:id="@+id/album_name_label"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:fontFamily="@font/open_sans_font_family"
+                    android:maxLines="2"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="16dp"
+                    android:singleLine="false"
+                    android:textColor="@color/titleTextColor"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
+                    app:layout_constraintTop_toTopOf="@+id/album_cover_image_view"/>
+
+                <TextView
+                    android:id="@+id/album_artist_label"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:fontFamily="@font/open_sans_font_family"
+                    android:maxLines="1"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="16dp"
+                    android:textColor="@color/subtitleTextColor"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
+                    app:layout_constraintTop_toBottomOf="@+id/album_name_label"/>
+
+                <TextView
+                    android:id="@+id/album_release_year_label"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/open_sans_font_family"
+                    android:paddingTop="4dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="16dp"
+                    android:textColor="@color/subtitleTextColor"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
+                    app:layout_constraintTop_toBottomOf="@+id/album_artist_label"/>
+
+                <ImageView
+                    android:id="@+id/download_icon_image_view"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:layout_marginStart="12dp"
+                    android:background="@drawable/ic_downloading"
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
+                    app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"/>
+
+                <ToggleButton
+                    android:id="@+id/favorite_icon_image_view"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:background="@drawable/button_favorite_selector"
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:checked="false"
+                    android:gravity="center_vertical"
+                    android:layout_marginEnd="16dp"
+                    android:text=""
+                    android:textOff=""
+                    android:textOn=""
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"/>
+
+                <View style="@style/Divider"
+                    android:id="@+id/upper_button_divider"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="18dp"
+                    android:layout_marginTop="18dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view"/>
+
+                <LinearLayout
+                    android:id="@+id/album_page_button_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="4dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/upper_button_divider">
+
+                    <Button
+                        android:id="@+id/album_page_play_button"
+                        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="4dp"
+                        android:padding="10dp"
+                        android:text="Play"
+                        android:textColor="@color/darkIconColor"
+                        android:textAllCaps="false"
+                        android:backgroundTint="@color/buttonBackgroundColor"
+                        app:iconGravity="textStart"
+                        app:iconPadding="18dp"
+                        app:icon="@drawable/ic_play"
+                        app:iconTint="@color/darkIconColor"
+                        app:elevation="0dp"/>
+
+                    <Button
+                        android:id="@+id/album_page_shuffle_button"
+                        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:padding="10dp"
+                        android:text="Shuffle"
+                        android:textColor="@color/darkIconColor"
+                        android:textAllCaps="false"
+                        android:backgroundTint="@color/buttonBackgroundColor"
+                        app:iconGravity="textStart"
+                        app:iconPadding="18dp"
+                        app:icon="@drawable/ic_shuffle"
+                        app:iconTint="@color/darkIconColor"/>
+
+                </LinearLayout>
+
+                <View style="@style/Divider"
+                    android:id="@+id/bottom_button_divider"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="18dp"
+                    android:layout_marginBottom="18dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/album_page_button_layout"/>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/song_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
+            android:clipToPadding="false"
-            app:contentScrim="?attr/colorPrimary"
+            android:paddingTop="8dp"
-            app:expandedTitleMarginStart="@dimen/activity_margin_content"
+            android:paddingBottom="@dimen/global_padding_bottom"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-            <ImageView
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-                android:id="@+id/album_back_cover_image_view"
+</LinearLayout>
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true"
-                android:scaleType="centerCrop"
-                app:layout_collapseMode="parallax" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/appbar_header_height"
-                android:layout_gravity="top"
-                android:fitsSystemWindows="true"
-                android:background="@drawable/gradient_backdrop_background_image"/>
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/anim_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:titleTextColor="@color/titleTextColor"
-                app:layout_collapseMode="pin"
-                app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/song_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:paddingTop="18dp"
-        android:paddingBottom="@dimen/global_padding_bottom"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/values-night/colors.xml

@@ -19,9 +19,11 @@
     <color name="suggestionIconColor">#DADADA</color>
     <color name="darkIconColor">#CFCFCF</color>
     <color name="suggestionSelectedTextColor">#CCCCCC</color>
-    <color name="dividerColor">#707070</color>
+    <color name="dividerColor">#080808</color>
     <color name="hintTextColor">#CFCFCF</color>
 
+    <color name="buttonBackgroundColor">#1D1D1D</color>
+
     <color name="bottomNavIconPressedColor">#FFFFFF</color>
     <color name="bottomNavIconSelectedColor">#EEEEEE</color>
     <color name="bottomNavIconColor">#707070</color>

app/src/main/res/values-night/styles.xml

@@ -25,7 +25,7 @@
 
     <style name="Divider">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">0.5dp</item>
         <item name="android:background">@color/dividerColor</item>
     </style>
 </resources>

app/src/main/res/values/colors.xml

@@ -22,9 +22,11 @@
     <color name="suggestionIconColor">#252525</color>
     <color name="darkIconColor">#303030</color>
     <color name="suggestionSelectedTextColor">#333333</color>
-    <color name="dividerColor">#AFAFAF</color>
+    <color name="dividerColor">#f0f0f0</color>
     <color name="hintTextColor">#303030</color>
 
+    <color name="buttonBackgroundColor">#f0f0f0</color>
+
     <color name="bottomNavIconPressedColor">#252525</color>
     <color name="bottomNavIconSelectedColor">#303030</color>
     <color name="bottomNavIconColor">#AFAFAF</color>

app/src/main/res/values/styles.xml

@@ -24,7 +24,7 @@
 
     <style name="Divider">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">0.5dp</item>
         <item name="android:background">@color/dividerColor</item>
     </style>
 </resources>