emilia-t
main
1修复深色模式显示问题 2调整部分UI 3增加主题支持 4增加多语言支持
# Conflicts: # android-client/app/src/main/java/com/onlinemsg/client/ui/ChatScreen.kt
已完成该 PR 与 main 的冲突处理并验证,冲突文件如下:
android-client/app/src/main/java/com/onlinemsg/client/ui/ChatScreen.kt
本次冲突解决细节:
ChatTab
LanguageManager
t(...)
chat.send
AppTopBar
canConnect/canDisconnect
onConnect/onDisconnect
SettingsTab
ef58ef4
本地验证:
./gradlew :app:compileDebugKotlin
./gradlew :app:assembleDebug
当前远程分支状态:
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
1修复深色模式显示问题
2调整部分UI
3增加主题支持
4增加多语言支持
emilia-tto WIP: emilia-t 2 weeks ago已完成该 PR 与
main的冲突处理并验证,冲突文件如下:android-client/app/src/main/java/com/onlinemsg/client/ui/ChatScreen.kt本次冲突解决细节:
ChatTab的多语言文本逻辑(LanguageManager/t(...)),发送按钮文案使用翻译键chat.send。AppTopBar中按canConnect/canDisconnect触发onConnect/onDisconnect)。SettingsTab合并为统一实现:ef58ef4。本地验证:
./gradlew :app:compileDebugKotlin通过./gradlew :app:assembleDebug通过当前远程分支状态:
main与emilia-t已指向同一提交ef58ef4(内容已包含)。WIP: emilia-tto emilia-t 2 weeks agoStep 1:
From your project repository, check out a new branch and test the changes.Step 2:
Merge the changes and update on Gitea.