Skip to content

feat: Material Design 3 UI 重构#50

Open
Shiho-Patch wants to merge 7 commits into
kmod-midori:mainfrom
Shiho-Patch:md3-ui-refactor
Open

feat: Material Design 3 UI 重构#50
Shiho-Patch wants to merge 7 commits into
kmod-midori:mainfrom
Shiho-Patch:md3-ui-refactor

Conversation

@Shiho-Patch

Copy link
Copy Markdown

主题系统

  • 全新暖橘猫品牌色板(Color.kt)
  • M3 Expressive 排版系统(Type.kt)
  • M3 Expressive 形状系统(Shape.kt)
  • 深浅色 + 动态取色(Theme.kt)

组件库(新增 6 大家族

  • CatCard: Elevated/Filled/Outlined/Clickable + Hero
  • CatButton: Filled/Tonal/Outlined/Text
  • CatIcon: 圆形 + 圆角方形 图标容器
  • CatTopAppBar: 主顶栏 + 子页带返回键
  • CatPullRefresh: M3 原生下拉刷新
  • LoadingStates: Loading/Empty/Error/Scanning/Success 五种状态

架构

  • MVVM: 3 个 ViewModel(Main/Share/Settings
  • Navigation Compose: CatNavHost
  • StateFlow + collectAsStateWithLifecycle

Activity 精简

  • MainActivity 简化为导航容器
  • ShareActivity 委托给 ShareScreen
  • SettingsActivity 委托给 SettingsScreen

依赖

  • 新增 androidx.navigation:navigation-compose
  • 新增 androidx.lifecycle:lifecycle-viewmodel-compose

Bug 修复

  • 修复 BLE 扫描的 ViewModel 清理
  • 修复 BroadcastReceiver 泄漏
  • 修复权限请求回调生命周期

Shiho-Patch and others added 7 commits June 7, 2026 06:42
### 主题系统
- 全新暖橘猫品牌色板(Color.kt)
- M3 Expressive 排版系统(Type.kt)
- M3 Expressive 形状系统(Shape.kt)
- 深浅色 + 动态取色(Theme.kt)

### 组件库(新增 6 大家族
- CatCard: Elevated/Filled/Outlined/Clickable + Hero
- CatButton: Filled/Tonal/Outlined/Text
- CatIcon: 圆形 + 圆角方形 图标容器
- CatTopAppBar: 主顶栏 + 子页带返回键
- CatPullRefresh: M3 原生下拉刷新
- LoadingStates: Loading/Empty/Error/Scanning/Success 五种状态

### 架构
- MVVM: 3 个 ViewModel(Main/Share/Settings
- Navigation Compose: CatNavHost
- StateFlow + collectAsStateWithLifecycle

### Activity 精简
- MainActivity 简化为导航容器
- ShareActivity 委托给 ShareScreen
- SettingsActivity 委托给 SettingsScreen

### 依赖
- 新增 androidx.navigation:navigation-compose
- 新增 androidx.lifecycle:lifecycle-viewmodel-compose

### Bug 修复
- 修复 BLE 扫描的 ViewModel 清理
- 修复 BroadcastReceiver 泄漏
- 修复权限请求回调生命周期
Gradle TOML catalog 将连字符解析为点式嵌套访问,需将 libs.androidx.ui.tooling-preview
改为 libs.androidx.ui.tooling.preview
- Theme.kt: 添加缺失的 androidx.compose.ui.graphics.Color import
- MainActivity.kt: 修正 ActivityResultContract.SynchronousResult 嵌套类引用路径
- ShareActivity.kt: 用 listOfNotNull 处理 extractFileInfo 的可空返回值
- ShareViewModel.kt: ParcelUuid 需要通过 .uuid 获取底层 UUID 对象
- app/build.gradle.kts: packaging.jniLibs.keepDebugSymbols += '**/*.so'
- MainScreen.kt: 修复 Icons.Filled.BluetoothSearching 弃用警告
@kmod-midori

Copy link
Copy Markdown
Owner

怎么还把5G支持给搞丢了(
我还需要再review下

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants