Merge pull request #4 from Velord/develop

Refactor: more readable naming
Velord · Dec 11, 2023 · 2ee2f86 · 2ee2f86
2 parents 6043a79 + 6f00151
commit 2ee2f86
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 47 deletions.
diff --git a/...elord/composemultiplebackstackdemo/ui/main/bottomNavigation/center/CenterGraphFragment.kt b/...elord/composemultiplebackstackdemo/ui/main/bottomNavigation/center/CenterGraphFragment.kt
@@ -18,7 +18,7 @@ class CenterGraphFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View = setContentWithTheme {
         AddNewScreen(R.string.add_new_screen_center) {
-            findNavController().navigate(R.id.toInDevelopmentFragment)
+            findNavController().navigate(R.id.toInDevelopmentFragmentFromCenterGraphFragment)
         }
     }
 }
diff --git a/...om/velord/composemultiplebackstackdemo/ui/main/bottomNavigation/left/LeftGraphFragment.kt b/...om/velord/composemultiplebackstackdemo/ui/main/bottomNavigation/left/LeftGraphFragment.kt
@@ -18,7 +18,7 @@ class LeftGraphFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View = setContentWithTheme {
         AddNewScreen(R.string.add_new_screen_left) {
-            findNavController().navigate(R.id.toInDevelopmentFragment)
+            findNavController().navigate(R.id.toInDevelopmentFragmentFromLeftGraphFragment)
         }
     }
 }
diff --git a/.../velord/composemultiplebackstackdemo/ui/main/bottomNavigation/right/RightGraphFragment.kt b/.../velord/composemultiplebackstackdemo/ui/main/bottomNavigation/right/RightGraphFragment.kt
@@ -18,7 +18,7 @@ class RightGraphFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View = setContentWithTheme {
         AddNewScreen(R.string.add_new_screen_right) {
-            findNavController().navigate(R.id.toInDevelopmentFragment)
+            findNavController().navigate(R.id.toInDevelopmentFragmentFromRightGraphFragment)
         }
     }
 }
diff --git a/...c/main/java/com/velord/composemultiplebackstackdemo/ui/main/inDevelopment/TestFragment.kt b/...c/main/java/com/velord/composemultiplebackstackdemo/ui/main/inDevelopment/TestFragment.kt
diff --git a/...in/inDevelopment/InDevelopmentFragment.kt → ...ckdemo/ui/main/overlay/OverlayFragment.kt b/...in/inDevelopment/InDevelopmentFragment.kt → ...ckdemo/ui/main/overlay/OverlayFragment.kt
@@ -1,4 +1,4 @@
-package com.velord.composemultiplebackstackdemo.ui.main.inDevelopment
+package com.velord.composemultiplebackstackdemo.ui.main.overlay
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -24,16 +24,16 @@ import com.velord.composemultiplebackstackdemo.ui.utils.activityNavController
 import com.velord.composemultiplebackstackdemo.ui.utils.viewLifecycleScope
 import kotlinx.coroutines.launch
 
