From 488a3f90fbec8bb2deab086039c94d19cc558af7 Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Wed, 19 Feb 2025 18:34:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=82=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B3=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B8=20=D0=BC=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BC=D1=83=D0=BC=D0=B0.=20=D0=AF=D0=B7=D1=8B?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B4=D0=B0=D1=82=D1=8B=20=D0=B2=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=83=D0=BA=D0=BB=D0=B5=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                      |  2 +-
 .../work/ui/entrylist/adapter/AdapterEntryHistory.kt  | 11 ++++++++++-
 buildSrc/src/main/java/Version.kt                     |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

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">
         <activity
             android:name=".ui.RootActivity"
             android:exported="true">
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<EntryHistoryEntity>) : RecyclerView
 .Adapter<AdapterEntryHistory.MyViewHolder>() {
@@ -25,8 +30,12 @@ class AdapterEntryHistory(private val datas: List<EntryHistoryEntity>) : 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
         }