TheDevs/TheDevs-front
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

merge into: TheDevs:Frontend
Branches Tags
TheDevs:main
TheDevs:Frontend
TheDevs:frontend_temp2
TheDevs:frontend_temp
TheDevs:Frontend_UI
TheDevs:Frontend_Egor
TheDevs:Apk
TheDevs:TheDevs-front_1.0
...
pull from: TheDevs:main
Branches Tags
TheDevs:main
TheDevs:Frontend
TheDevs:frontend_temp2
TheDevs:frontend_temp
TheDevs:Frontend_UI
TheDevs:Frontend_Egor
TheDevs:Apk
TheDevs:TheDevs-front_1.0

9 Commits
Frontend ... main

Author SHA1 Message Date
EgorVorobev
89d8794f55 day3_commit.1.5_push_to_main 2025-02-20 16:51:04 +03:00
EgorVorobev
60110e8e68 Merge branch 'Frontend' 2025-02-20 16:50:25 +03:00
EgorVorobev
97fb903db3 day3_commit.1.4_push_to_main 2025-02-20 16:48:32 +03:00
EgorVorobev
636b2a22fc Merge branch 'refs/heads/Frontend' 2025-02-20 16:48:21 +03:00
EgorVorobev
333d9d6227 day3_commit.1.3_push_to_main 2025-02-20 16:33:25 +03:00
EgorVorobev
44e17c69de Merge branch 'Frontend_UI' 2025-02-20 16:32:30 +03:00
EgorVorobev
f6d313e8a3 day2_commit.1.2 2025-02-19 17:45:25 +03:00
EgorVorobev
064a29139f Merge remote-tracking branch 'origin/Frontend_UI' 2025-02-19 17:44:19 +03:00
Terebov_Maksim
644ff7ae02 day2_commit_1_// 2025-02-19 16:59:24 +03:00
3 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
app/src/main/java/ru/myitschool/work/ui/Main/AccessLogAdapter.kt
View File

@ -15,7 +15,7 @@ class AccessLogAdapter(private val accessLogs: List<AccessLog>) : RecyclerView.A
val readerId: TextView = itemView.findViewById(R.id.reader_id) val readerId: TextView = itemView.findViewById(R.id.reader_id)
val accessType: TextView = itemView.findViewById(R.id.access_type) val accessType: TextView = itemView.findViewById(R.id.access_type)
} }
//.
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AccessLogViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AccessLogViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_access_log, parent, false) val view = LayoutInflater.from(parent.context).inflate(R.layout.item_access_log, parent, false)
return AccessLogViewHolder(view) return AccessLogViewHolder(view)

2
app/src/main/java/ru/myitschool/work/ui/Main/AdminFragment.kt
View File

@ -34,7 +34,7 @@ class AdminFragment : Fragment(R.layout.fragment_admin) {
setupUI() setupUI()
} }
//.
private fun setupUI() { private fun setupUI() {
binding.viewEmployeeInfo.setOnClickListener { binding.viewEmployeeInfo.setOnClickListener {
val login = binding.employeeLogin.text.toString() val login = binding.employeeLogin.text.toString()

2
app/src/main/java/ru/myitschool/work/ui/RootActivity.kt
View File

@ -22,7 +22,7 @@ class RootActivity : AppCompatActivity() {
navController.setGraph(R.navigation.nav_graph) // Устанавливаем граф навигации navController.setGraph(R.navigation.nav_graph) // Устанавливаем граф навигации
} }
// Настраиваем кнопку "Назад" // Настройка кнопки "Назад"
onBackPressedDispatcher.addCallback( onBackPressedDispatcher.addCallback(
this, this,
object : OnBackPressedCallback(true) { object : OnBackPressedCallback(true) {