From 9925b374222cd7336c14cd4710b1b67a936761f3 Mon Sep 17 00:00:00 2001 From: v228a Date: Wed, 19 Feb 2025 14:52:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=D0=B8=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=20=D0=B1=D0=B5?= =?UTF-8?q?=D0=BA=D0=B5=D0=BD=D0=B4=D0=B0,=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BA=D1=80=D0=B0=D1=88=20?= =?UTF-8?q?=D1=81=D0=BE=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 - .../java/ru/myitschool/work/core/Constants.kt | 4 ++-- .../work/ui/entrylist/EntryListFragment.kt | 22 +++++++++---------- .../work/ui/entrylist/EntryListViewModel.kt | 6 ++--- .../work/ui/profile/ProfileFragment.kt | 1 + 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9c7afac..0599e1a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,6 @@ android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:usesCleartextTraffic="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.UiTemplate" diff --git a/app/src/main/java/ru/myitschool/work/core/Constants.kt b/app/src/main/java/ru/myitschool/work/core/Constants.kt index d3fcf1e..1d66ffb 100644 --- a/app/src/main/java/ru/myitschool/work/core/Constants.kt +++ b/app/src/main/java/ru/myitschool/work/core/Constants.kt @@ -1,6 +1,6 @@ package ru.myitschool.work.core object Constants { - const val SERVER_ADDRESS = "http://10.0.2.2:8080" -// const val SERVER_ADDRESS = "https://nto.den4iksop.org" +// const val SERVER_ADDRESS = "http://10.0.2.2:8080" + const val SERVER_ADDRESS = "https://nto.den4iksop.org" } \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt index 09fd6a5..356f95e 100644 --- a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt @@ -2,11 +2,13 @@ package ru.myitschool.work.ui.entrylist import androidx.fragment.app.viewModels import android.os.Bundle +import android.util.Log import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.navigation.fragment.findNavController +import dagger.hilt.android.AndroidEntryPoint import ru.myitschool.work.R import ru.myitschool.work.databinding.FragmentEntryListBinding import ru.myitschool.work.databinding.FragmentLoginBinding @@ -15,7 +17,7 @@ import ru.myitschool.work.ui.login.LoginViewModel import ru.myitschool.work.ui.profile.ProfileDestination import ru.myitschool.work.ui.profile.ProfileViewModel import ru.myitschool.work.utils.collectWhenStarted - +@AndroidEntryPoint class EntryListFragment : Fragment(R.layout.fragment_entry_list) { private var _binding: FragmentEntryListBinding? = null @@ -34,17 +36,15 @@ class EntryListFragment : Fragment(R.layout.fragment_entry_list) { binding.floatingActionButton2.setOnClickListener { viewModel.closeEntryList() } } - private fun subscribe(){ - viewModel.action.collectWhenStarted(this){ action -> - when(action) { - is EntryListViewModel.Action.OpenProfile -> { - findNavController().navigate(LoginDestination) { - popUpTo { inclusive = true } + private fun subscribe() { + viewModel.action.collectWhenStarted(this) { action -> + when (action) { + is EntryListViewModel.Action.OpenProfile -> { + findNavController().navigate(LoginDestination) { + popUpTo { inclusive = true } + } } } } - } - - } -} \ No newline at end of file + } \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt index 538a891..69fb288 100644 --- a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt @@ -25,8 +25,8 @@ class EntryListViewModel @Inject constructor( private val _action = MutablePublishFlow() val action = _action.asSharedFlow() - private val _state = MutableStateFlow(initialState) - val state = _state.asStateFlow() +// private val _state = MutableStateFlow(initialState) +// val state = _state.asStateFlow() fun closeEntryList(){ viewModelScope.launch { @@ -41,6 +41,6 @@ class EntryListViewModel @Inject constructor( companion object { - val initialState = State.Loading +// val initialState = State.Loading } } \ No newline at end of file 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 56e3e12..3acc748 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 @@ -60,6 +60,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { binding.position.text = state.position binding.lastEntry.text = state.lastEntry if (state.admin){ + //TODO Приделать админские штучки binding.fullname.text = state.fullname + " admin" }else{ binding.fullname.text = state.fullname