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

Смена таргетов и минимума. Языки даты в рекуклере

Browse Source
This commit is contained in:
v228a 2025-02-19 18:34:08 +03:00
parent ffe93368ef
commit 488a3f90fb
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -16,7 +16,7 @@
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.UiTemplate" android:theme="@style/Theme.UiTemplate"
tools:targetApi="31"> tools:targetApi="34">
<activity <activity
android:name=".ui.RootActivity" android:name=".ui.RootActivity"
android:exported="true"> android:exported="true">

11
app/src/main/java/ru/myitschool/work/ui/entrylist/adapter/AdapterEntryHistory.kt
View File

@ -1,14 +1,19 @@
package ru.myitschool.work.ui.entrylist.adapter package ru.myitschool.work.ui.entrylist.adapter
import android.graphics.Color import android.graphics.Color
import android.os.Build
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.AdapterView import android.widget.AdapterView
import android.widget.TextView import android.widget.TextView
import androidx.annotation.RequiresApi
import androidx.core.graphics.drawable.toDrawable import androidx.core.graphics.drawable.toDrawable
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import ru.myitschool.work.R 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 class AdapterEntryHistory(private val datas: List<EntryHistoryEntity>) : RecyclerView
.Adapter<AdapterEntryHistory.MyViewHolder>() { .Adapter<AdapterEntryHistory.MyViewHolder>() {
@ -25,8 +30,12 @@ class AdapterEntryHistory(private val datas: List<EntryHistoryEntity>) : Recycle
return MyViewHolder(itemView) return MyViewHolder(itemView)
} }
@RequiresApi(Build.VERSION_CODES.O)
override fun onBindViewHolder(holder: MyViewHolder, position: Int) { 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.identificatorText.text = datas[position].identificator.toString()
holder.typeText.text = datas[position].type.toString() holder.typeText.text = datas[position].type.toString()

2
buildSrc/src/main/java/Version.kt
View File

@ -34,7 +34,7 @@ object Version {
object Android { object Android {
object Sdk { object Sdk {
const val min = 24 const val min = 28
const val compile = 34 const val compile = 34
const val target = 34 const val target = 34
} }