diff --git a/app/src/main/java/org/futo/circles/feature/circles/setup/SetupCirclesFragment.kt b/app/src/main/java/org/futo/circles/feature/circles/setup/SetupCirclesFragment.kt index 0508ef3504e67a72c3e8445805df54d25a82a110..dfb5646146176e90b2ef255db6983beb8651e168 100644 --- a/app/src/main/java/org/futo/circles/feature/circles/setup/SetupCirclesFragment.kt +++ b/app/src/main/java/org/futo/circles/feature/circles/setup/SetupCirclesFragment.kt @@ -90,6 +90,6 @@ class SetupCirclesFragment : Fragment(R.layout.fragment_setup_circles), HasLoadi } private fun navigateToBottomMenuScreen() { - findNavController().navigate(SetupCirclesFragmentDirections.toBottomNavigationFragment()) + findNavController().navigate(SetupCirclesFragmentDirections.toHomeFragment()) } } \ No newline at end of file diff --git a/app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt b/app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt index 0c81b228adfa2a37c5b114cc604bfdd34466b2c8..90722d9c3910f5b9941496feac43a4fa100f396f 100644 --- a/app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt +++ b/app/src/main/java/org/futo/circles/feature/splash/SplashFragment.kt @@ -12,7 +12,7 @@ class SplashFragment : Fragment(R.layout.fragment_splash) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) val destination = MatrixSessionProvider.currentSession?.let { - SplashFragmentDirections.toBottomNavigationFragment() + SplashFragmentDirections.toHomeFragment() } ?: SplashFragmentDirections.toLogInFragment() findNavController().navigate(destination) diff --git a/app/src/main/res/navigation/nav_graph_start_host.xml b/app/src/main/res/navigation/nav_graph_start_host.xml index 282cd78b559913d4759ec93b51897e474a25135a..ead4e0f1ac1aea3822de10830ce6f465ceb65aa4 100644 --- a/app/src/main/res/navigation/nav_graph_start_host.xml +++ b/app/src/main/res/navigation/nav_graph_start_host.xml @@ -17,14 +17,14 @@ app:popUpTo="@id/splashFragment" app:popUpToInclusive="true" /> <action - android:id="@+id/to_bottomNavigationFragment" - app:destination="@id/bottomNavigationFragment" + android:id="@+id/to_homeFragment" + app:destination="@id/homeFragment" app:popUpTo="@id/splashFragment" app:popUpToInclusive="true" /> </fragment> <fragment - android:id="@+id/bottomNavigationFragment" + android:id="@+id/homeFragment" android:name="org.futo.circles.feature.home.HomeFragment" tools:layout="@layout/fragment_bottom_navigation" /> @@ -34,8 +34,8 @@ android:label="SetupCirclesFragment" tools:layout="@layout/fragment_setup_circles"> <action - android:id="@+id/to_bottomNavigationFragment" - app:destination="@id/bottomNavigationFragment" + android:id="@+id/to_homeFragment" + app:destination="@id/homeFragment" app:popUpTo="@id/setupCirclesFragment" app:popUpToInclusive="true" /> </fragment> diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt index 1fcd5e68d632db90f6ab7869f9305c9bab1b2ce1..494cbf1e85bbf054293f89260809b29fb4089f92 100644 --- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt +++ b/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt @@ -93,7 +93,7 @@ class LogInFragment : Fragment(R.layout.fragment_log_in), HasLoadingState { switchUsersAdapter.submitList(it) } viewModel.navigateToBottomMenuScreenLiveData.observeData(this) { - findNavController().navigate(LogInFragmentDirections.toBottomNavigationFragment()) + findNavController().navigate(LogInFragmentDirections.toHomeFragment()) } } diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/stages/LogInStagesFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/log_in/stages/LogInStagesFragment.kt index 9c08ce1118a59bf5e23a4df18a7b8a488623647c..cf49514dd8afe27d5c485ee9685e450021781f71 100644 --- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/stages/LogInStagesFragment.kt +++ b/auth/src/main/java/org/futo/circles/auth/feature/log_in/stages/LogInStagesFragment.kt @@ -118,7 +118,7 @@ class LogInStagesFragment : Fragment(R.layout.fragment_login_stages), } private fun navigateToBottomMenuFragment() { - findNavController().navigate(LogInStagesFragmentDirections.toBottomNavigationFragment()) + findNavController().navigate(LogInStagesFragmentDirections.toHomeFragment()) } private fun navigateToSetupCircles() { diff --git a/auth/src/main/res/navigation/nav_graph_auth.xml b/auth/src/main/res/navigation/nav_graph_auth.xml index faddf293f1e1cbe4c7975cf87f25f5234ce34b2d..9555053249e0be37a36b757ab558d68eb36447ad 100644 --- a/auth/src/main/res/navigation/nav_graph_auth.xml +++ b/auth/src/main/res/navigation/nav_graph_auth.xml @@ -17,8 +17,8 @@ android:id="@+id/to_loginStagesFragment" app:destination="@id/loginStagesFragment" /> <action - android:id="@+id/to_bottomNavigationFragment" - app:destination="@id/bottomNavigationFragment" + android:id="@+id/to_homeFragment" + app:destination="@id/homeFragment" app:popUpTo="@id/logInFragment" app:popUpToInclusive="true" /> </fragment> @@ -28,8 +28,8 @@ tools:layout="@layout/fragment_login_stages"> <action - android:id="@+id/to_bottomNavigationFragment" - app:destination="@id/bottomNavigationFragment" + android:id="@+id/to_homeFragment" + app:destination="@id/homeFragment" app:popUpTo="@id/logInFragment" app:popUpToInclusive="true" /> <action diff --git a/auth/src/main/res/values/ids.xml b/auth/src/main/res/values/ids.xml index e37603209e778293e1420d0a2cac5ac768121417..a3af135fe696c984e82c231d67b9955a9ccac20f 100644 --- a/auth/src/main/res/values/ids.xml +++ b/auth/src/main/res/values/ids.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <item name="bottomNavigationFragment" type="id" /> + <item name="homeFragment" type="id" /> <item name="setupCirclesFragment" type="id" /> </resources> \ No newline at end of file