TDTheme : 组件全面适配深色模式，优化调整组件样式

.github/workflows/preview-build.yml

@@ -90,147 +90,6 @@ jobs:
           repository: TDesignOteam/tdesign-flutter-generator
           path: ./example/tdesign-flutter-generator
 
-      - name: 重写脚本
-        run: |
-          #  AOPMarket.enable = true 
-          yq e '.AOPMarket.enable = true' -i tdesign-component/example/pubspec.yaml
-          # 更新 tdesign-component/example/android/app/build.gradle
-          cd $GITHUB_WORKSPACE/tdesign-component/example/android/app
-
-          # 使用 sed 更新 build.gradle 文件
-          # 1. 添加 namespace 如果不存在
-          if ! grep -q "namespace" build.gradle; then
-            sed -i '/^android {$/a\\    namespace '\''com.tdesign.tdesign_flutter_example'\''' build.gradle
-          fi
-
-          # 2. 更新 compileSdkVersion 从 34 到 35
-          sed -i 's/compileSdkVersion 34/compileSdkVersion 35/g' build.gradle
-
-          # 3. 更新 minSdkVersion 从 21 到 23
-          sed -i 's/minSdkVersion 21/minSdkVersion 23/g' build.gradle
-
-          # 4. 更新 targetSdkVersion 从 31 到 35
-          sed -i 's/targetSdkVersion 31/targetSdkVersion 35/g' build.gradle
-
-          # 5. 将双引号改为单引号 (applicationId)
-          sed -i 's/applicationId "com.tdesign.tdesign_flutter_example"/applicationId '\''com.tdesign.tdesign_flutter_example'\''/g' build.gradle
-
-          # 6. 添加 compileOptions 和 kotlinOptions 如果不存在
-          if ! grep -q "compileOptions" build.gradle; then
-            # 在 buildTypes 块之后添加 compileOptions 和 kotlinOptions
-            awk '
-            BEGIN { in_android = 0; buildtypes_done = 0 }
-            /^android \{/ { in_android = 1; print; next }
-            /^    buildTypes \{/ && in_android { print; in_buildtypes = 1; next }
-            /^    \}/ && in_buildtypes && in_android { 
-              print
-              print ""
-              print "    compileOptions {"
-              print "        sourceCompatibility JavaVersion.VERSION_17"
-              print "        targetCompatibility JavaVersion.VERSION_17"
-              print "    }"
-              print ""
-              print "    kotlinOptions {"
-              print "        jvmTarget = '\''17'\''"
-              print "    }"
-              in_buildtypes = 0
-              buildtypes_done = 1
-              next
-            }
-            /^}/ && in_android && buildtypes_done { in_android = 0 }
-            { print }
-            ' build.gradle > build.gradle.tmp && mv build.gradle.tmp build.gradle
-          fi
-
-          echo "=== build.gradle 更新完成 ==="
-          echo "=== 显示更新后的 android 块 ==="
-          sed -n '/^android {/,/^}/p' build.gradle
-          # 重写 tdesign-component/example/android/build.gradle
-          cd $GITHUB_WORKSPACE/tdesign-component/example/android
-
-          # 删除原文件并创建新文件
-          rm -f build.gradle
-
-          # 创建新的 build.gradle 文件内容
-          echo "buildscript {" > build.gradle
-          echo "    ext.kotlin_version = '1.7.10'" >> build.gradle
-          echo "" >> build.gradle
-          echo "    ext {" >> build.gradle
-          echo "        config = [" >> build.gradle
-          echo "                // 蓝盾自带变量" >> build.gradle
-          echo "                isCI           : System.getenv(\"isCI\") ?: \"false\"          // 是否在RMD的持续集成构建环境中" >> build.gradle
-          echo "                , VersionCode  : System.getenv(\"VersionCode\") ?: \"1\"   // VersionCode，每次发版本+2" >> build.gradle
-          echo "                , devopsUUID   : System.getenv(\"uuid\") ?: \"local\"          // 蓝盾构建UUID" >> build.gradle
-          echo "                , MajorVersion : System.getenv(\"MajorVersion\") ?: \"1\"  // 主版本号" >> build.gradle
-          echo "                , MinorVersion : System.getenv(\"MinorVersion\") ?: \"0\"  // 特性版本号" >> build.gradle
-          echo "                , FixVersion   : System.getenv(\"FixVersion\") ?: \"0\"    // 修正版本号" >> build.gradle
-          echo "                , BuildNo      : System.getenv(\"BuildNo\") ?: \"0\"       // 构建号" >> build.gradle
-          echo "                , isPublish    : System.getenv(\"isPublish\") ?: \"false\"     // 是否是外发版本，用来控制调试入口等" >> build.gradle
-          echo "                , isBeta       : System.getenv(\"isBeta\") ?: \"false\"        // 是否是灰度版本" >> build.gradle
-          echo "                , gitVersion   : System.getenv(\"gitVersion\") ?: \"local\"    // git提交hash" >> build.gradle
-          echo "                , keyAlias     : System.getenv(\"keyAlias\") ?: \"debug\"     // 签名信息" >> build.gradle
-          echo "                , storePassword: System.getenv(\"storePassword\") ?: \"debug\"        // storePassword" >> build.gradle
-          echo "                , abi_filters  : System.getenv(\"abi_filters\") ?: \"armeabi-v7a,arm64-v8a,x86,x86_64\"        // abi类型配置" >> build.gradle
-          echo "        ]" >> build.gradle
-          echo "" >> build.gradle
-          echo "        def dir = System.getProperty(\"user.dir\")" >> build.gradle
-          echo "        def file = new File(dir, 'local.properties')" >> build.gradle
-          echo "        Properties properties = new Properties()" >> build.gradle
-          echo "        if (file.exists()) {" >> build.gradle
-          echo "            properties.load(file.newDataInputStream())" >> build.gradle
-          echo "        }" >> build.gradle
-          echo "        enableWatchman = Boolean.valueOf(properties.getProperty('enableWatchman', \"\"))" >> build.gradle
-          echo "    }" >> build.gradle
-          echo "" >> build.gradle
-          echo "    repositories {" >> build.gradle
-          echo "        google()" >> build.gradle
-          echo "        mavenCentral()" >> build.gradle
-          echo "    }" >> build.gradle
-          echo "" >> build.gradle
-          echo "    dependencies {" >> build.gradle
-          echo "        classpath 'com.android.tools.build:gradle:7.0.1'" >> build.gradle
-          echo "        classpath \"org.jetbrains.kotlin:kotlin-gradle-plugin:\$kotlin_version\"" >> build.gradle
-          echo "    }" >> build.gradle
-          echo "}" >> build.gradle
-          echo "" >> build.gradle
-          echo "allprojects {" >> build.gradle
-          echo "    repositories {" >> build.gradle
-          echo "        google()" >> build.gradle
-          echo "        mavenCentral()" >> build.gradle
-          echo "    }" >> build.gradle
-          echo "}" >> build.gradle
-          echo "rootProject.buildDir = '../build'" >> build.gradle
-          echo "subprojects {" >> build.gradle
-          echo "    project.buildDir = \"\${rootProject.buildDir}/\${project.name}\"" >> build.gradle
-          echo "}" >> build.gradle
-          echo "subprojects {" >> build.gradle
-          echo "    project.evaluationDependsOn(':app')" >> build.gradle
-          echo "}" >> build.gradle
-          echo "tasks.register(\"clean\", Delete) {" >> build.gradle
-          echo "    delete rootProject.buildDir" >> build.gradle
-          echo "}" >> build.gradle
-
-          echo "=== android/build.gradle 重写完成 ==="
-          echo "=== 显示新的 android/build.gradle 内容 ==="
-          cat build.gradle
-          # 更新 tdesign-component/example/android/gradle/wrapper/gradle-wrapper.properties
-          cd $GITHUB_WORKSPACE/tdesign-component/example/android/gradle/wrapper
-
-          # 更新 Gradle 版本从 7.6 到 8.4
-          sed -i 's|distributionUrl=https\\://services.gradle.org/distributions/gradle-7.6-all.zip|distributionUrl=https\\://services.gradle.org/distributions/gradle-8.4-all.zip|g' gradle-wrapper.properties
-
-          echo "=== gradle-wrapper.properties 更新完成 ==="
-          echo "=== 显示更新后的 gradle-wrapper.properties 内容 ==="
-          cat gradle-wrapper.properties
-          # 更新 tdesign-component/example/android/settings.gradle
-          cd $GITHUB_WORKSPACE/tdesign-component/example/android
-
-          # 更新 Android Gradle Plugin 版本从 7.3.0 到 8.3.0
-          sed -i 's|id "com.android.application" version "7.3.0" apply false|id "com.android.application" version "8.3.0" apply false|g' settings.gradle
-
-          echo "=== settings.gradle 更新完成 ==="
-          echo "=== 显示更新后的 settings.gradle 内容 ==="
-          cat settings.gradle
       - name: Build Flutter apk
         run: |
           cd $GITHUB_WORKSPACE/tdesign-component/example
