From f4d5e7a9de451ddbc6ad0db439bfcda08a58f5fe Mon Sep 17 00:00:00 2001 From: yastruckov Date: Thu, 20 Feb 2025 16:22:29 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=AD=D0=BA=D1=80=D0=B0=D0=BD=20=D0=A1?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D1=82=D0=B5=D1=80,=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/data/UserDataStoreManager.kt | 9 --------- .../myitschool/work/ui/admin/AdminFragment.kt | 2 +- .../ru/myitschool/work/ui/main/MainFragment.kt | 5 +++++ .../work/ui/starter/StarterFragment.kt | 17 +++++++++++++++++ app/src/main/res/navigation/nav_graph.xml | 11 ++++++++++- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 app/src/main/java/ru/myitschool/work/ui/starter/StarterFragment.kt diff --git a/app/src/main/java/ru/myitschool/work/data/UserDataStoreManager.kt b/app/src/main/java/ru/myitschool/work/data/UserDataStoreManager.kt index ba5b650..414aaa6 100644 --- a/app/src/main/java/ru/myitschool/work/data/UserDataStoreManager.kt +++ b/app/src/main/java/ru/myitschool/work/data/UserDataStoreManager.kt @@ -12,7 +12,6 @@ class UserDataStoreManager(private val context: Context) { companion object { private val USERNAME_KEY = stringPreferencesKey("username") - private val ROLE_KEY = stringPreferencesKey("role") private val PASSWORD_KEY = stringPreferencesKey("password") fun getInstance(context: Context): UserDataStoreManager { @@ -26,20 +25,12 @@ class UserDataStoreManager(private val context: Context) { val passwordFlow: Flow = context.applicationContext.dataStore.data.map { prefs -> prefs[PASSWORD_KEY] ?: "" } - val roleFlow: Flow = context.applicationContext.dataStore.data.map{ prefs -> - prefs[ROLE_KEY] ?: "" - } suspend fun saveCredentials(username: String, password: String) { context.dataStore.edit { prefs -> prefs[USERNAME_KEY] = username prefs[PASSWORD_KEY] = password } } - suspend fun saveRole(role: String){ - context.dataStore.edit { prefs -> - prefs[ROLE_KEY] = role - } - } suspend fun clearCredentials() { context.applicationContext.dataStore.edit { it.clear() } } 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 b8ee4f1..55e0f74 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 @@ -12,7 +12,6 @@ import com.squareup.picasso.Picasso import ru.myitschool.work.R import ru.myitschool.work.databinding.FragmentAdminBinding import ru.myitschool.work.entities.EmployeeEntity -import ru.myitschool.work.ui.login.LoginViewModel import ru.myitschool.work.utils.buttonRecolor import ru.myitschool.work.utils.collectWithLifecycle @@ -122,6 +121,7 @@ class AdminFragment : Fragment(R.layout.fragment_admin) { binding.position.text = user.position btnState(user.qrEnabled) Picasso.get().load(user.photoUrl).into(binding.avatar) + } } \ No newline at end of file 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 cdf4989..40a49a1 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 @@ -148,6 +148,11 @@ class MainFragment : Fragment(R.layout.fragment_main) { binding.scan.setTextColor(ContextCompat.getColor(requireContext(), R.color.secondary_text_color)) } } + if(employeeEntity.authority == "EMPLOYEE"){ + binding.admin.visibility = View.GONE + }else{ + binding.admin.visibility = View.VISIBLE + } } diff --git a/app/src/main/java/ru/myitschool/work/ui/starter/StarterFragment.kt b/app/src/main/java/ru/myitschool/work/ui/starter/StarterFragment.kt new file mode 100644 index 0000000..6b838ce --- /dev/null +++ b/app/src/main/java/ru/myitschool/work/ui/starter/StarterFragment.kt @@ -0,0 +1,17 @@ +package ru.myitschool.work.ui.starter + +import android.os.Bundle +import android.view.View +import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController +import ru.myitschool.work.R +import ru.myitschool.work.databinding.FragmentStarterBinding + +class StarterFragment : Fragment(R.layout.fragment_starter) { + private var _binding: FragmentStarterBinding? = null + private val binding get() = _binding!! + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + _binding = FragmentStarterBinding.bind(view) + binding.loginBtn.setOnClickListener { findNavController().navigate(R.id.loginFragment) } + } +} \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 60bde23..591b60e 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/nav_graph" - app:startDestination="@id/loginFragment"> + app:startDestination="@id/starterFragment"> + + + \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 1e2f9d4..84b8779 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -21,7 +21,7 @@ Block Unblock Welcome to - S company Pass + S Company Pass View visits and an electronic pass in one application Вы не авторизованы Нет доступа diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fb0ffab..10a14a4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,7 +26,7 @@ Нет доступа 404\nСотрудник не найден Добро пожаловать в - S company Pass + S Company Pass Просмотр посещений и электронный пропуск в одном приложении