feat: Экран Стартер, фикс ошибок
This commit is contained in:
parent
379117cc0c
commit
f4d5e7a9de
@ -12,7 +12,6 @@ class UserDataStoreManager(private val context: Context) {
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val USERNAME_KEY = stringPreferencesKey("username")
|
private val USERNAME_KEY = stringPreferencesKey("username")
|
||||||
private val ROLE_KEY = stringPreferencesKey("role")
|
|
||||||
private val PASSWORD_KEY = stringPreferencesKey("password")
|
private val PASSWORD_KEY = stringPreferencesKey("password")
|
||||||
|
|
||||||
fun getInstance(context: Context): UserDataStoreManager {
|
fun getInstance(context: Context): UserDataStoreManager {
|
||||||
@ -26,20 +25,12 @@ class UserDataStoreManager(private val context: Context) {
|
|||||||
val passwordFlow: Flow<String> = context.applicationContext.dataStore.data.map { prefs ->
|
val passwordFlow: Flow<String> = context.applicationContext.dataStore.data.map { prefs ->
|
||||||
prefs[PASSWORD_KEY] ?: ""
|
prefs[PASSWORD_KEY] ?: ""
|
||||||
}
|
}
|
||||||
val roleFlow: Flow<String> = context.applicationContext.dataStore.data.map{ prefs ->
|
|
||||||
prefs[ROLE_KEY] ?: ""
|
|
||||||
}
|
|
||||||
suspend fun saveCredentials(username: String, password: String) {
|
suspend fun saveCredentials(username: String, password: String) {
|
||||||
context.dataStore.edit { prefs ->
|
context.dataStore.edit { prefs ->
|
||||||
prefs[USERNAME_KEY] = username
|
prefs[USERNAME_KEY] = username
|
||||||
prefs[PASSWORD_KEY] = password
|
prefs[PASSWORD_KEY] = password
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
suspend fun saveRole(role: String){
|
|
||||||
context.dataStore.edit { prefs ->
|
|
||||||
prefs[ROLE_KEY] = role
|
|
||||||
}
|
|
||||||
}
|
|
||||||
suspend fun clearCredentials() {
|
suspend fun clearCredentials() {
|
||||||
context.applicationContext.dataStore.edit { it.clear() }
|
context.applicationContext.dataStore.edit { it.clear() }
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,6 @@ import com.squareup.picasso.Picasso
|
|||||||
import ru.myitschool.work.R
|
import ru.myitschool.work.R
|
||||||
import ru.myitschool.work.databinding.FragmentAdminBinding
|
import ru.myitschool.work.databinding.FragmentAdminBinding
|
||||||
import ru.myitschool.work.entities.EmployeeEntity
|
import ru.myitschool.work.entities.EmployeeEntity
|
||||||
import ru.myitschool.work.ui.login.LoginViewModel
|
|
||||||
import ru.myitschool.work.utils.buttonRecolor
|
import ru.myitschool.work.utils.buttonRecolor
|
||||||
import ru.myitschool.work.utils.collectWithLifecycle
|
import ru.myitschool.work.utils.collectWithLifecycle
|
||||||
|
|
||||||
@ -122,6 +121,7 @@ class AdminFragment : Fragment(R.layout.fragment_admin) {
|
|||||||
binding.position.text = user.position
|
binding.position.text = user.position
|
||||||
btnState(user.qrEnabled)
|
btnState(user.qrEnabled)
|
||||||
Picasso.get().load(user.photoUrl).into(binding.avatar)
|
Picasso.get().load(user.photoUrl).into(binding.avatar)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -148,6 +148,11 @@ class MainFragment : Fragment(R.layout.fragment_main) {
|
|||||||
binding.scan.setTextColor(ContextCompat.getColor(requireContext(), R.color.secondary_text_color))
|
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
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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) }
|
||||||
|
}
|
||||||
|
}
|
@ -3,7 +3,7 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/nav_graph"
|
android:id="@+id/nav_graph"
|
||||||
app:startDestination="@id/loginFragment">
|
app:startDestination="@id/starterFragment">
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/loginFragment"
|
android:id="@+id/loginFragment"
|
||||||
android:name="ru.myitschool.work.ui.login.LoginFragment"
|
android:name="ru.myitschool.work.ui.login.LoginFragment"
|
||||||
@ -51,4 +51,13 @@
|
|||||||
android:name="ru.myitschool.work.ui.admin.AdminFragment"
|
android:name="ru.myitschool.work.ui.admin.AdminFragment"
|
||||||
android:label="fragment_admin"
|
android:label="fragment_admin"
|
||||||
tools:layout="@layout/fragment_admin" />
|
tools:layout="@layout/fragment_admin" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/starterFragment"
|
||||||
|
android:name="ru.myitschool.work.ui.starter.StarterFragment"
|
||||||
|
android:label="StarterFragment"
|
||||||
|
tools:layout="@layout/fragment_starter">
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_starterFragment_to_loginFragment"
|
||||||
|
app:destination="@id/loginFragment" />
|
||||||
|
</fragment>
|
||||||
</navigation>
|
</navigation>
|
@ -21,7 +21,7 @@
|
|||||||
<string name="block_btn">Block</string>
|
<string name="block_btn">Block</string>
|
||||||
<string name="unblock_btn">Unblock</string>
|
<string name="unblock_btn">Unblock</string>
|
||||||
<string name="starter_tiser">Welcome to</string>
|
<string name="starter_tiser">Welcome to</string>
|
||||||
<string name="starter_tiser_accent">S company Pass</string>
|
<string name="starter_tiser_accent">S Company Pass</string>
|
||||||
<string name="description">View visits and an electronic pass in one application</string>
|
<string name="description">View visits and an electronic pass in one application</string>
|
||||||
<string name="admin_unauthorized">Вы не авторизованы</string>
|
<string name="admin_unauthorized">Вы не авторизованы</string>
|
||||||
<string name="admin_forbidden">Нет доступа</string>
|
<string name="admin_forbidden">Нет доступа</string>
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
<string name="admin_forbidden">Нет доступа</string>
|
<string name="admin_forbidden">Нет доступа</string>
|
||||||
<string name="not_found">404\nСотрудник не найден</string>
|
<string name="not_found">404\nСотрудник не найден</string>
|
||||||
<string name="starter_tiser">Добро пожаловать в</string>
|
<string name="starter_tiser">Добро пожаловать в</string>
|
||||||
<string name="starter_tiser_accent">S company Pass</string>
|
<string name="starter_tiser_accent">S Company Pass</string>
|
||||||
<string name="description">Просмотр посещений и электронный пропуск в одном приложении</string>
|
<string name="description">Просмотр посещений и электронный пропуск в одном приложении</string>
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user