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 80d4a05..558fec5 100644 --- a/app/src/main/java/ru/myitschool/work/ui/RootActivity.kt +++ b/app/src/main/java/ru/myitschool/work/ui/RootActivity.kt @@ -47,7 +47,7 @@ class RootActivity : AppCompatActivity() { fragment() fragment() fragment() - fragment() + } } diff --git a/app/src/main/java/ru/myitschool/work/ui/searchuser/SearchUserFragment.kt b/app/src/main/java/ru/myitschool/work/ui/searchuser/SearchUserFragment.kt index 292b126..7d531e6 100644 --- a/app/src/main/java/ru/myitschool/work/ui/searchuser/SearchUserFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/searchuser/SearchUserFragment.kt @@ -13,7 +13,7 @@ import ru.myitschool.work.R import ru.myitschool.work.databinding.FragmentSearchUserBinding import ru.myitschool.work.ui.entrylist.EntryListFragment import ru.myitschool.work.ui.profile.ProfileDestination -import ru.myitschool.work.ui.userInfo.UserInfoDestination + @AndroidEntryPoint @@ -53,12 +53,7 @@ class SearchUserFragment : Fragment(R.layout.fragment_search_user) { } } is SearchUserViewModel.Action.OpenInfo ->{ - val bundle = Bundle().apply { - putString("username", action.userName) - } - findNavController().navigate(UserInfoDestination) { - popUpTo { inclusive = true } - } + //TODO отобразить инфу о юзере } } diff --git a/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoDestination.kt b/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoDestination.kt deleted file mode 100644 index 777d288..0000000 --- a/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoDestination.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ru.myitschool.work.ui.userInfo - -import kotlinx.serialization.Serializable - -@Serializable -data object UserInfoDestination \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoFragment.kt b/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoFragment.kt deleted file mode 100644 index a2d4840..0000000 --- a/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoFragment.kt +++ /dev/null @@ -1,58 +0,0 @@ -package ru.myitschool.work.ui.userInfo - -import ru.myitschool.work.ui.searchuser.SearchUserViewModel - - - -import android.os.Bundle -import android.view.View -import androidx.fragment.app.Fragment -import androidx.fragment.app.viewModels -import androidx.navigation.fragment.findNavController -import dagger.hilt.android.AndroidEntryPoint -import ru.myitschool.work.R -import ru.myitschool.work.databinding.FragmentSearchUserBinding -import ru.myitschool.work.databinding.FragmentUserInfoBinding -import ru.myitschool.work.ui.profile.ProfileDestination -import ru.myitschool.work.ui.searchuser.SearchUserDestination -import ru.myitschool.work.utils.collectWhenStarted - - -@AndroidEntryPoint -class UserInfoFragment : Fragment(R.layout.fragment_user_info) { - - private var _binding: FragmentUserInfoBinding? = null - private val binding: FragmentUserInfoBinding get() = _binding!! - - - private val viewModel: UserInfoViewModel by viewModels() - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - _binding = FragmentUserInfoBinding.bind(view) - - initCallback() - subscribe() - - } - - private fun initCallback() { - binding.floatingActionButton2.setOnClickListener { viewModel.closeSearchUser() } - } - - private fun subscribe() { - viewModel.action.collectWhenStarted(this) { action -> - when (action) { - is UserInfoViewModel.Action.OpenProfile -> { - findNavController().navigate(SearchUserDestination) { - popUpTo { inclusive = true } - } - } - } - } - } - - -} - - diff --git a/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoViewModel.kt deleted file mode 100644 index 905159a..0000000 --- a/app/src/main/java/ru/myitschool/work/ui/userInfo/UserInfoViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package ru.myitschool.work.ui.userInfo - -import android.content.Context -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import dagger.hilt.android.lifecycle.HiltViewModel -import dagger.hilt.android.qualifiers.ApplicationContext -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.launch -import ru.myitschool.work.utils.MutablePublishFlow -import javax.inject.Inject - -@HiltViewModel -class UserInfoViewModel @Inject constructor( - @ApplicationContext private val context: Context, -) : ViewModel() { - private val _action = MutablePublishFlow() - val action = _action.asSharedFlow() - - fun closeSearchUser(){ - viewModelScope.launch { - _action.emit(Action.OpenProfile) - } - } - sealed interface Action { - data object OpenProfile: Action - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml index 069cc52..03265fa 100644 --- a/app/src/main/res/layout/fragment_user_info.xml +++ b/app/src/main/res/layout/fragment_user_info.xml @@ -4,24 +4,20 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> + - + android:padding="16dp"> + + + +