diff --git a/app/src/main/java/ru/myitschool/work/ui/admin/AdminDestination.kt b/app/src/main/java/ru/myitschool/work/ui/admin/AdminDestination.kt index 703625f..3b0c8d1 100644 --- a/app/src/main/java/ru/myitschool/work/ui/admin/AdminDestination.kt +++ b/app/src/main/java/ru/myitschool/work/ui/admin/AdminDestination.kt @@ -2,4 +2,4 @@ package ru.myitschool.work.ui.admin import kotlinx.serialization.Serializable @Serializable -data object AdminDestination \ No newline at end of file +data class AdminDestination(val username: String) \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt b/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt index 45dec00..ced9de4 100644 --- a/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt @@ -5,13 +5,17 @@ import android.view.View import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController +import androidx.navigation.toRoute import com.squareup.picasso.Picasso import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import ru.myitschool.work.R import ru.myitschool.work.databinding.FragmentAdminBinding +import ru.myitschool.work.ui.login.LoginDestination import ru.myitschool.work.ui.main.MainDestination +import ru.myitschool.work.ui.qr.result.QrResultDestination +import ru.myitschool.work.ui.qr.scan.QrScanDestination import ru.myitschool.work.utils.collectWhenStarted import ru.myitschool.work.utils.TextChangedListener @@ -27,10 +31,25 @@ class AdminFragment : Fragment(R.layout.fragment_admin) { super.onViewCreated(view, savedInstanceState) _binding = FragmentAdminBinding.bind(view) - binding.loginadmin.addTextChangedListener(TextChangedListener { viewModel.onUsernameChanged(it) }) - subscribe() - binding.find.setOnClickListener { - login(binding.loginadmin.text.toString()) + + val username = + findNavController().currentBackStackEntry?.toRoute()?.username + username?.let { user -> + + binding.loginadmin.addTextChangedListener(TextChangedListener { + viewModel.onUsernameChanged(it) + }) + subscribe() + binding.adminName.text = user + binding.find.setOnClickListener { + login(binding.loginadmin.text.toString()) + } + binding.backAdmin.setOnClickListener{ + findNavController().apply { + popBackStack(true) + navigate(MainDestination(user)) + } + } } } diff --git a/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt b/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt index a86f8a1..ee4deca 100644 --- a/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt @@ -44,7 +44,7 @@ class MainFragment: Fragment(R.layout.fragment_main) { findNavController().navigate(QrScanDestination) } binding.admin.setOnClickListener{ - findNavController().navigate(AdminDestination) + findNavController().navigate(AdminDestination(user)) } } subscribe() diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index e419363..fae1ae7 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -6,15 +6,16 @@ android:layout_height="match_parent"> + app:layout_constraintVertical_bias="0.089" />