xfy/yayacal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(date-recorder): use camera and crop icons for record/crop buttons

Browse Source 
- DateRecorder FAB: Icons.Filled.Add -> Icons.Filled.PhotoCamera
  (与 onOpenCamera / '拍照记录' 语义一致)
- PhotoEditor crop toggle: 纯文字 -> Icons.Filled.Crop / CropFree 图标
  (Crop 关闭态, CropFree 开启态, contentDescription 保留无障碍语义)
This commit is contained in:
xfy 2026-07-17 16:31:39 +08:00
parent 81aeb8e894
commit b1064f95b7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/kotlin/plus/rua/project/ui/DateRecorderScreen.kt
View File

@ -17,12 +17,12 @@ import androidx.compose.foundation.lazy.grid.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.Checklist
import androidx.compose.material.icons.filled.ChevronLeft
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.PhotoCamera
import androidx.compose.material.icons.filled.Sort
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.BottomAppBar
@ -202,7 +202,7 @@ fun DateRecorderScreen(
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary
) {
Icon(Icons.Filled.Add, contentDescription = "拍照记录")
Icon(Icons.Filled.PhotoCamera, contentDescription = "拍照记录")
}
}
},

6
core/src/main/kotlin/plus/rua/project/ui/PhotoEditorScreen.kt
View File

@ -20,6 +20,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Brush
import androidx.compose.material.icons.filled.ChevronLeft
import androidx.compose.material.icons.filled.Crop
import androidx.compose.material.icons.filled.CropFree
import androidx.compose.material.icons.filled.Done
import androidx.compose.material.icons.filled.RotateLeft
import androidx.compose.material.icons.filled.RotateRight
@ -430,7 +431,10 @@ private fun ToolBar(
}
EditTab.CROP -> {
FilledIconButton(onClick = onCropToggle) {
Text(if (state.cropEnabled) "关闭裁剪" else "开启裁剪")
Icon(
if (state.cropEnabled) Icons.Filled.CropFree else Icons.Filled.Crop,
contentDescription = if (state.cropEnabled) "关闭裁剪" else "开启裁剪"
)
}
}
EditTab.HANDWRITE -> {