From afa43a9d97cea5344727ca33a85707091308f241 Mon Sep 17 00:00:00 2001 From: v228a Date: Wed, 19 Feb 2025 17:12:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D1=82=D0=BE=D1=80=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/myitschool/work/core/Constants.kt | 2 +- .../work/ui/entrylist/EntryListFragment.kt | 12 +++++-- .../work/ui/entrylist/EntryListViewModel.kt | 22 +++++++----- .../entrylist/adapter/AdapterEntryHistory.kt | 36 +++++++++++++++++++ .../entrylist/adapter/EntryHistoryEntity.kt | 7 ++++ app/src/main/res/drawable/ic_admin.xml | 9 +++++ app/src/main/res/drawable/ic_back.xml | 5 +++ .../main/res/layout/fragment_entry_list.xml | 10 +++--- app/src/main/res/layout/fragment_profile.xml | 11 ++++++ app/src/main/res/values/card_view_style.xml | 4 +-- app/src/main/res/values/strings.xml | 1 + 11 files changed, 101 insertions(+), 18 deletions(-) create mode 100644 app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/AdapterEntryHistory.kt create mode 100644 app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/EntryHistoryEntity.kt create mode 100644 app/src/main/res/drawable/ic_admin.xml create mode 100644 app/src/main/res/drawable/ic_back.xml diff --git a/app/src/main/java/ru/myitschool/work/core/Constants.kt b/app/src/main/java/ru/myitschool/work/core/Constants.kt index 1d66ffb..1252665 100644 --- a/app/src/main/java/ru/myitschool/work/core/Constants.kt +++ b/app/src/main/java/ru/myitschool/work/core/Constants.kt @@ -1,6 +1,6 @@ package ru.myitschool.work.core object Constants { -// const val SERVER_ADDRESS = "http://10.0.2.2:8080" + // const val SERVER_ADDRESS = "http://10.0.2.2:8080" const val SERVER_ADDRESS = "https://nto.den4iksop.org" } \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt index b6285d9..855c64f 100644 --- a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt @@ -7,11 +7,15 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.LinearLayout import androidx.navigation.fragment.findNavController +import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint import ru.myitschool.work.R import ru.myitschool.work.databinding.FragmentEntryListBinding import ru.myitschool.work.databinding.FragmentLoginBinding +import ru.myitschool.work.ui.entrylist.adapter.AdapterEntryHistory +import ru.myitschool.work.ui.entrylist.adapter.EntryHistoryEntity import ru.myitschool.work.ui.login.LoginDestination import ru.myitschool.work.ui.login.LoginViewModel import ru.myitschool.work.ui.profile.ProfileDestination @@ -32,9 +36,13 @@ class EntryListFragment : Fragment(R.layout.fragment_entry_list) { subscribe() } - private fun initCallback (){ + private fun initCallback() { binding.floatingActionButton2.setOnClickListener { viewModel.closeEntryList() } - } + + + binding.recyclerView.adapter = AdapterEntryHistory(viewModel.getEntryList()) + binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) + } private fun subscribe() { viewModel.action.collectWhenStarted(this) { action -> diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt index 69fb288..1572a88 100644 --- a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt @@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import ru.myitschool.work.ui.entrylist.adapter.EntryHistoryEntity import ru.myitschool.work.ui.profile.ProfileViewModel import ru.myitschool.work.ui.profile.ProfileViewModel.Action import ru.myitschool.work.ui.profile.ProfileViewModel.State @@ -25,8 +26,19 @@ class EntryListViewModel @Inject constructor( private val _action = MutablePublishFlow() val action = _action.asSharedFlow() -// private val _state = MutableStateFlow(initialState) -// val state = _state.asStateFlow() + // Новый список данных + private val entryList = listOf( + EntryHistoryEntity("type1", "2023-10-01T12:00:00", "id001"), + EntryHistoryEntity("type2", "2023-10-02T13:00:00", "id002"), + EntryHistoryEntity("type3", "2023-10-03T14:00:00", "id003"), + EntryHistoryEntity("type4", "2023-10-04T15:00:00", "id004"), + EntryHistoryEntity("type5", "2023-10-05T16:00:00", "id005") + ) + + // Функция для получения данных + fun getEntryList(): List { + return entryList + } fun closeEntryList(){ viewModelScope.launch { @@ -34,13 +46,7 @@ class EntryListViewModel @Inject constructor( } } - sealed interface Action { data object OpenProfile: Action } - - - companion object { -// val initialState = State.Loading - } } \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/AdapterEntryHistory.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/AdapterEntryHistory.kt new file mode 100644 index 0000000..0083927 --- /dev/null +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/AdapterEntryHistory.kt @@ -0,0 +1,36 @@ +package ru.myitschool.work.ui.entrylist.adapter + +import android.graphics.Color +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.AdapterView +import android.widget.TextView +import androidx.core.graphics.drawable.toDrawable +import androidx.recyclerview.widget.RecyclerView +import ru.myitschool.work.R + +class AdapterEntryHistory(private val datas: List) : RecyclerView +.Adapter() { + + class MyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + var dateText: TextView = itemView.findViewById(R.id.time) + val identificatorText: TextView = itemView.findViewById(R.id.identificator) + val typeText: TextView = itemView.findViewById(R.id.type) + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder { + val itemView = LayoutInflater.from(parent.context) + .inflate(R.layout.card_view, parent, false) + return MyViewHolder(itemView) + } + + override fun onBindViewHolder(holder: MyViewHolder, position: Int) { + holder.dateText.text = datas[position].time.toString() + holder.identificatorText.text = datas[position].identificator.toString() + holder.typeText.text = datas[position].type.toString() + + } + + override fun getItemCount() = datas.size +} \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/EntryHistoryEntity.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/EntryHistoryEntity.kt new file mode 100644 index 0000000..dd24567 --- /dev/null +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/EntryHistoryEntity.kt @@ -0,0 +1,7 @@ +package ru.myitschool.work.ui.entrylist.adapter + +class EntryHistoryEntity( + val type: String, + val time: String, + val identificator: String +) \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_admin.xml b/app/src/main/res/drawable/ic_admin.xml new file mode 100644 index 0000000..e473e70 --- /dev/null +++ b/app/src/main/res/drawable/ic_admin.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml new file mode 100644 index 0000000..075e95d --- /dev/null +++ b/app/src/main/res/drawable/ic_back.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_entry_list.xml b/app/src/main/res/layout/fragment_entry_list.xml index 52af41c..b06a0ff 100644 --- a/app/src/main/res/layout/fragment_entry_list.xml +++ b/app/src/main/res/layout/fragment_entry_list.xml @@ -10,20 +10,20 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b183019..9b2b311 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ NTO Pass + Entry History \ No newline at end of file