From 6ac388a0aada16592a0c3cd27503bc751e3c961a Mon Sep 17 00:00:00 2001
From: SimpleLove520 <1960997571@qq.com>
Date: Tue, 3 Sep 2024 14:37:33 +0800
Subject: [PATCH] =?UTF-8?q?Material3=E7=89=B9=E5=AE=9A=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=9C=A8debug=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=BC=9A=E9=97=AA?=
 =?UTF-8?q?=E9=80=80=EF=BC=8C=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD=E5=9C=A8?=
 =?UTF-8?q?debug=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=BD=BF=E7=94=A8Material3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: SimpleLove520 <1960997571@qq.com>
---
 packages/flutter/lib/src/material/theme_data.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 44c0d49855..4b325ac525 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -474,7 +474,7 @@ class ThemeData with Diagnosticable {
     pageTransitionsTheme ??= const PageTransitionsTheme();
     scrollbarTheme ??= const ScrollbarThemeData();
     visualDensity ??= VisualDensity.adaptivePlatformDensity;
-    useMaterial3 = (platform == TargetPlatform.ohos) ? false : (useMaterial3 ?? false);
+    useMaterial3 = (platform == TargetPlatform.ohos && kDebugMode) ? false : (useMaterial3 ?? false);
     final bool useInkSparkle = platform == TargetPlatform.android && !kIsWeb;
     splashFactory ??= useMaterial3
       ? useInkSparkle ? InkSparkle.splashFactory : InkRipple.splashFactory
@@ -2037,7 +2037,7 @@ class ThemeData with Diagnosticable {
       platform: platform ?? this.platform,
       scrollbarTheme: scrollbarTheme ?? this.scrollbarTheme,
       splashFactory: splashFactory ?? this.splashFactory,
-      useMaterial3: ((platform ?? this.platform ) == TargetPlatform.ohos) ? false : (useMaterial3 ?? this.useMaterial3),
+      useMaterial3: ((platform ?? this.platform ) == TargetPlatform.ohos && kDebugMode) ? false : (useMaterial3 ?? this.useMaterial3),
       visualDensity: visualDensity ?? this.visualDensity,
       // COLOR
       canvasColor: canvasColor ?? this.canvasColor,
@@ -2237,7 +2237,7 @@ class ThemeData with Diagnosticable {
       platform: t < 0.5 ? a.platform : b.platform,
       scrollbarTheme: ScrollbarThemeData.lerp(a.scrollbarTheme, b.scrollbarTheme, t),
       splashFactory: t < 0.5 ? a.splashFactory : b.splashFactory,
-      useMaterial3: ((t < 0.5 ? a.platform : b.platform) == TargetPlatform.ohos) ? false : (t < 0.5 ? a.useMaterial3 : b.useMaterial3),
+      useMaterial3: ((t < 0.5 ? a.platform : b.platform) == TargetPlatform.ohos && kDebugMode) ? false : (t < 0.5 ? a.useMaterial3 : b.useMaterial3),
       visualDensity: VisualDensity.lerp(a.visualDensity, b.visualDensity, t),
       // COLOR
       canvasColor: Color.lerp(a.canvasColor, b.canvasColor, t)!,
-- 
Gitee