fix theme custom titlestyle not taking effect and upgrade gradle

LianjiaTech · Feb 20, 2024 · 9b889f5 · 9b889f5
1 parent 6d5efd2
commit 9b889f5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/lib/src/components/navbar/brn_appbar.dart b/lib/src/components/navbar/brn_appbar.dart
@@ -221,16 +221,16 @@ class BrnAppBar extends PreferredSize {
   @override
   Widget build(BuildContext context) {
     BrnAppBarConfig _defaultConfig = themeData ?? BrnAppBarConfig();
-    _defaultConfig = _defaultConfig.merge(BrnAppBarConfig(
-        backgroundColor: this.backgroundColor,
-        showDefaultBottom: this.showDefaultBottom,
-        systemUiOverlayStyle: this.systemOverlayStyle));
-
     _defaultConfig = BrnThemeConfigurator.instance
         .getConfig(configId: _defaultConfig.configId)
         .appBarConfig
         .merge(_defaultConfig);
 
+    _defaultConfig = _defaultConfig.merge(BrnAppBarConfig(
+        backgroundColor: this.backgroundColor,
+        showDefaultBottom: this.showDefaultBottom,
+        systemUiOverlayStyle: this.systemOverlayStyle));
+
     useWidgetsBinding().addPostFrameCallback((_) {
       SystemChrome.setSystemUIOverlayStyle(_defaultConfig.systemOverlayStyle);
     });