-class InDevelopmentFragment : Fragment() {
+class OverlayFragment : Fragment() {
 
-    private val viewModel by viewModels<InDevelopmentViewModel>()
+    private val viewModel by viewModels<OverlayViewModel>()
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View = setContentWithTheme {
-        InDevelopmentScreen(viewModel)
+        OverlayScreen(viewModel)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -51,7 +51,7 @@ class InDevelopmentFragment : Fragment() {
 }
 
 @Composable
-private fun InDevelopmentScreen(viewModel: InDevelopmentViewModel) {
+private fun OverlayScreen(viewModel: OverlayViewModel) {
     val time = remember { System.currentTimeMillis().toString() }
     Box(Modifier.fillMaxSize()) {
         Text(
@@ -71,6 +71,6 @@ private fun InDevelopmentScreen(viewModel: InDevelopmentViewModel) {
 
 @Preview
 @Composable
-private fun InDevelopmentScreenPreview() {
-    InDevelopmentScreen(InDevelopmentViewModel())
+private fun OverlayScreenPreview() {
+    OverlayScreen(OverlayViewModel())
 }
diff --git a/...n/inDevelopment/InDevelopmentViewModel.kt → ...kdemo/ui/main/overlay/OverlayViewModel.kt b/...n/inDevelopment/InDevelopmentViewModel.kt → ...kdemo/ui/main/overlay/OverlayViewModel.kt
@@ -1,4 +1,4 @@
-package com.velord.composemultiplebackstackdemo.ui.main.inDevelopment
+package com.velord.composemultiplebackstackdemo.ui.main.overlay
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -7,7 +7,7 @@ import com.velord.composemultiplebackstackdemo.ui.navigation.NavigationData
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 
-class InDevelopmentViewModel : ViewModel() {
+class OverlayViewModel : ViewModel() {
 
     val navigationEvent = MutableSharedFlow<NavigationData>()
 

diff --git a/app/src/main/res/navigation/center_nav_graph.xml b/app/src/main/res/navigation/center_nav_graph.xml
@@ -10,13 +10,13 @@
         android:label="CenterGraphFragment" >
 
         <action
-            android:id="@+id/toInDevelopmentFragment"
+            android:id="@+id/toInDevelopmentFragmentFromCenterGraphFragment"
             app:destination="@id/inDevelopmentFragment"/>
     </fragment>
 
     <fragment
         android:id="@+id/inDevelopmentFragment"
-        android:name="com.velord.composemultiplebackstackdemo.ui.main.inDevelopment.InDevelopmentFragment"
+        android:name="com.velord.composemultiplebackstackdemo.ui.main.overlay.OverlayFragment"
         android:label="InDevelopmentFragment" />
 
 </navigation>
diff --git a/app/src/main/res/navigation/left_nav_graph.xml b/app/src/main/res/navigation/left_nav_graph.xml
@@ -10,7 +10,7 @@
         android:label="LeftGraphFragment" >
 
         <action
-            android:id="@+id/toInDevelopmentFragment"
+            android:id="@+id/toInDevelopmentFragmentFromLeftGraphFragment"
             app:destination="@id/inDevelopmentFragment"
             app:enterAnim="@anim/slide_in_up"
             app:popExitAnim="@anim/slide_in_down"
@@ -20,7 +20,7 @@
 
     <fragment
         android:id="@+id/inDevelopmentFragment"
-        android:name="com.velord.composemultiplebackstackdemo.ui.main.inDevelopment.InDevelopmentFragment"
+        android:name="com.velord.composemultiplebackstackdemo.ui.main.overlay.OverlayFragment"
         android:label="InDevelopmentFragment" />
 
 </navigation>
diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
@@ -8,17 +8,16 @@
     <fragment
         android:id="@+id/bottomNavFragment"
         android:name="com.velord.composemultiplebackstackdemo.ui.main.bottomNavigation.BottomNavFragment"
-        android:label="BottomNavFragment">
-
-        <action
-            android:id="@+id/toInDevelopmentFragment"
-            app:destination="@id/inDevelopmentFragment"
-            />
-    </fragment>
+        android:label="BottomNavFragment"/>
 
     <fragment
         android:id="@+id/inDevelopmentFragment"
-        android:name="com.velord.composemultiplebackstackdemo.ui.main.inDevelopment.InDevelopmentFragment"
+        android:name="com.velord.composemultiplebackstackdemo.ui.main.overlay.OverlayFragment"
         android:label="InDevelopmentFragment" />
 
+    <action
+        android:id="@+id/toInDevelopmentFragment"
+        app:destination="@id/inDevelopmentFragment"
+        />
+
 </navigation>
diff --git a/app/src/main/res/navigation/right_nav_graph.xml b/app/src/main/res/navigation/right_nav_graph.xml
@@ -10,13 +10,13 @@
         android:label="RightGraphFragment" >
 
         <action
-            android:id="@+id/toInDevelopmentFragment"
+            android:id="@+id/toInDevelopmentFragmentFromRightGraphFragment"
             app:destination="@id/inDevelopmentFragment" />
     </fragment>
 
     <fragment
         android:id="@+id/inDevelopmentFragment"
-        android:name="com.velord.composemultiplebackstackdemo.ui.main.inDevelopment.InDevelopmentFragment"
+        android:name="com.velord.composemultiplebackstackdemo.ui.main.overlay.OverlayFragment"
         android:label="InDevelopmentFragment" />
 
 </navigation>