From 29fe19bc63e699a2321c28424fa306061873d757 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Wed, 14 Jun 2023 18:47:50 +0300
Subject: [PATCH] Rename to home fragment
---
.../feature/circles/setup/SetupCirclesFragment.kt | 2 +-
.../org/futo/circles/feature/splash/SplashFragment.kt | 2 +-
app/src/main/res/navigation/nav_graph_start_host.xml | 10 +++++-----
.../futo/circles/auth/feature/log_in/LogInFragment.kt | 2 +-
.../auth/feature/log_in/stages/LogInStagesFragment.kt | 2 +-
auth/src/main/res/navigation/nav_graph_auth.xml | 8 ++++----
auth/src/main/res/values/ids.xml | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
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 0508ef350..dfb564614 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 0c81b228a..90722d9c3 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 282cd78b5..ead4e0f1a 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 1fcd5e68d..494cbf1e8 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 9c08ce111..cf49514dd 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 faddf293f..955505324 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 e37603209..a3af135fe 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
--
GitLab