diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 749c220f..fdfbc163 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,10 @@ + +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -21,10 +28,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index b8793d3c..c65f92e5 100644 --- 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-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 44e62bcf..8268e0d3 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -1,11 +1,30 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.3.0" apply false +} + + +include ':app' \ No newline at end of file diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 2dc9f193..ee05c097 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -28,7 +28,7 @@ dependencies: flutter_easyrefresh: ^2.2.1 lpinyin: ^2.0.3 badges: ^2.0.2 - intl: ^0.18.0 + intl: 0.19.0 dev_dependencies: flutter_test: @@ -36,6 +36,7 @@ dev_dependencies: dependency_overrides: bruno: path: ../ + intl: 0.19.0 # For information on the generic Dart part of this file, see the diff --git a/lib/src/components/tabbar/normal/brn_tab_bar.dart b/lib/src/components/tabbar/normal/brn_tab_bar.dart index 366afd8e..a92d3783 100644 --- a/lib/src/components/tabbar/normal/brn_tab_bar.dart +++ b/lib/src/components/tabbar/normal/brn_tab_bar.dart @@ -261,6 +261,7 @@ class BrnTabBarState extends State { widget.tabWidth != null || widget.isScroll; return TabBar( + tabAlignment: _isScrollable ? TabAlignment.start : TabAlignment.fill, tabs: fillWidgetByDataList(_isScrollable), controller: widget.controller, isScrollable: _isScrollable, @@ -273,6 +274,8 @@ class BrnTabBarState extends State { unselectedLabelStyle: widget.unselectedLabelStyle ?? widget.themeData!.unselectedLabelStyle.generateTextStyle(), dragStartBehavior: widget.dragStartBehavior, + dividerColor: Colors.transparent, + dividerHeight: 0, onTap: (index) { if (widget.onTap != null) { widget.onTap!(this, index); @@ -409,7 +412,7 @@ class BrnTabBarState extends State { ), backgroundColor: Colors.red, alignment: Alignment.topLeft, - offset:Offset(_dx,_dy) , + offset: Offset(_dx,_dy), padding: _badgePadding, largeSize: _largeSize, child: Text(