From fdc104f70b6c69d4114a8a9b73593d9d883c772a Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Tue, 27 Apr 2021 13:59:27 +0200 Subject: [PATCH] Added For You top bar --- .../play/ui/fragment/HomeFragment.java | 9 +++ .../com/cappielloantonio/play/util/Util.java | 14 +++++ app/src/main/res/layout/fragment_home.xml | 58 ++++++++++++++++++- app/src/main/res/menu/bottom_nav_menu.xml | 4 -- app/src/main/res/navigation/nav_graph.xml | 3 + app/src/main/res/values/styles.xml | 6 ++ 6 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/cappielloantonio/play/util/Util.java diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java index 86fde6cb..17e08d72 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java @@ -23,6 +23,7 @@ import com.cappielloantonio.play.adapter.YearAdapter; import com.cappielloantonio.play.databinding.FragmentHomeBinding; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.ui.activity.MainActivity; +import com.cappielloantonio.play.util.Util; import com.cappielloantonio.play.viewmodel.HomeViewModel; public class HomeFragment extends Fragment { @@ -50,6 +51,7 @@ public class HomeFragment extends Fragment { homeViewModel = new ViewModelProvider(requireActivity()).get(HomeViewModel.class); init(); + initForYouBar(); return view; } @@ -112,6 +114,12 @@ public class HomeFragment extends Fragment { }); } + private void initForYouBar() { + bind.homeDateLabel.setText(Util.getDate()); + + bind.homeSettingsImageView.setOnClickListener(v -> activity.navController.navigate(R.id.action_homeFragment_to_settingsFragment)); + } + private void initDiscoverSongSlideView() { bind.discoverSongViewPager.setOrientation(ViewPager2.ORIENTATION_HORIZONTAL); @@ -221,6 +229,7 @@ public class HomeFragment extends Fragment { public void reorder() { if(bind != null) { bind.homeLinearLayoutContainer.removeAllViews(); + bind.homeLinearLayoutContainer.addView(bind.forYouSector); bind.homeLinearLayoutContainer.addView(bind.homeDiscoverSector); bind.homeLinearLayoutContainer.addView(bind.homeRecentlyAddedTracksSector); bind.homeLinearLayoutContainer.addView(bind.homeFlashbackSector); diff --git a/app/src/main/java/com/cappielloantonio/play/util/Util.java b/app/src/main/java/com/cappielloantonio/play/util/Util.java new file mode 100644 index 00000000..e7723f84 --- /dev/null +++ b/app/src/main/java/com/cappielloantonio/play/util/Util.java @@ -0,0 +1,14 @@ +package com.cappielloantonio.play.util; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class Util { + public static String getDate() { + String pattern = "EEEE, MMMM d"; + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern); + String date = simpleDateFormat.format(new Date()); + + return date; + } +} diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e4192122..ed58e47e 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -12,6 +12,62 @@ android:orientation="vertical" android:paddingBottom="@dimen/global_padding_bottom"> + + + + + + + + + + + + diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index 80b09a67..a047debc 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -12,8 +12,4 @@ android:id="@+id/searchFragment" android:icon="@drawable/ic_search" android:title="@string/search_menu_label" /> - \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index dc67eb14..4a9a12b6 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -74,6 +74,9 @@ + @font/inter + +