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

Compare commits

base: 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
..
compare: 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

No commits in common. "main" and "Frontend" have entirely different histories.
main ... Frontend

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) {