emilia-t #1

Closed
emilia-t wants to merge 0 commits from emilia-t into main
Collaborator

1修复深色模式显示问题
2调整部分UI
3增加主题支持
4增加多语言支持

1修复深色模式显示问题 2调整部分UI 3增加主题支持 4增加多语言支持
emilia-t added 2 commits 2 weeks ago
emilia-t changed title from emilia-t to WIP: emilia-t 2 weeks ago
alimu was assigned by emilia-t 2 weeks ago
emilia-t started working 2 weeks ago
alimu added 2 commits 2 weeks ago
ef58ef4b80 Merge remote-tracking branch 'origin/emilia-t'
# Conflicts:
#	android-client/app/src/main/java/com/onlinemsg/client/ui/ChatScreen.kt
emilia-t stopped working 2 weeks ago
24 minutes 18 seconds
alimu commented 2 weeks ago
Owner

已完成该 PR 与 main 的冲突处理并验证,冲突文件如下:

  • android-client/app/src/main/java/com/onlinemsg/client/ui/ChatScreen.kt

本次冲突解决细节:

  1. 保留并整合了 ChatTab 的多语言文本逻辑(LanguageManager / t(...)),发送按钮文案使用翻译键 chat.send
  2. 保留了顶部状态芯片的连接/断开交互(AppTopBar 中按 canConnect/canDisconnect 触发 onConnect/onDisconnect)。
  3. SettingsTab 合并为统一实现:
    • 保留“语言选择 / 主题设置 / 动态颜色 / 诊断信息”等功能入口。
    • 保留“清空消息”能力,并放到独立“聊天数据”卡片。
    • 统一了设置页卡片布局样式,避免冲突两侧重复 UI 入口。
  4. 清理全部冲突标记后完成合并提交:ef58ef4

本地验证:

  • ./gradlew :app:compileDebugKotlin 通过
  • ./gradlew :app:assembleDebug 通过

当前远程分支状态:

  • mainemilia-t 已指向同一提交 ef58ef4(内容已包含)。
已完成该 PR 与 `main` 的冲突处理并验证,冲突文件如下: - `android-client/app/src/main/java/com/onlinemsg/client/ui/ChatScreen.kt` 本次冲突解决细节: 1. 保留并整合了 `ChatTab` 的多语言文本逻辑(`LanguageManager` / `t(...)`),发送按钮文案使用翻译键 `chat.send`。 2. 保留了顶部状态芯片的连接/断开交互(`AppTopBar` 中按 `canConnect/canDisconnect` 触发 `onConnect/onDisconnect`)。 3. `SettingsTab` 合并为统一实现: - 保留“语言选择 / 主题设置 / 动态颜色 / 诊断信息”等功能入口。 - 保留“清空消息”能力,并放到独立“聊天数据”卡片。 - 统一了设置页卡片布局样式,避免冲突两侧重复 UI 入口。 4. 清理全部冲突标记后完成合并提交:`ef58ef4`。 本地验证: - `./gradlew :app:compileDebugKotlin` 通过 - `./gradlew :app:assembleDebug` 通过 当前远程分支状态: - `main` 与 `emilia-t` 已指向同一提交 `ef58ef4`(内容已包含)。
alimu closed this pull request 2 weeks ago
emilia-t locked as Off-topic and limited conversation to collaborators 2 weeks ago
emilia-t added 1 commit 2 weeks ago
emilia-t added 1 commit 2 weeks ago
emilia-t reopened this pull request 2 weeks ago
emilia-t closed this pull request 2 weeks ago
alimu reopened this pull request 2 weeks ago
alimu changed title from WIP: emilia-t to emilia-t 2 weeks ago
alimu closed this pull request 2 weeks ago
Please reopen this pull request to perform a merge.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b emilia-t main
git pull origin emilia-t

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff emilia-t
git push origin main
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
2 Participants
Notifications
Total Time Spent: 24 minutes 18 seconds
emilia-t
24 minutes 18 seconds
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: alimu/OnlineMsgServer#1
Loading…
There is no content yet.