mirror of
https://github.com/antebudimir/tempus.git
synced 2026-01-01 01:53:31 +00:00
Removed the Listen Now sector (for now)
This commit is contained in:
parent
67803b9149
commit
b70819c337
2 changed files with 31 additions and 68 deletions
|
|
@ -51,7 +51,6 @@ public class HomeFragment extends Fragment {
|
||||||
homeViewModel = new ViewModelProvider(requireActivity()).get(HomeViewModel.class);
|
homeViewModel = new ViewModelProvider(requireActivity()).get(HomeViewModel.class);
|
||||||
|
|
||||||
init();
|
init();
|
||||||
initListenNowBar();
|
|
||||||
|
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
@ -112,10 +111,6 @@ public class HomeFragment extends Fragment {
|
||||||
bundle.putString(Song.DOWNLOADED, Song.DOWNLOADED);
|
bundle.putString(Song.DOWNLOADED, Song.DOWNLOADED);
|
||||||
activity.navController.navigate(R.id.action_homeFragment_to_songListPageFragment, bundle);
|
activity.navController.navigate(R.id.action_homeFragment_to_songListPageFragment, bundle);
|
||||||
});
|
});
|
||||||
}
|
|
||||||
|
|
||||||
private void initListenNowBar() {
|
|
||||||
bind.homeDateLabel.setText(Util.getDate());
|
|
||||||
|
|
||||||
bind.homeSettingsImageView.setOnClickListener(v -> activity.navController.navigate(R.id.action_homeFragment_to_settingsFragment));
|
bind.homeSettingsImageView.setOnClickListener(v -> activity.navController.navigate(R.id.action_homeFragment_to_settingsFragment));
|
||||||
}
|
}
|
||||||
|
|
@ -229,7 +224,6 @@ public class HomeFragment extends Fragment {
|
||||||
public void reorder() {
|
public void reorder() {
|
||||||
if(bind != null) {
|
if(bind != null) {
|
||||||
bind.homeLinearLayoutContainer.removeAllViews();
|
bind.homeLinearLayoutContainer.removeAllViews();
|
||||||
bind.homeLinearLayoutContainer.addView(bind.listenNowSector);
|
|
||||||
bind.homeLinearLayoutContainer.addView(bind.homeDiscoverSector);
|
bind.homeLinearLayoutContainer.addView(bind.homeDiscoverSector);
|
||||||
bind.homeLinearLayoutContainer.addView(bind.homeRecentlyAddedTracksSector);
|
bind.homeLinearLayoutContainer.addView(bind.homeRecentlyAddedTracksSector);
|
||||||
bind.homeLinearLayoutContainer.addView(bind.homeFlashbackSector);
|
bind.homeLinearLayoutContainer.addView(bind.homeFlashbackSector);
|
||||||
|
|
|
||||||
|
|
@ -12,62 +12,6 @@
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:paddingBottom="@dimen/global_padding_bottom">
|
android:paddingBottom="@dimen/global_padding_bottom">
|
||||||
|
|
||||||
<!-- For you -->
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
android:id="@+id/listen_now_sector"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:clipChildren="false">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/home_date_label"
|
|
||||||
style="@style/SubheadTextView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:includeFontPadding="false"
|
|
||||||
android:paddingStart="16dp"
|
|
||||||
android:paddingTop="20dp"
|
|
||||||
android:paddingEnd="16dp"
|
|
||||||
android:text="@string/label_placeholder"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/home_listen_now_label"
|
|
||||||
style="@style/MainTitleTextView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:includeFontPadding="false"
|
|
||||||
android:paddingStart="16dp"
|
|
||||||
android:paddingEnd="16dp"
|
|
||||||
android:text="Listen now"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/home_date_label" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/home_settings_image_view"
|
|
||||||
android:layout_width="22dp"
|
|
||||||
android:layout_height="22dp"
|
|
||||||
android:layout_marginStart="8dp"
|
|
||||||
android:layout_marginEnd="16dp"
|
|
||||||
android:layout_marginBottom="8dp"
|
|
||||||
android:background="@drawable/ic_settings"
|
|
||||||
android:backgroundTint="@color/bottomNavIconColor"
|
|
||||||
android:foreground="?android:attr/selectableItemBackgroundBorderless"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/home_listen_now_label"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/home_top_title_divider"
|
|
||||||
style="@style/Divider"
|
|
||||||
android:layout_marginStart="18dp"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:layout_marginEnd="18dp"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/home_listen_now_label" />
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
|
|
||||||
<!-- Discover music -->
|
<!-- Discover music -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/home_discover_sector"
|
android:id="@+id/home_discover_sector"
|
||||||
|
|
@ -75,14 +19,39 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<!-- Label and button -->
|
||||||
style="@style/HeadlineTextView"
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingStart="16dp"
|
android:orientation="horizontal"
|
||||||
android:paddingTop="16dp"
|
android:paddingStart="8dp"
|
||||||
android:paddingEnd="16dp"
|
android:paddingTop="8dp"
|
||||||
android:text="Music discovery" />
|
android:paddingEnd="8dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
style="@style/HeadlineTextView"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:paddingStart="8dp"
|
||||||
|
android:paddingTop="12dp"
|
||||||
|
android:paddingEnd="8dp"
|
||||||
|
android:text="Music discovery" />
|
||||||
|
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/home_settings_image_view"
|
||||||
|
android:layout_width="22dp"
|
||||||
|
android:layout_height="22dp"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:layout_marginStart="8dp"
|
||||||
|
android:layout_marginEnd="8dp"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:background="@drawable/ic_settings"
|
||||||
|
android:backgroundTint="@color/bottomNavIconColor"
|
||||||
|
android:foreground="?android:attr/selectableItemBackgroundBorderless" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<!-- slideview -->
|
<!-- slideview -->
|
||||||
<androidx.viewpager2.widget.ViewPager2
|
<androidx.viewpager2.widget.ViewPager2
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue