Updated code
Added Fragment options Renamed Interfaces Rolled back to previous implementaion for Now playing to handle backpress
This commit is contained in:
parent
7c0b3ee82c
commit
3f368e186b
45 changed files with 274 additions and 457 deletions
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/playerFragmentContainer"
|
||||
android:name="androidx.navigation.fragment.NavHostFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:defaultNavHost="true"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:navGraph="@navigation/now_playing" />
|
|
@ -21,9 +21,8 @@
|
|||
app:behavior_peekHeight="0dp"
|
||||
app:layout_behavior="code.name.monkey.retromusic.RetroBottomSheetBehavior">
|
||||
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
<FrameLayout
|
||||
android:id="@+id/playerFragmentContainer"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.NowPlayingPlayerFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
|
|
|
@ -90,6 +90,7 @@
|
|||
<menu></menu>
|
||||
</item>
|
||||
<item
|
||||
android:orderInCategory="10"
|
||||
android:id="@+id/action_settings"
|
||||
android:icon="@drawable/ic_settings"
|
||||
android:title="@string/action_settings"
|
||||
|
|
|
@ -1,165 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/now_playing"
|
||||
app:startDestination="@id/mainPlayerFragment">
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_player"
|
||||
android:id="@+id/playerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerFragment"
|
||||
android:label="PlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_adaptive_player"
|
||||
android:id="@+id/adaptiveFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment"
|
||||
android:label="AdaptiveFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_blur"
|
||||
android:id="@+id/blurPlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlayerFragment"
|
||||
android:label="BlurPlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_card_blur_player"
|
||||
android:id="@+id/cardBlurFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurFragment"
|
||||
android:label="CardBlurFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_card_player"
|
||||
android:id="@+id/cardFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.card.CardFragment"
|
||||
android:label="CardFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_circle_player"
|
||||
android:id="@+id/circlePlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.circle.CirclePlayerFragment"
|
||||
android:label="CirclePlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_classic_player"
|
||||
android:id="@+id/classicPlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.classic.ClassicPlayerFragment"
|
||||
android:label="ClassicPlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_color_player"
|
||||
android:id="@+id/colorFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.color.ColorFragment"
|
||||
android:label="ColorFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_fit"
|
||||
android:id="@+id/fitFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.fit.FitFragment"
|
||||
android:label="FitFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_flat_player"
|
||||
android:id="@+id/flatPlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlayerFragment"
|
||||
android:label="FlatPlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_full"
|
||||
android:id="@+id/fullPlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.full.FullPlayerFragment"
|
||||
android:label="FullPlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_gradient_player"
|
||||
android:id="@+id/gradientPlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.gradient.GradientPlayerFragment"
|
||||
android:label="GradientPlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_material"
|
||||
android:id="@+id/materialFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.material.MaterialFragment"
|
||||
android:label="MaterialFragment" />
|
||||
|
||||
<fragment
|
||||
android:id="@+id/peakPlayerFragment"
|
||||
tools:layout="@layout/fragment_peak_player"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.peak.PeakPlayerFragment"
|
||||
android:label="PeakPlayerFragment" />
|
||||
|
||||
<fragment
|
||||
android:id="@+id/plainPlayerFragment"
|
||||
tools:layout="@layout/fragment_plain_player"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment"
|
||||
android:label="PlainPlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_simple_player"
|
||||
android:id="@+id/simplePlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment"
|
||||
android:label="SimplePlayerFragment" />
|
||||
|
||||
<fragment
|
||||
tools:layout="@layout/fragment_tiny_player"
|
||||
android:id="@+id/tinyPlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment"
|
||||
android:label="TinyPlayerFragment" />
|
||||
|
||||
<fragment
|
||||
android:id="@+id/mainPlayerFragment"
|
||||
android:name="code.name.monkey.retromusic.fragments.player.NowPlayingPlayerFragment"
|
||||
android:label="MainPlayerFragment">
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_adaptiveFragment"
|
||||
app:destination="@id/adaptiveFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_cardBlurFragment"
|
||||
app:destination="@id/cardBlurFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_circlePlayerFragment"
|
||||
app:destination="@id/circlePlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_blurPlayerFragment"
|
||||
app:destination="@id/blurPlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_classicPlayerFragment"
|
||||
app:destination="@id/classicPlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_plainPlayerFragment"
|
||||
app:destination="@id/plainPlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_flatPlayerFragment"
|
||||
app:destination="@id/flatPlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_gradientPlayerFragment"
|
||||
app:destination="@id/gradientPlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_cardFragment"
|
||||
app:destination="@id/cardFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_fitFragment"
|
||||
app:destination="@id/fitFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_simplePlayerFragment"
|
||||
app:destination="@id/simplePlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_fullPlayerFragment"
|
||||
app:destination="@id/fullPlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_colorFragment"
|
||||
app:destination="@id/colorFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_peakPlayerFragment"
|
||||
app:destination="@id/peakPlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_tinyPlayerFragment"
|
||||
app:destination="@id/tinyPlayerFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayerFragment_to_materialFragment"
|
||||
app:destination="@id/materialFragment" />
|
||||
<action
|
||||
android:id="@+id/action_mainPlayer_to_playerFragment"
|
||||
app:destination="@id/playerFragment" />
|
||||
</fragment>
|
||||
</navigation>
|
Loading…
Add table
Add a link
Reference in a new issue