fix: add ProGuard dontwarn rule for sketch and fix deprecation warnings
This commit is contained in:
parent
19c9feb6de
commit
eadb8eb682
1
core/proguard-rules.pro
vendored
1
core/proguard-rules.pro
vendored
@ -4,3 +4,4 @@
|
|||||||
# ========== 第三方库保留 ==========
|
# ========== 第三方库保留 ==========
|
||||||
-keep class kotlinx.datetime.** { *; }
|
-keep class kotlinx.datetime.** { *; }
|
||||||
-keep class cn.tyme.** { *; }
|
-keep class cn.tyme.** { *; }
|
||||||
|
-dontwarn com.github.panpf.sketch.**
|
||||||
|
|||||||
@ -297,6 +297,7 @@ fun DateCheckerScreen(onBack: () -> Unit, modifier: Modifier = Modifier) {
|
|||||||
val isBeingDeleted = row.id in pendingDeleteIds
|
val isBeingDeleted = row.id in pendingDeleteIds
|
||||||
|
|
||||||
key(row.id) {
|
key(row.id) {
|
||||||
|
@Suppress("DEPRECATION") // confirmValueChange in SwipeToDismissBoxState is deprecated in Compose M3
|
||||||
val dismissState = rememberSwipeToDismissBoxState(
|
val dismissState = rememberSwipeToDismissBoxState(
|
||||||
confirmValueChange = { newValue ->
|
confirmValueChange = { newValue ->
|
||||||
newValue == SwipeToDismissBoxValue.EndToStart
|
newValue == SwipeToDismissBoxValue.EndToStart
|
||||||
|
|||||||
@ -123,6 +123,7 @@ import androidx.lifecycle.viewmodel.viewModelFactory
|
|||||||
import com.github.panpf.sketch.AsyncImage
|
import com.github.panpf.sketch.AsyncImage
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.datetime.LocalDate
|
import kotlinx.datetime.LocalDate
|
||||||
|
import kotlinx.datetime.number
|
||||||
import plus.rua.project.DateRecord
|
import plus.rua.project.DateRecord
|
||||||
import plus.rua.project.DateRecorderRepository
|
import plus.rua.project.DateRecorderRepository
|
||||||
import plus.rua.project.DateRecorderViewModel
|
import plus.rua.project.DateRecorderViewModel
|
||||||
@ -719,7 +720,7 @@ private fun RecordGrid(
|
|||||||
val groupedRecords = remember(records) {
|
val groupedRecords = remember(records) {
|
||||||
records.groupBy { record ->
|
records.groupBy { record ->
|
||||||
val date = record.shootDate
|
val date = record.shootDate
|
||||||
"${date.year}年${date.monthNumber.toString().padStart(2, '0')}月"
|
"${date.year}年${date.month.number.toString().padStart(2, '0')}月"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -37,9 +37,9 @@ import androidx.compose.material.icons.filled.Check
|
|||||||
import androidx.compose.material.icons.outlined.Brush
|
import androidx.compose.material.icons.outlined.Brush
|
||||||
import androidx.compose.material.icons.outlined.Check
|
import androidx.compose.material.icons.outlined.Check
|
||||||
import androidx.compose.material.icons.outlined.Crop
|
import androidx.compose.material.icons.outlined.Crop
|
||||||
import androidx.compose.material.icons.outlined.RotateLeft
|
import androidx.compose.material.icons.automirrored.outlined.RotateLeft
|
||||||
import androidx.compose.material.icons.outlined.RotateRight
|
import androidx.compose.material.icons.automirrored.outlined.RotateRight
|
||||||
import androidx.compose.material.icons.outlined.Undo
|
import androidx.compose.material.icons.automirrored.outlined.Undo
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
import androidx.compose.material3.Card
|
import androidx.compose.material3.Card
|
||||||
import androidx.compose.material3.CardDefaults
|
import androidx.compose.material3.CardDefaults
|
||||||
@ -245,7 +245,7 @@ private fun EditorBody(
|
|||||||
icon = {
|
icon = {
|
||||||
Icon(
|
Icon(
|
||||||
when (tab) {
|
when (tab) {
|
||||||
EditTab.ROTATE -> Icons.Outlined.RotateRight
|
EditTab.ROTATE -> Icons.AutoMirrored.Outlined.RotateRight
|
||||||
EditTab.CROP -> Icons.Outlined.Crop
|
EditTab.CROP -> Icons.Outlined.Crop
|
||||||
EditTab.HANDWRITE -> Icons.Outlined.Brush
|
EditTab.HANDWRITE -> Icons.Outlined.Brush
|
||||||
},
|
},
|
||||||
@ -637,7 +637,7 @@ private fun ToolPanel(
|
|||||||
shape = RoundedCornerShape(12.dp)
|
shape = RoundedCornerShape(12.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Outlined.RotateLeft,
|
imageVector = Icons.AutoMirrored.Outlined.RotateLeft,
|
||||||
contentDescription = "左转 90°",
|
contentDescription = "左转 90°",
|
||||||
modifier = Modifier.size(18.dp)
|
modifier = Modifier.size(18.dp)
|
||||||
)
|
)
|
||||||
@ -664,7 +664,7 @@ private fun ToolPanel(
|
|||||||
shape = RoundedCornerShape(12.dp)
|
shape = RoundedCornerShape(12.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Outlined.RotateRight,
|
imageVector = Icons.AutoMirrored.Outlined.RotateRight,
|
||||||
contentDescription = "右转 90°",
|
contentDescription = "右转 90°",
|
||||||
modifier = Modifier.size(18.dp)
|
modifier = Modifier.size(18.dp)
|
||||||
)
|
)
|
||||||
@ -749,7 +749,7 @@ private fun ToolPanel(
|
|||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Outlined.Undo,
|
imageVector = Icons.AutoMirrored.Outlined.Undo,
|
||||||
contentDescription = "撤销笔触",
|
contentDescription = "撤销笔触",
|
||||||
modifier = Modifier.size(16.dp)
|
modifier = Modifier.size(16.dp)
|
||||||
)
|
)
|
||||||
|
|||||||
@ -25,7 +25,7 @@ import androidx.compose.material.icons.outlined.CalendarToday
|
|||||||
import androidx.compose.material.icons.outlined.Delete
|
import androidx.compose.material.icons.outlined.Delete
|
||||||
import androidx.compose.material.icons.outlined.Edit
|
import androidx.compose.material.icons.outlined.Edit
|
||||||
import androidx.compose.material.icons.outlined.EditNote
|
import androidx.compose.material.icons.outlined.EditNote
|
||||||
import androidx.compose.material.icons.outlined.Notes
|
import androidx.compose.material.icons.automirrored.outlined.Notes
|
||||||
import androidx.compose.material.icons.outlined.ZoomIn
|
import androidx.compose.material.icons.outlined.ZoomIn
|
||||||
import androidx.compose.material3.AlertDialog
|
import androidx.compose.material3.AlertDialog
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
@ -69,6 +69,7 @@ import androidx.lifecycle.viewmodel.viewModelFactory
|
|||||||
import com.github.panpf.sketch.AsyncImage
|
import com.github.panpf.sketch.AsyncImage
|
||||||
import kotlinx.datetime.DayOfWeek
|
import kotlinx.datetime.DayOfWeek
|
||||||
import kotlinx.datetime.LocalDate
|
import kotlinx.datetime.LocalDate
|
||||||
|
import kotlinx.datetime.number
|
||||||
import plus.rua.project.DateRecordDetailUiState
|
import plus.rua.project.DateRecordDetailUiState
|
||||||
import plus.rua.project.DateRecordDetailViewModel
|
import plus.rua.project.DateRecordDetailViewModel
|
||||||
import plus.rua.project.DateRecorderRepository
|
import plus.rua.project.DateRecorderRepository
|
||||||
@ -536,7 +537,7 @@ private fun JournalNoteSection(
|
|||||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Outlined.Notes,
|
imageVector = Icons.AutoMirrored.Outlined.Notes,
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
tint = MaterialTheme.colorScheme.secondary,
|
tint = MaterialTheme.colorScheme.secondary,
|
||||||
modifier = Modifier.size(20.dp)
|
modifier = Modifier.size(20.dp)
|
||||||
@ -660,7 +661,7 @@ private fun DetailBottomBar(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun formatChineseDate(date: LocalDate): String {
|
private fun formatChineseDate(date: LocalDate): String {
|
||||||
return "${date.year}年${date.monthNumber}月${date.dayOfMonth}日"
|
return "${date.year}年${date.month.number}月${date.day}日"
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getWeekdayName(date: LocalDate): String {
|
private fun getWeekdayName(date: LocalDate): String {
|
||||||
|
|||||||
@ -25,7 +25,7 @@ import androidx.compose.material.icons.outlined.CalendarToday
|
|||||||
import androidx.compose.material.icons.outlined.Check
|
import androidx.compose.material.icons.outlined.Check
|
||||||
import androidx.compose.material.icons.outlined.ChevronRight
|
import androidx.compose.material.icons.outlined.ChevronRight
|
||||||
import androidx.compose.material.icons.outlined.Edit
|
import androidx.compose.material.icons.outlined.Edit
|
||||||
import androidx.compose.material.icons.outlined.Notes
|
import androidx.compose.material.icons.automirrored.outlined.Notes
|
||||||
import androidx.compose.material.icons.outlined.Title
|
import androidx.compose.material.icons.outlined.Title
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
import androidx.compose.material3.CardDefaults
|
import androidx.compose.material3.CardDefaults
|
||||||
@ -68,8 +68,9 @@ import androidx.lifecycle.viewmodel.initializer
|
|||||||
import androidx.lifecycle.viewmodel.viewModelFactory
|
import androidx.lifecycle.viewmodel.viewModelFactory
|
||||||
import com.github.panpf.sketch.AsyncImage
|
import com.github.panpf.sketch.AsyncImage
|
||||||
import kotlinx.datetime.DayOfWeek
|
import kotlinx.datetime.DayOfWeek
|
||||||
import kotlinx.datetime.Instant
|
import kotlin.time.Instant
|
||||||
import kotlinx.datetime.LocalDate
|
import kotlinx.datetime.LocalDate
|
||||||
|
import kotlinx.datetime.number
|
||||||
import kotlinx.datetime.TimeZone
|
import kotlinx.datetime.TimeZone
|
||||||
import kotlinx.datetime.atStartOfDayIn
|
import kotlinx.datetime.atStartOfDayIn
|
||||||
import kotlinx.datetime.toLocalDateTime
|
import kotlinx.datetime.toLocalDateTime
|
||||||
@ -342,7 +343,7 @@ private fun RecordEditForm(
|
|||||||
placeholder = { Text("记录当天的所思所想、天气或难忘瞬间...") },
|
placeholder = { Text("记录当天的所思所想、天气或难忘瞬间...") },
|
||||||
leadingIcon = {
|
leadingIcon = {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Outlined.Notes,
|
imageVector = Icons.AutoMirrored.Outlined.Notes,
|
||||||
contentDescription = null
|
contentDescription = null
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
@ -568,5 +569,5 @@ private fun formatChineseDateWithWeek(date: LocalDate): String {
|
|||||||
DayOfWeek.SATURDAY -> "星期六"
|
DayOfWeek.SATURDAY -> "星期六"
|
||||||
DayOfWeek.SUNDAY -> "星期日"
|
DayOfWeek.SUNDAY -> "星期日"
|
||||||
}
|
}
|
||||||
return "${date.year}年${date.monthNumber}月${date.dayOfMonth}日 $weekStr"
|
return "${date.year}年${date.month.number}月${date.day}日 $weekStr"
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user