@@ -314,7 +173,7 @@ jobs:
         run: |
           npm install --unsafe-perm
           npm run site
-      
+
       - name: Build site Demo
         working-directory: ./tdesign-component/example
         run: |

README.md

@@ -98,6 +98,10 @@ TDesign Flutter depends on the following component libraries. We appreciate the
 
 Contributing is welcome. Read [guidelines for contributing](CONTRIBUTING.md) before submitting your [Pull Request](https://github.com/Tencent/tdesign-flutter/pulls).
 
+<a href="https://github.com/Tencent/tdesign-flutter/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=Tencent/tdesign-flutter" />
+</a>
+
 # Feedback
 
 Create your [Github issues](https://github.com/Tencent/tdesign-flutter/issues) or scan the QR code below to join our user groups.

README_zh_CN.md

@@ -88,9 +88,13 @@ TDesign Flutter 依赖以下组件库，感谢作者的开源贡献：
 - [flutter_slidable](https://pub-web.flutter-io.cn/packages/flutter_slidable)
 - [image_picker](https://pub-web.flutter-io.cn/packages/image_picker)
 
-# Contributing
+# 贡献
 
-Contributing is welcome. Read [guidelines for contributing](CONTRIBUTING.md) before submitting your [Pull Request](https://github.com/Tencent/tdesign-flutter/pulls).
+欢迎贡献代码。在提交 [Pull Request](https://github.com/Tencent/tdesign-flutter/pulls) 之前，请先阅读[贡献指南]((CONTRIBUTING.md))。
+
+<a href="https://github.com/Tencent/tdesign-flutter/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=Tencent/tdesign-flutter" />
+</a>
 
 # 反馈
 

tdesign-component/example/android/app/build.gradle

@@ -40,7 +40,19 @@ if (keystorePropertiesFile.exists()) {
 
 android {
 
-    compileSdkVersion 34
+    // AGP 8.0+ 需要设置包命名空间
+    namespace 'com.tdesign.tdesign_flutter_example'
+
+    compileSdkVersion flutter.compileSdkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -49,8 +61,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.tdesign.tdesign_flutter_example"
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode createVersionCode()
         versionName createVersionName()
     }

tdesign-component/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

tdesign-component/example/android/settings.gradle

@@ -20,8 +20,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0" // 声明式加载插件
-    id "com.android.application" version "7.3.0" apply false // 根据实际 AGP 版本调整
-    id "org.jetbrains.kotlin.android" version "1.9.22" apply false // Kotlin 版本需兼容 AGP
+    id "com.android.application" version "8.6.0" apply false // 根据实际 AGP 版本调整
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false // Kotlin 版本需兼容 AGP
 }
 
 include ":app"

tdesign-component/example/assets/theme.json

@@ -174,5 +174,114 @@
       "grayColor13": "#242424",
       "grayColor14": "#181818"
     }
+  },
+  "dark": {
+    "ref": {
+      "brandLightColor": "brandColor1",
+      "brandFocusColor": "brandColor1",
+      "brandDisabledColor": "brandColor3",
+      "brandHoverColor": "brandColor5",
+      "brandNormalColor": "brandColor8",
+      "brandActiveColor": "brandColor2",
+      "warningNormalColor": "warningColor5",
+      "warningHoverColor": "warningColor4",
+      "warningFocusColor": "warningColor2",
+      "warningActiveColor": "warningColor6",
+      "warningDisabledColor": "warningColor3",
+      "warningLightColor": "warningColor1",
+      "errorNormalColor": "errorColor6",
+      "errorHoverColor": "errorColor5",
+      "errorFocusColor": "errorColor2",
+      "errorActiveColor": "errorColor7",
+      "errorDisabledColor": "errorColor3",
+      "errorLightColor": "errorColor1",
+      "successNormalColor": "successColor5",
+      "successHoverColor": "successColor4",
+      "successFocusColor": "successColor2",
+      "successActiveColor": "successColor6",
+      "successDisabledColor": "successColor3",
+      "successLightColor": "successColor1",
+      "brandColorLightHover": "brandColor2",
+      "warningColorLightHover": "warningColor2",
+      "errorColorLightHover": "errorColor2",
+      "successColorLightHover": "successColor2",
+      "bgColorPage": "grayColor14",
+      "bgColorContainer": "grayColor13",
+      "bgColorContainerHover": "grayColor12",
+      "bgColorContainerActive": "grayColor10",
+      "bgColorContainerSelect": "grayColor9",
+      "bgColorSecondaryContainer": "grayColor12",
+      "bgColorSecondaryContainerHover": "grayColor11",
+      "bgColorSecondaryContainerActive": "grayColor9",
+      "bgColorComponent": "grayColor11",
+      "bgColorComponentHover": "grayColor10",
+      "bgColorComponentActive": "grayColor9",
+      "bgColorComponentDisabled": "grayColor12",
+      "componentStrokeColor": "grayColor11",
+      "componentBorderColor": "grayColor9",
+      "textColorPrimary": "fontWhColor1",
+      "textColorSecondary": "fontWhColor2",
+      "textColorPlaceholder": "fontWhColor3",
+      "textColorDisabled": "fontWhColor4",
+      "textColorAnti": "fontWhColor1",
+      "textColorBrand": "brandColor8",
+      "textColorLink": "brandColor8"
+    },
+    "color": {
+      "brandColor1": "#1b2f51",
+      "brandColor2": "#173463",
+      "brandColor3": "#143975",
+      "brandColor4": "#103d88",
+      "brandColor5": "#0d429a",
+      "brandColor6": "#054bbe",
+      "brandColor7": "#2667d4",
+      "brandColor8": "#4582e6",
+      "brandColor9": "#699ef5",
+      "brandColor10": "#96bbf8",
+      "warningColor1": "#4f2a1d",
+      "warningColor2": "#582f21",
+      "warningColor3": "#733c23",
+      "warningColor4": "#a75d2b",
+      "warningColor5": "#cf6e2d",
+      "warningColor6": "#dc7633",
+      "warningColor7": "#e8935c",
+      "warningColor8": "#ecbf91",
+      "warningColor9": "#eed7bf",
+      "warningColor10": "#f3e9dc",
+      "errorColor1": "#472324",
+      "errorColor2": "#5e2a2d",
+      "errorColor3": "#703439",
+      "errorColor4": "#83383e",
+      "errorColor5": "#a03f46",
+      "errorColor6": "#c64751",
+      "errorColor7": "#de6670",
+      "errorColor8": "#ec888e",
+      "errorColor9": "#edb1b6",
+      "errorColor10": "#eeced0",
+      "successColor1": "#193a2a",
+      "successColor2": "#1a4230",
+      "successColor3": "#17533d",
+      "successColor4": "#0d7a55",
+      "successColor5": "#059465",
+      "successColor6": "#43af8a",
+      "successColor7": "#46bf96",
+      "successColor8": "#80d2b6",
+      "successColor9": "#b4e1d3",
+      "successColor10": "#deede8",
+      "grayColor1": "#f3f3f3",
+      "grayColor2": "#eeeeee",
+      "grayColor3": "#e7e7e7",
+      "grayColor4": "#dcdcdc",
+      "grayColor5": "#c5c5c5",
+      "grayColor6": "#a6a6a6",
+      "grayColor7": "#8b8b8b",
+      "grayColor8": "#77",
+      "grayColor9": "#5e5e5e",
+      "grayColor10": "#4b4b4b",
+      "grayColor11": "#383838",
+      "grayColor12": "#2c2c2c",
+      "grayColor13": "#242424",
+      "grayColor14": "#181818"
+    }
   }
 }

tdesign-component/example/l10n.yaml

@@ -1,3 +1,8 @@
+# 详见 https://docs.flutter.dev/release/breaking-changes/flutter-generate-i10n-source
+# 新版可注释掉synthetic-package，使用旧版则保留
+# 也可参考上述文档执行 flutter config --explicit-package-dependencies
+synthetic-package: false
 arb-dir: lib/l10n
 template-arb-file: app_en.arb
-output-localization-file: app_localizations.dart
+output-localization-file: app_localizations.dart
+#output-dir: lib/l10n