Use NavDirections for Fragment newInstance args

ricknout · Mar 9, 2019 · cb0ed51 · cb0ed51
1 parent 8d3af95
commit cb0ed51
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/live/src/main/java/com/ricknout/rugbyranker/live/ui/LiveMatchesFragment.kt b/live/src/main/java/com/ricknout/rugbyranker/live/ui/LiveMatchesFragment.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.app.ActivityCompat
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
@@ -17,6 +16,7 @@ import com.google.android.material.snackbar.Snackbar
 import com.ricknout.rugbyranker.core.livedata.EventObserver
 import com.ricknout.rugbyranker.core.util.doIfVisibleToUser
 import com.ricknout.rugbyranker.core.vo.Sport
+import com.ricknout.rugbyranker.live.NavGraphLiveDirections
 import com.ricknout.rugbyranker.live.R
 import com.ricknout.rugbyranker.matches.ui.WorldRugbyMatchSpaceItemDecoration
 import com.ricknout.rugbyranker.matches.ui.WorldRugbyMatchListAdapter
@@ -116,10 +116,9 @@ class LiveMatchesFragment : DaggerFragment() {
 
     companion object {
         const val TAG = "LiveMatchesFragment"
-        private const val ARG_SPORT = "sport"
         fun newInstance(sport: Sport): LiveMatchesFragment {
             val matchesFragment = LiveMatchesFragment()
-            matchesFragment.arguments = bundleOf(ARG_SPORT to sport)
+            matchesFragment.arguments = NavGraphLiveDirections.liveMatchesFragmentAction(sport).arguments
             return matchesFragment
         }
     }

diff --git a/live/src/main/res/navigation/nav_graph_live.xml b/live/src/main/res/navigation/nav_graph_live.xml
@@ -22,4 +22,9 @@
         <argument android:name="sport" android:defaultValue="WOMENS" app:argType="com.ricknout.rugbyranker.core.vo.Sport" />
     </fragment>
 
+    <action
+        android:id="@+id/liveMatchesFragmentAction">
+        <argument android:name="sport" app:argType="com.ricknout.rugbyranker.core.vo.Sport" />
+    </action>
+
 </navigation>
diff --git a/matches/src/main/java/com/ricknout/rugbyranker/matches/ui/MatchesFragment.kt b/matches/src/main/java/com/ricknout/rugbyranker/matches/ui/MatchesFragment.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.app.ActivityCompat
-import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
@@ -20,6 +19,7 @@ import com.ricknout.rugbyranker.matches.R
 import com.ricknout.rugbyranker.core.util.doIfVisibleToUser
 import com.ricknout.rugbyranker.matches.vo.MatchStatus
 import com.ricknout.rugbyranker.core.vo.Sport
+import com.ricknout.rugbyranker.matches.NavGraphMatchesDirections
 import dagger.android.support.DaggerFragment
 import javax.inject.Inject
 import kotlinx.android.synthetic.main.fragment_matches.*
@@ -138,11 +138,9 @@ class MatchesFragment : DaggerFragment() {
 
     companion object {
         const val TAG = "MatchesFragment"
-        private const val ARG_SPORT = "sport"
-        private const val ARG_MATCH_STATUS = "matchStatus"
         fun newInstance(sport: Sport, matchStatus: MatchStatus): MatchesFragment {
             val matchesFragment = MatchesFragment()
-            matchesFragment.arguments = bundleOf(ARG_SPORT to sport, ARG_MATCH_STATUS to matchStatus)
+            matchesFragment.arguments = NavGraphMatchesDirections.matchesFragmentAction(sport, matchStatus).arguments
             return matchesFragment
         }
     }

diff --git a/matches/src/main/res/navigation/nav_graph_matches.xml b/matches/src/main/res/navigation/nav_graph_matches.xml
@@ -42,4 +42,10 @@
         <argument android:name="matchStatus" android:defaultValue="COMPLETE" app:argType="com.ricknout.rugbyranker.matches.vo.MatchStatus" />
     </fragment>
 
+    <action
+        android:id="@+id/matchesFragmentAction">
+        <argument android:name="sport" app:argType="com.ricknout.rugbyranker.core.vo.Sport" />
+        <argument android:name="matchStatus" app:argType="com.ricknout.rugbyranker.matches.vo.MatchStatus" />
+    </action>
+
 </navigation>
diff --git a/rankings/src/main/java/com/ricknout/rugbyranker/rankings/ui/RankingsFragment.kt b/rankings/src/main/java/com/ricknout/rugbyranker/rankings/ui/RankingsFragment.kt
@@ -12,7 +12,6 @@ import com.ricknout.rugbyranker.rankings.R
 import dagger.android.support.DaggerFragment
 import javax.inject.Inject
 import androidx.core.view.isVisible
-import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -22,6 +21,7 @@ import com.google.android.material.snackbar.Snackbar
 import com.ricknout.rugbyranker.core.livedata.EventObserver
 import com.ricknout.rugbyranker.core.util.doIfVisibleToUser
 import com.ricknout.rugbyranker.core.vo.Sport
+import com.ricknout.rugbyranker.rankings.NavGraphRankingsDirections
 import kotlinx.android.synthetic.main.fragment_rankings.*
 
 class RankingsFragment : DaggerFragment() {
@@ -122,10 +122,9 @@ class RankingsFragment : DaggerFragment() {
 
     companion object {
         const val TAG = "RankingsFragment"
-        private const val ARG_SPORT = "sport"
         fun newInstance(sport: Sport): RankingsFragment {
             val rankingsFragment = RankingsFragment()
-            rankingsFragment.arguments = bundleOf(ARG_SPORT to sport)
+            rankingsFragment.arguments = NavGraphRankingsDirections.rankingsFragmentAction(sport).arguments
             return rankingsFragment
         }
     }

diff --git a/rankings/src/main/res/navigation/nav_graph_rankings.xml b/rankings/src/main/res/navigation/nav_graph_rankings.xml
@@ -22,4 +22,9 @@
         <argument android:name="sport" android:defaultValue="WOMENS" app:argType="com.ricknout.rugbyranker.core.vo.Sport" />
     </fragment>
 
+    <action
+        android:id="@+id/rankingsFragmentAction">
+        <argument android:name="sport" app:argType="com.ricknout.rugbyranker.core.vo.Sport" />
+    </action>
+
 </navigation>