diff --git a/app/src/main/java/ru/myitschool/work/ui/RootActivity.kt b/app/src/main/java/ru/myitschool/work/ui/RootActivity.kt index 715ce0f..2581628 100644 --- a/app/src/main/java/ru/myitschool/work/ui/RootActivity.kt +++ b/app/src/main/java/ru/myitschool/work/ui/RootActivity.kt @@ -2,12 +2,14 @@ package ru.myitschool.work.ui import android.annotation.SuppressLint import android.os.Bundle +import android.util.Log import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.navigation.createGraph import androidx.navigation.findNavController import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.fragment +import com.google.android.material.bottomnavigation.BottomNavigationView import dagger.hilt.android.AndroidEntryPoint import ru.myitschool.work.R import ru.myitschool.work.ui.login.LoginDestination @@ -30,21 +32,20 @@ class RootActivity : AppCompatActivity() { val navController = navHostFragment?.navController ?: throw IllegalStateException("NavHostFragment not found") + val bottomNavigationView = findViewById(R.id.bottom_navigation) - navController.setGraph(R.navigation.main_nav_graph) - navController.navigate(R.id.fragment_profile) - /*if (userRole == "ROLE_ADMIN") { - //bottomNavigationView.menu.clear() - //bottomNavigationView.inflateMenu(R.menu.bottom_menu_admin) - navController.setGraph(R.navigation.main_admin_nav_graph) - - } else { + //navController.setGraph(R.navigation.main_nav_graph) + //navController.navigate(R.id.fragment_profile) + Log.d("role", "$userRole") + if (userRole == "ROLE_ADMIN") { navController.setGraph(R.navigation.main_nav_graph) navController.navigate(R.id.fragment_profile) - }*/ - - + } else { + navController.setGraph(R.navigation.main_nav_graph) + bottomNavigationView.menu.clear() + navController.navigate(R.id.fragment_profile) + } diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt index bfea954..fe19dd9 100644 --- a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt @@ -6,6 +6,7 @@ import android.util.Log import android.view.View import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels +import androidx.navigation.fragment.findNavController import com.squareup.picasso.Picasso import ru.myitschool.work.R import ru.myitschool.work.databinding.FragmentProfileBinding @@ -34,12 +35,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { requireActivity().finish() } viewBinding.qrScan.setOnClickListener{ - val qrScanFragment = QrScanFragment() - val fragmentManager = parentFragmentManager - val fragmentTransaction = fragmentManager.beginTransaction() - fragmentTransaction.replace(R.id.fragment_container, qrScanFragment) - fragmentTransaction.addToBackStack(null) - fragmentTransaction.commit() + findNavController().navigate(R.id.action_fragment_profile_to_fragment_qr) } val adapter = EntranceAdapter() viewBinding.recyclerView.adapter = adapter diff --git a/app/src/main/res/drawable/ic_users.xml b/app/src/main/res/drawable/ic_users.xml new file mode 100644 index 0000000..b1036ce --- /dev/null +++ b/app/src/main/res/drawable/ic_users.xml @@ -0,0 +1,48 @@ + + + + + + + + diff --git a/app/src/main/res/layout/activity_root.xml b/app/src/main/res/layout/activity_root.xml index e7cb1a9..cfc3c95 100644 --- a/app/src/main/res/layout/activity_root.xml +++ b/app/src/main/res/layout/activity_root.xml @@ -10,4 +10,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:defaultNavHost="true" /> + + \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_menu_admin.xml b/app/src/main/res/menu/bottom_menu_admin.xml new file mode 100644 index 0000000..16c1246 --- /dev/null +++ b/app/src/main/res/menu/bottom_menu_admin.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/main_admin_nav_graph.xml b/app/src/main/res/navigation/main_admin_nav_graph.xml index e29571c..2722098 100644 --- a/app/src/main/res/navigation/main_admin_nav_graph.xml +++ b/app/src/main/res/navigation/main_admin_nav_graph.xml @@ -1,17 +1,39 @@ - + android:id="@+id/fragment_profile" + android:name="ru.myitschool.work.ui.profile.ProfileFragment" + android:label="Profile" + tools:layout="@layout/fragment_profile"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cd87143..e70158b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,4 +16,6 @@ Успешно Что-то пошло не так Вход был отменён + Профиль + Просмотр пользователя \ No newline at end of file