Merge remote-tracking branch 'origin/main'

This commit is contained in:
Juja2025 2025-02-20 11:11:46 +03:00
commit 9088482164

View File

@ -1,12 +1,15 @@
package ru.myitschool.work.ui.profile package ru.myitschool.work.ui.profile
import android.content.DialogInterface import android.content.DialogInterface
import android.content.res.ColorStateList
import android.content.res.TypedArray
import android.graphics.Color import android.graphics.Color
import android.graphics.Typeface import android.graphics.Typeface
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.ResourcesCompat
@ -14,6 +17,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.google.android.material.internal.ThemeEnforcement.obtainStyledAttributes
import com.squareup.picasso.Picasso import com.squareup.picasso.Picasso
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import ru.myitschool.work.R import ru.myitschool.work.R
@ -70,12 +74,15 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
binding.lastEntry.text = state.lastEntry binding.lastEntry.text = state.lastEntry
binding.fullname.text = state.fullname binding.fullname.text = state.fullname
if (state.admin){ if (state.admin){
Toast.makeText(requireContext(), "asdasd", Toast.LENGTH_SHORT).show()
binding.admin.visibility = View.VISIBLE binding.admin.visibility = View.VISIBLE
} else { } else {
binding.admin.visibility = View.GONE binding.admin.visibility = View.GONE
} }
if (state.blocked) { if (state.blocked) {
// TODO: СДЕЛАТЬ ФОН КРАСНЫМ binding.scan.isEnabled = false
binding.scan.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.white))
binding.scan.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.ErrorRed))
} }
Picasso.get() Picasso.get()
.load(state.imageUrl) .load(state.imageUrl)