diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0599e1a..1d8846d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.UiTemplate" - tools:targetApi="31"> + tools:targetApi="34"> 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 index 0083927..e508c9c 100644 --- 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 @@ -1,14 +1,19 @@ package ru.myitschool.work.ui.entrylist.adapter import android.graphics.Color +import android.os.Build import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView import android.widget.TextView +import androidx.annotation.RequiresApi import androidx.core.graphics.drawable.toDrawable import androidx.recyclerview.widget.RecyclerView import ru.myitschool.work.R +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter +import java.util.Locale class AdapterEntryHistory(private val datas: List) : RecyclerView .Adapter() { @@ -25,8 +30,12 @@ class AdapterEntryHistory(private val datas: List) : Recycle return MyViewHolder(itemView) } + @RequiresApi(Build.VERSION_CODES.O) override fun onBindViewHolder(holder: MyViewHolder, position: Int) { - holder.dateText.text = datas[position].time.toString() + + + + holder.dateText.text = LocalDateTime.parse(datas[position].time).format(DateTimeFormatter.ofPattern("d MMMM yyyy, HH:mm:ss", Locale.getDefault())) holder.identificatorText.text = datas[position].identificator.toString() holder.typeText.text = datas[position].type.toString() diff --git a/buildSrc/src/main/java/Version.kt b/buildSrc/src/main/java/Version.kt index 7b7f7e8..330fa13 100644 --- a/buildSrc/src/main/java/Version.kt +++ b/buildSrc/src/main/java/Version.kt @@ -34,7 +34,7 @@ object Version { object Android { object Sdk { - const val min = 24 + const val min = 28 const val compile = 34 const val target = 34 }