diff --git a/android/.gradle/4.10.2/fileContent/fileContent.lock b/android/.gradle/4.10.2/fileContent/fileContent.lock index b5d2359e..db4c3e3d 100644 Binary files a/android/.gradle/4.10.2/fileContent/fileContent.lock and b/android/.gradle/4.10.2/fileContent/fileContent.lock differ diff --git a/android/.gradle/4.10.2/fileHashes/fileHashes.bin b/android/.gradle/4.10.2/fileHashes/fileHashes.bin index 5a91455d..da905188 100644 Binary files a/android/.gradle/4.10.2/fileHashes/fileHashes.bin and b/android/.gradle/4.10.2/fileHashes/fileHashes.bin differ diff --git a/android/.gradle/4.10.2/fileHashes/fileHashes.lock b/android/.gradle/4.10.2/fileHashes/fileHashes.lock index 3ac5226b..398ca14e 100644 Binary files a/android/.gradle/4.10.2/fileHashes/fileHashes.lock and b/android/.gradle/4.10.2/fileHashes/fileHashes.lock differ diff --git a/android/.gradle/4.10.2/fileHashes/resourceHashesCache.bin b/android/.gradle/4.10.2/fileHashes/resourceHashesCache.bin index 70cc4e0e..8563e9c3 100644 Binary files a/android/.gradle/4.10.2/fileHashes/resourceHashesCache.bin and b/android/.gradle/4.10.2/fileHashes/resourceHashesCache.bin differ diff --git a/android/.gradle/4.10.2/javaCompile/classAnalysis.bin b/android/.gradle/4.10.2/javaCompile/classAnalysis.bin index 414b3c48..ae15ade4 100644 Binary files a/android/.gradle/4.10.2/javaCompile/classAnalysis.bin and b/android/.gradle/4.10.2/javaCompile/classAnalysis.bin differ diff --git a/android/.gradle/4.10.2/javaCompile/jarAnalysis.bin b/android/.gradle/4.10.2/javaCompile/jarAnalysis.bin index 330c6aa1..0c8e1f9e 100644 Binary files a/android/.gradle/4.10.2/javaCompile/jarAnalysis.bin and b/android/.gradle/4.10.2/javaCompile/jarAnalysis.bin differ diff --git a/android/.gradle/4.10.2/javaCompile/javaCompile.lock b/android/.gradle/4.10.2/javaCompile/javaCompile.lock index 098b7e7b..2706cd6b 100644 Binary files a/android/.gradle/4.10.2/javaCompile/javaCompile.lock and b/android/.gradle/4.10.2/javaCompile/javaCompile.lock differ diff --git a/android/.gradle/4.10.2/javaCompile/taskHistory.bin b/android/.gradle/4.10.2/javaCompile/taskHistory.bin index 179b431f..1000dfb2 100644 Binary files a/android/.gradle/4.10.2/javaCompile/taskHistory.bin and b/android/.gradle/4.10.2/javaCompile/taskHistory.bin differ diff --git a/android/.gradle/4.10.2/taskHistory/taskHistory.bin b/android/.gradle/4.10.2/taskHistory/taskHistory.bin index 75a064e3..4f57d896 100644 Binary files a/android/.gradle/4.10.2/taskHistory/taskHistory.bin and b/android/.gradle/4.10.2/taskHistory/taskHistory.bin differ diff --git a/android/.gradle/4.10.2/taskHistory/taskHistory.lock b/android/.gradle/4.10.2/taskHistory/taskHistory.lock index 39362936..a052b6cd 100644 Binary files a/android/.gradle/4.10.2/taskHistory/taskHistory.lock and b/android/.gradle/4.10.2/taskHistory/taskHistory.lock differ diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 5d44e4d7..62df3d14 100644 Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/android/.gradle/buildOutputCleanup/cache.properties b/android/.gradle/buildOutputCleanup/cache.properties index 27eff02d..4bab3493 100644 --- a/android/.gradle/buildOutputCleanup/cache.properties +++ b/android/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Thu Jul 04 21:27:19 IST 2019 +#Tue Jul 09 18:11:55 IST 2019 gradle.version=4.10.2 diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin index 56d2693f..43724c34 100644 Binary files a/android/.gradle/buildOutputCleanup/outputFiles.bin and b/android/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/android/app/build.gradle b/android/app/build.gradle index 3fa6c170..e8b5522e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.syncfusion.flutter.flutter_examples" + applicationId "com.syncfusion.flutter_examples" minSdkVersion 16 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 38b7f808..3b6b28e7 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.syncfusion.flutter_examples"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 1d496437..e8a793fa 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.syncfusion.flutter_examples"> diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f68..2bd6f4fd 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,2 @@ org.gradle.jvmargs=-Xmx1536M + diff --git a/android/local.properties b/android/local.properties index 23ca7df8..a015ad51 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,5 +1,5 @@ -sdk.dir=C:\\Users\\DharanidharanDharmas\\AppData\\Local\\Android\\sdk -flutter.sdk=D:\\Applications\\Softwares backup\\flutter\\flutter_windows_v1.2.1-stable\\flutter +sdk.dir=/Users/ashwink/Library/Android/sdk +flutter.sdk=/Users/ashwink/Documents/FlutterSDK/flutter flutter.buildMode=debug flutter.versionName=1.0.0 flutter.versionCode=1 \ No newline at end of file diff --git a/images/image_nav_banner_darktheme.png b/images/image_nav_banner_darktheme.png new file mode 100644 index 00000000..9c026e1f Binary files /dev/null and b/images/image_nav_banner_darktheme.png differ diff --git a/images/img_xamarin_ui.png b/images/img_xamarin_ui.png new file mode 100644 index 00000000..850cfe00 Binary files /dev/null and b/images/img_xamarin_ui.png differ diff --git a/images/open_arrow.png b/images/open_arrow.png new file mode 100644 index 00000000..dccc6ab5 Binary files /dev/null and b/images/open_arrow.png differ diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 9367d483..6b4c0f78 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable App CFBundleIdentifier diff --git a/ios/Flutter/Generated.xcconfig b/ios/Flutter/Generated.xcconfig index b1d075b0..d8228160 100644 --- a/ios/Flutter/Generated.xcconfig +++ b/ios/Flutter/Generated.xcconfig @@ -1,6 +1,6 @@ // This is a generated file; do not edit or check into version control. FLUTTER_ROOT=/Users/ashwink/Documents/FlutterSDK/flutter -FLUTTER_APPLICATION_PATH=/Users/ashwink/Downloads/flutter_examples +FLUTTER_APPLICATION_PATH=/Users/ashwink/Desktop/july-9/flutter_examples FLUTTER_TARGET=lib/main.dart FLUTTER_BUILD_DIR=build SYMROOT=${SOURCE_ROOT}/../build/ios diff --git a/ios/Podfile b/ios/Podfile index d077b08b..64ba7492 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -41,7 +41,7 @@ target 'Runner' do # Flutter Pods generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig') if generated_xcode_build_settings.empty? - puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first." + puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first." end generated_xcode_build_settings.map { |p| if p[:name] == 'FLUTTER_FRAMEWORK_DIR' @@ -60,6 +60,9 @@ target 'Runner' do } end +# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system. +install! 'cocoapods', :disable_input_output_paths => true + post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b743fb0f..0b1be805 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -152,7 +152,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0910; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -162,7 +162,7 @@ }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -271,12 +271,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -323,7 +325,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.syncfusion.flutter.flutterExamples; + PRODUCT_BUNDLE_IDENTIFIER = com.syncfusion.flutterExamples; PRODUCT_NAME = "$(TARGET_NAME)"; VERSIONING_SYSTEM = "apple-generic"; }; @@ -343,12 +345,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -397,12 +401,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -448,7 +454,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.syncfusion.flutter.flutterExamples; + PRODUCT_BUNDLE_IDENTIFIER = com.syncfusion.flutterExamples; PRODUCT_NAME = "$(TARGET_NAME)"; VERSIONING_SYSTEM = "apple-generic"; }; @@ -471,7 +477,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.syncfusion.flutter.flutterExamples; + PRODUCT_BUNDLE_IDENTIFIER = com.syncfusion.flutterExamples; PRODUCT_NAME = "$(TARGET_NAME)"; VERSIONING_SYSTEM = "apple-generic"; }; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 786d6aad..a28140cf 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 2f6f5201..c365173e 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/lib/main.dart b/lib/main.dart index a1882fd7..bae1c80f 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_examples/sample_browser.dart'; +import 'package:syncfusion_flutter_core/core.dart'; -main() => runApp(SampleBrowser()); +void main() { + SyncfusionLicense.registerLicense(null); + return runApp(SampleBrowser()); +} diff --git a/lib/model/model.dart b/lib/model/model.dart index 35b5604b..7355ef63 100755 --- a/lib/model/model.dart +++ b/lib/model/model.dart @@ -1387,15 +1387,16 @@ class SampleListModel extends Model { drawerTextIconColor = Colors.white; drawerIconColor = Colors.white; slidingPanelColor = Color.fromRGBO(32, 33, 37, 1); - drawerBackgroundColor = Color.fromRGBO(32, 33, 37, 1); - bottomSheetBackgroundColor = Color.fromRGBO(64, 64, 64, 1); + drawerBackgroundColor = Colors.black; + bottomSheetBackgroundColor = Color.fromRGBO(34, 39, 51, 1); backgroundColor = paletteColor ?? Color.fromRGBO(0, 116, 228, 1); listIconColor = paletteColor ?? Colors.white; searchBoxColor = Colors.white; - listDescriptionTextColor = Colors.white; - textColor = Colors.white; + listDescriptionTextColor = Color.fromRGBO(242,242,242,1); + textColor = Color.fromRGBO(242,242,242,1); theme = Brightness.dark; - cardThemeColor = Colors.black.withOpacity(0.7); + // cardThemeColor = Colors.black.withOpacity(0.7); + cardThemeColor = Color.fromRGBO(23,27,36,1); break; } default: diff --git a/lib/sample_browser.dart b/lib/sample_browser.dart index f24facb2..c7df5afa 100755 --- a/lib/sample_browser.dart +++ b/lib/sample_browser.dart @@ -91,220 +91,208 @@ class _HomePageState extends State { child: ScopedModelDescendant( rebuildOnChange: true, builder: (context, _, model) => MaterialApp( - debugShowCheckedModeBanner: false, - home: SafeArea( - child: Scaffold( - resizeToAvoidBottomPadding: true, - drawer: getSideDrawer(model), - appBar: PreferredSize( - preferredSize: Size.fromHeight(60.0), - child: Container( - decoration: BoxDecoration(boxShadow: [ - BoxShadow( - color: model.backgroundColor, - offset: Offset(0, 2.0), - blurRadius: 0.25, - ) - ]), - child: AppBar( - elevation: 0.0, - backgroundColor: model.backgroundColor, - title: AnimateOpacityWidget( - controller: controller, - opacity: cOpacity, - child: Text('Flutter UI Widgets', - style: TextStyle( - fontSize: 18, - fontFamily: 'MontserratMedium'))), - actions: [ - Padding( - padding: - const EdgeInsets.fromLTRB(0, 0, 10, 0), - child: Container( - height: 40, - width: 40, - child: IconButton( - icon: new Icon(Icons.settings, - color: Colors.white), - onPressed: () { - _showSettingsPanel(model); - }, - ), - ), + debugShowCheckedModeBanner: false, + home: SafeArea( + child: Scaffold( + resizeToAvoidBottomPadding: true, + drawer: getSideDrawer(model), + appBar: PreferredSize( + preferredSize: Size.fromHeight(60.0), + child: Container( + decoration: BoxDecoration(boxShadow: [ + BoxShadow( + color: model.backgroundColor, + offset: Offset(0, 2.0), + blurRadius: 0.25, + ) + ]), + child: AppBar( + elevation: 0.0, + backgroundColor: model.backgroundColor, + title: AnimateOpacityWidget( + controller: controller, + opacity: cOpacity, + child: Text('Flutter UI Widgets', + style: TextStyle( + fontSize: 18, + fontFamily: 'MontserratMedium'))), + actions: [ + Padding( + padding: const EdgeInsets.fromLTRB(0, 0, 10, 0), + child: Container( + height: 40, + width: 40, + child: IconButton( + icon: new Icon(Icons.settings, + color: Colors.white), + onPressed: () { + _showSettingsPanel(model); + }, ), - ], + ), ), - )), - body: Scaffold( - backgroundColor: model.slidingPanelColor, - body: SafeArea( - child: new ListView.builder( - controller: controller, - physics: ClampingScrollPhysics(), - itemCount: 2, - itemBuilder: (context, index) { - return new Material( + ], + ), + )), + body: Scaffold( + backgroundColor: model.slidingPanelColor, + body: SafeArea( + child: new ListView.builder( + controller: controller, + physics: ClampingScrollPhysics(), + itemCount: 2, + itemBuilder: (context, index) { + return new Material( + color: model.backgroundColor, + child: new CustomListView( + header: Container( color: model.backgroundColor, - child: new CustomListView( - header: Container( - color: model.backgroundColor, - child: Column( - children: [ - index != 0 - ? new Container( - color: model.backgroundColor, - height: 100.0, - padding: - new EdgeInsets.symmetric( - horizontal: 0.0), - alignment: - Alignment.centerLeft, - child: Column( - crossAxisAlignment: - CrossAxisAlignment - .stretch, - children: [ - Padding( - padding: - const EdgeInsets - .fromLTRB( - 20, 20, 20, 0), - child: Container( - height: 50, - child: SearchBar( - sampleListModel: - model)), - ), - Padding( - padding: - const EdgeInsets - .fromLTRB( - 0, 10, 0, 0), - child: Container( - height: 20, - width: double - .infinity, - decoration: new BoxDecoration( + child: Column( + children: [ + index != 0 + ? new Container( + color: model.backgroundColor, + height: 100.0, + padding: new EdgeInsets.symmetric( + horizontal: 0.0), + alignment: Alignment.centerLeft, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.stretch, + children: [ + Padding( + padding: const EdgeInsets + .fromLTRB( + 20, 20, 20, 0), + child: Container( + height: 50, + child: SearchBar( + sampleListModel: + model)), + ), + Padding( + padding: const EdgeInsets + .fromLTRB(0, 10, 0, 0), + child: Container( + height: 20, + width: double.infinity, + decoration: new BoxDecoration( + color: model + .slidingPanelColor, + border: Border.all( color: model - .slidingPanelColor, - border: Border.all( - color: model - .slidingPanelColor), - borderRadius: new BorderRadius - .only( - topLeft: const Radius + .slidingPanelColor), + borderRadius: new BorderRadius + .only( + topLeft: + const Radius .circular( 12.0), - topRight: const Radius + topRight: + const Radius .circular( 12.0)), - boxShadow: [ - BoxShadow( - color: model - .slidingPanelColor, - offset: - Offset( - 0, - 2.0), - blurRadius: - 0.25, - ) - ])), - ), - ], - )) - : Container( - height: 0, - color: model.backgroundColor), - ], - ), - ), - content: Container( - color: model.backgroundColor, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - mainAxisAlignment: - MainAxisAlignment.start, - children: [ - Container( - color: model.backgroundColor, - width: double.infinity, - child: index == 0 - ? Padding( - padding: const EdgeInsets - .fromLTRB(20, 0, 0, 0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment - .start, - children: [ - Padding( - padding: - const EdgeInsets - .fromLTRB( - 0, 0, 0, 0), - child: Text( - 'Flutter UI Widgets', - style: TextStyle( - color: Colors - .white, - fontSize: - 25, - letterSpacing: - 0.53, - fontFamily: - 'MontserratBold', - fontWeight: - FontWeight - .bold))), - Padding( - padding: - const EdgeInsets - .fromLTRB( - 0, 12, 0, 0), - child: Text( - 'Fast . Fluid . Flexible', - style: TextStyle( - color: Colors - .white, - fontSize: 14, - letterSpacing: - 0.26, - fontFamily: - 'MontserratBold', - fontWeight: - FontWeight - .normal)), - ), - ], - )) - : Container( - color: - model.slidingPanelColor, - child: Padding( + boxShadow: [ + BoxShadow( + color: model + .slidingPanelColor, + offset: Offset( + 0, 2.0), + blurRadius: + 0.25, + ) + ])), + ), + ], + )) + : Container( + height: 0, + color: model.backgroundColor), + ], + ), + ), + content: Container( + color: model.backgroundColor, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Container( + color: model.backgroundColor, + width: double.infinity, + child: index == 0 + ? Padding( + padding: + const EdgeInsets.fromLTRB( + 20, 0, 0, 0), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Padding( + padding: + const EdgeInsets + .fromLTRB( + 0, 0, 0, 0), + child: Text( + 'Flutter UI Widgets', + style: TextStyle( + color: Colors + .white, + fontSize: 25, + letterSpacing: + 0.53, + fontFamily: + 'MontserratBold', + fontWeight: + FontWeight + .bold))), + Padding( padding: const EdgeInsets .fromLTRB( + 0, 12, 0, 0), + child: Text( + 'Fast . Fluid . Flexible', + style: TextStyle( + color: + Colors.white, + fontSize: 14, + letterSpacing: + 0.26, + fontFamily: + 'MontserratBold', + fontWeight: + FontWeight + .normal)), + ), + ], + )) + : Container( + color: model.slidingPanelColor, + child: Padding( + padding: + const EdgeInsets.fromLTRB( 0, 0, 0, 20), - child: Column( - crossAxisAlignment: - CrossAxisAlignment - .start, - children: - getListViewChildrens( - model)), - )), - ), - ], + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: + getListViewChildrens( + model)), + )), ), - ), + ], ), - ); - }), - ), - )), - ), - ), + ), + ), + ); + }), + ), + )), + ), + ), )); } @@ -331,27 +319,45 @@ class _HomePageState extends State { leading: Image.asset(model.controlList[i].image, fit: BoxFit.cover), title: Row( - mainAxisAlignment:MainAxisAlignment.spaceBetween, - children: [ - Text( - model.controlList[i].title, - textAlign: TextAlign.left, - softWrap: true, - textScaleFactor: 1, - overflow: TextOverflow.fade, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 16.0, - color: model.textColor, - letterSpacing: 0.3, - fontFamily: 'MontserratBold'), - ), - Container( - decoration: BoxDecoration(shape: BoxShape.rectangle,color:model.controlList[i].status == 'New' ? Color.fromRGBO(101,193,0,1): model.controlList[i].status =='Updated' ? Color.fromRGBO(245,166,35,1) : model.controlList[i].status == 'Preview' ? Color.fromRGBO(238,245,255,1) : Colors.transparent, borderRadius: BorderRadius.only(topLeft: Radius.circular(10), bottomLeft: Radius.circular(10))), - padding: EdgeInsets.fromLTRB(7, 3, 6, 3), - child:Text( model.controlList[i].status, style:TextStyle(color:model.controlList[i].status == 'Preview' ? Color.fromRGBO(0,98,255,1):Colors.white,fontSize: 12))) - ]), - + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + model.controlList[i].title, + textAlign: TextAlign.left, + softWrap: true, + textScaleFactor: 1, + overflow: TextOverflow.fade, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16.0, + color: model.textColor, + letterSpacing: 0.3, + fontFamily: 'MontserratBold'), + ), + Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + color: model.controlList[i].status == 'New' + ? Color.fromRGBO(101, 193, 0, 1) + : model.controlList[i].status == 'Updated' + ? Color.fromRGBO( + 245, 166, 35, 1) + : model.controlList[i].status == 'Preview' + ? Color.fromRGBO( + 238, 245, 255, 1) + : Colors.transparent, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + bottomLeft: Radius.circular(10))), + padding: EdgeInsets.fromLTRB(7, 3, 6, 3), + child: Text(model.controlList[i].status, + style: TextStyle( + color: model.controlList[i].status == + 'Preview' + ? Color.fromRGBO(0, 98, 255, 1) + : Colors.white, + fontSize: 12))) + ]), subtitle: Padding( padding: const EdgeInsets.fromLTRB(0.0, 7.0, 0.0, 0.0), @@ -370,7 +376,6 @@ class _HomePageState extends State { ), ), ), - // trailing: ), )))), ), @@ -822,7 +827,7 @@ class _HomePageState extends State { child: Padding( padding: const EdgeInsets.fromLTRB(10, 30, 30, 10), child: Image.asset( - 'images/image_nav_banner_white.png', + 'images/image_nav_banner_darktheme.png', fit: BoxFit.cover), ), ) @@ -854,61 +859,112 @@ class _HomePageState extends State { child: Column( children: [ Padding( - padding: const EdgeInsets.fromLTRB(25, 20, 0, 0), - child: Row(children: [ - Image.asset( - 'images/product.png', - fit: BoxFit.contain, - height: 23.5, - width: 22, - color: _model.drawerIconColor, - ), - Padding( - padding: - const EdgeInsets.fromLTRB(15, 0, 0, 0), + padding: const EdgeInsets.fromLTRB(0, 20, 0, 0), + child: Material( + color: Colors.transparent, child: InkWell( - onTap: () => launch( - 'https://www.syncfusion.com/products/essential-studio'), - child: Text('Product page', - style: TextStyle( - color: _model.drawerTextIconColor, - fontSize: 16, - letterSpacing: 0.4, - fontFamily: 'Roboto-Regular', - fontWeight: FontWeight.normal)), - ), - ) - ]), + splashColor: Colors.grey.withOpacity(0.4), + onTap: () { + Feedback.forLongPress(context); + launch( + 'https://www.syncfusion.com/flutter-widgets'); + }, + child: Padding( + padding: const EdgeInsets.fromLTRB( + 25, 0, 0, 0), + child: Column( + children: [ + Padding( + padding: + const EdgeInsets.only( + top: 10)), + Row(children: [ + Image.asset( + 'images/product.png', + fit: BoxFit.contain, + height: 22, + width: 22, + color: + _model.drawerIconColor), + Padding( + padding: + const EdgeInsets.fromLTRB( + 15, 0, 0, 0), + child: Text('Product page', + style: TextStyle( + color: _model + .drawerTextIconColor, + fontSize: 16, + letterSpacing: 0.4, + fontFamily: + 'Roboto-Regular', + fontWeight: FontWeight + .normal)), + ) + ]), + Padding( + padding: + const EdgeInsets.only( + top: 10)), + ], + )))), ), Padding( - padding: const EdgeInsets.fromLTRB(25, 20, 0, 0), - child: Row(children: [ - Image.asset('images/documentation.png', - fit: BoxFit.contain, - height: 22, - width: 22, - color: _model.drawerIconColor), - Padding( - padding: - const EdgeInsets.fromLTRB(15, 0, 0, 0), + padding: const EdgeInsets.fromLTRB(0, 5, 0, 0), + child: Material( + color: Colors.transparent, child: InkWell( - onTap: () => launch('https://pub.dev/'), - child: Text('Documentation', - style: TextStyle( - color: _model.drawerTextIconColor, - fontSize: 16, - letterSpacing: 0.4, - fontFamily: 'Roboto-Regular', - fontWeight: FontWeight.normal)), - ), - ) - ]), + splashColor: Colors.grey.withOpacity(0.4), + onTap: () { + Feedback.forLongPress(context); + launch( + 'https://help.syncfusion.com/flutter/introduction/overview'); + }, + child: Padding( + padding: const EdgeInsets.fromLTRB( + 25, 0, 0, 0), + child: Column( + children: [ + Padding( + padding: + const EdgeInsets.only( + top: 10)), + Row(children: [ + Image.asset( + 'images/documentation.png', + fit: BoxFit.contain, + height: 22, + width: 22, + color: + _model.drawerIconColor), + Padding( + padding: + const EdgeInsets.fromLTRB( + 15, 0, 0, 0), + child: Text('Documentation', + style: TextStyle( + color: _model + .drawerTextIconColor, + fontSize: 16, + letterSpacing: 0.4, + fontFamily: + 'Roboto-Regular', + fontWeight: FontWeight + .normal)), + ) + ]), + Padding( + padding: + const EdgeInsets.only( + top: 10)), + ], + )))), ), ], ), ), Padding( - padding: const EdgeInsets.fromLTRB(20, 40, 100, 0), + padding: const EdgeInsets.fromLTRB(20, 20, 100, 0), child: Container( height: 2, width: 5, @@ -920,7 +976,7 @@ class _HomePageState extends State { child: Column( children: [ Padding( - padding: const EdgeInsets.fromLTRB(25, 10, 0, 0), + padding: const EdgeInsets.fromLTRB(15, 10, 0, 0), child: Row(children: [ Padding( padding: @@ -936,127 +992,187 @@ class _HomePageState extends State { ]), ), Padding( - padding: const EdgeInsets.fromLTRB(25, 30, 0, 0), - child: Row(children: [ - Image.asset('images/img_xamarin.png', - fit: BoxFit.contain, height: 28, width: 28), - Padding( - padding: - const EdgeInsets.fromLTRB(10, 0, 0, 0), - child: InkWell( - child: Text('Explore Xamarin', - style: TextStyle( - color: _model.drawerTextIconColor, - fontSize: 16, - letterSpacing: 0.4, - fontFamily: 'Roboto-Regular', - fontWeight: FontWeight.normal)), - ), - ), - Padding( - padding: - const EdgeInsets.fromLTRB(10, 0, 0, 0), - child: InkWell( - onTap: () => launch( - 'https://www.syncfusion.com/xamarin-ui-controls?utm_source=play_store&utm_medium=flutter_widgets'), - child: Image.asset('images/external.png', - fit: BoxFit.contain, - color: Colors.blue, - height: 16, - width: 16), - ), - ), - ]), - ), - (Theme.of(context).platform == - TargetPlatform.android) - ? Padding( - padding: - const EdgeInsets.fromLTRB(0, 0, 0, 0), - child: Row(children: [ - Padding( - padding: const EdgeInsets.fromLTRB( - 65, 10, 0, 0), - child: InkWell( - onTap: () => launch( - 'https://play.google.com/store/apps/details?id=com.syncfusion.samplebrowser&hl=en'), - child: Text('View demo', - style: TextStyle( - color: Colors.blue, - fontSize: 16, - letterSpacing: 0.4, - fontFamily: 'Roboto-Regular', - fontWeight: - FontWeight.normal)), + padding: + const EdgeInsets.fromLTRB(0, 15, 0, 0)), + Material( + color: Colors.transparent, + child: InkWell( + splashColor: Colors.grey.withOpacity(0.4), + onTap: () { + Feedback.forLongPress(context); + launch( + 'https://play.google.com/store/apps/details?id=com.syncfusion.samplebrowser&hl=en'); + }, + child: Column( + children: [ + Padding( + padding: + const EdgeInsets.only(top: 10)), + Row( + children: [ + Padding( + padding: + const EdgeInsets.fromLTRB( + 25, 0, 0, 0), + child: Image.asset( + 'images/img_xamarin.png', + fit: BoxFit.contain, + height: 28, + width: 28)), + Container( + padding: + const EdgeInsets.fromLTRB( + 10, 0, 0, 0), + child: Text('Xamarin Demo', + style: TextStyle( + color: _model + .drawerTextIconColor, + fontSize: 16, + letterSpacing: 0.4, + fontFamily: + 'Roboto-Regular', + fontWeight: FontWeight + .normal))), + Spacer(), + Container( + padding: + const EdgeInsets.fromLTRB( + 0, 0, 10, 0), + child: Image.asset( + 'images/open_arrow.png', + fit: BoxFit.contain, + color: _model.paletteColor ?? + Colors.blue, + height: 16, + width: 16), + ), + ], ), - ), - ]), - ) - : Container( - width: 0, - color: Colors.transparent, - ), - Padding( - padding: const EdgeInsets.fromLTRB(25, 30, 0, 0), - child: Row(children: [ - Image.asset('images/img_JS.png', - fit: BoxFit.contain, height: 28, width: 28), - Padding( - padding: - const EdgeInsets.fromLTRB(10, 0, 0, 0), - child: InkWell( - child: Text('Explore JavaScript', - style: TextStyle( - color: _model.drawerTextIconColor, - fontSize: 16, - letterSpacing: 0.4, - fontFamily: 'Roboto-Regular', - fontWeight: FontWeight.normal)), - ), - ), - Padding( - padding: - const EdgeInsets.fromLTRB(10, 0, 0, 0), - child: InkWell( - onTap: () => launch( - 'https://www.syncfusion.com/javascript-ui-controls?utm_source=play_store&utm_medium=flutter_widgets'), - child: Image.asset('images/external.png', - fit: BoxFit.contain, - color: Colors.blue, - height: 16, - width: 16), - ), - ), - ]), - ), - (Theme.of(context).platform == - TargetPlatform.android) - ? Padding( - padding: - const EdgeInsets.fromLTRB(0, 0, 0, 0), - child: Row(children: [ - Padding( - padding: const EdgeInsets.fromLTRB( - 65, 10, 0, 0), - child: InkWell( - onTap: () => launch( - 'https://play.google.com/store/apps/details?id=com.syncfusion.samplebrowser&hl=en'), - child: Text('View demo', - style: TextStyle( - color: Colors.blue, - fontSize: 16, - letterSpacing: 0.4, - fontFamily: 'Roboto-Regular', - fontWeight: - FontWeight.normal)), + Padding( + padding: + const EdgeInsets.only(top: 10)), + ], + ))), + Material( + color: Colors.transparent, + child: InkWell( + splashColor: Colors.grey.withOpacity(0.4), + onTap: () { + Feedback.forLongPress(context); + launch( + 'https://play.google.com/store/apps/details?id=com.syncfusion.xamarin.uikit&hl=en'); + }, + child: Column( + children: [ + Padding( + padding: + const EdgeInsets.only(top: 10)), + Row( + children: [ + Padding( + padding: + const EdgeInsets.fromLTRB( + 25, 0, 0, 0), + child: Image.asset( + 'images/img_xamarin_ui.png', + fit: BoxFit.contain, + height: 28, + width: 28)), + Container( + padding: + const EdgeInsets.fromLTRB( + 10, 0, 0, 0), + child: Text('Xamarin UI kit Demo', + style: TextStyle( + color: _model + .drawerTextIconColor, + fontSize: 16, + letterSpacing: 0.4, + fontFamily: + 'Roboto-Regular', + fontWeight: + FontWeight.normal)), + ), + Spacer(), + Container( + padding: + const EdgeInsets.fromLTRB( + 0, 0, 10, 0), + child: Image.asset( + 'images/open_arrow.png', + fit: BoxFit.contain, + color: _model.paletteColor ?? + Colors.blue, + height: 16, + width: 16), + ), + ], ), - ), - ]), - ) - : Container( - width: 0, - color: Colors.transparent, - ), + Padding( + padding: + const EdgeInsets.only(top: 10)), + ], + ))), + Material( + color: Colors.transparent, + child: InkWell( + splashColor: Colors.grey.withOpacity(0.4), + onTap: () { + Feedback.forLongPress(context); + launch( + 'https://play.google.com/store/apps/details?id=com.Syncfusion.ej2&hl=en'); + }, + child: Column( + children: [ + Padding( + padding: + const EdgeInsets.only(top: 10)), + Row( + children: [ + Padding( + padding: + const EdgeInsets.fromLTRB( + 25, 0, 0, 0), + child: Image.asset( + 'images/img_JS.png', + fit: BoxFit.contain, + height: 28, + width: 28)), + Container( + padding: + const EdgeInsets.fromLTRB( + 10, 0, 0, 0), + child: Text('JavaScript Demo', + style: TextStyle( + color: _model + .drawerTextIconColor, + fontSize: 16, + letterSpacing: 0.4, + fontFamily: + 'Roboto-Regular', + fontWeight: + FontWeight.normal)), + ), + Spacer(), + Container( + padding: + const EdgeInsets.fromLTRB( + 0, 0, 10, 0), + child: Image.asset( + 'images/open_arrow.png', + fit: BoxFit.contain, + color: _model.paletteColor ?? + Colors.blue, + height: 16, + width: 16), + ), + ], + ), + Padding( + padding: + const EdgeInsets.only(top: 10)), + ], + ))), ], ), ), diff --git a/lib/samples/chart/axis_features/axis_crossing/axis_crossing.dart b/lib/samples/chart/axis_features/axis_crossing/axis_crossing.dart index 77ed235f..d5534b1f 100644 --- a/lib/samples/chart/axis_features/axis_crossing/axis_crossing.dart +++ b/lib/samples/chart/axis_features/axis_crossing/axis_crossing.dart @@ -83,6 +83,7 @@ class _AxisCrossingState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color:model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -123,6 +124,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor:model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getAxisCrossingSample(false,_selectedAxisType, crossAt, isPlaceLabelsNearAxisLine)), diff --git a/lib/samples/chart/axis_features/edge_label_placement/edgelabel_placement.dart b/lib/samples/chart/axis_features/edge_label_placement/edgelabel_placement.dart index 5cb41899..1c9c01c2 100755 --- a/lib/samples/chart/axis_features/edge_label_placement/edgelabel_placement.dart +++ b/lib/samples/chart/axis_features/edge_label_placement/edgelabel_placement.dart @@ -79,6 +79,7 @@ class _EdgeLabelState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -112,6 +113,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor:model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/axis_features/handling_label_collision/handling_label_collision.dart b/lib/samples/chart/axis_features/handling_label_collision/handling_label_collision.dart index 6c26505b..0f2ce17c 100755 --- a/lib/samples/chart/axis_features/handling_label_collision/handling_label_collision.dart +++ b/lib/samples/chart/axis_features/handling_label_collision/handling_label_collision.dart @@ -94,6 +94,7 @@ class _LabelActionState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -135,6 +136,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor:model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( @@ -432,7 +434,7 @@ List> getLineSeries(bool isTileView) { xValueMapper: (_ChartData data, _) => data.xVal, yValueMapper: (_ChartData data, _) => data.yVal, dataLabelSettings: DataLabelSettings( - isVisible: true, position: CartesianLabelPosition.top)) + isVisible: true, labelAlignment: ChartDataLabelAlignment.top)) ]; } diff --git a/lib/samples/chart/axis_features/multiple_axis_chart/multiple_axis_chart.dart b/lib/samples/chart/axis_features/multiple_axis_chart/multiple_axis_chart.dart index 4e3220a0..66928ec0 100755 --- a/lib/samples/chart/axis_features/multiple_axis_chart/multiple_axis_chart.dart +++ b/lib/samples/chart/axis_features/multiple_axis_chart/multiple_axis_chart.dart @@ -76,6 +76,7 @@ class _MultipleAxisState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor:model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getMultipleAxisLineChart(false)), diff --git a/lib/samples/chart/axis_features/opposed_axes/opposed_axes.dart b/lib/samples/chart/axis_features/opposed_axes/opposed_axes.dart index aa2be2e1..567df121 100755 --- a/lib/samples/chart/axis_features/opposed_axes/opposed_axes.dart +++ b/lib/samples/chart/axis_features/opposed_axes/opposed_axes.dart @@ -76,6 +76,7 @@ class _NumericOpposedState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color:model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -105,6 +106,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor:model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getOpposedNumericAxisChart(false)), diff --git a/lib/samples/chart/axis_features/plot_band/Plot_band_recurrence.dart b/lib/samples/chart/axis_features/plot_band/Plot_band_recurrence.dart index 6002a7ea..299038ea 100644 --- a/lib/samples/chart/axis_features/plot_band/Plot_band_recurrence.dart +++ b/lib/samples/chart/axis_features/plot_band/Plot_band_recurrence.dart @@ -96,6 +96,7 @@ class _PlotBandRecurrenceState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -130,6 +131,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor:model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 60), child: Container( @@ -354,7 +356,7 @@ SfCartesianChart getPlotBandRecurrenceChart(bool isTileView, repeatUntil: DateTime(2010, 1, 1), start: DateTime(1965, 1, 1), end: DateTime(2010, 1, 1), - shouldRenderAboveSeries:true, + shouldRenderAboveSeries:false, color: Color.fromRGBO(227, 228, 230, 0.4)) ]), primaryYAxis: NumericAxis( @@ -371,7 +373,7 @@ SfCartesianChart getPlotBandRecurrenceChart(bool isTileView, start: 0, end: 18000, repeatUntil: 18000, - shouldRenderAboveSeries:true, + shouldRenderAboveSeries:false, color: Color.fromRGBO(227, 228, 230, 0.1)) ], majorGridLines: MajorGridLines(color: Colors.grey), diff --git a/lib/samples/chart/axis_features/plot_band/plot_band.dart b/lib/samples/chart/axis_features/plot_band/plot_band.dart index 92bbbeee..33d5b998 100644 --- a/lib/samples/chart/axis_features/plot_band/plot_band.dart +++ b/lib/samples/chart/axis_features/plot_band/plot_band.dart @@ -97,6 +97,7 @@ class _PlotBandDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -140,6 +141,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 60), child: Container( @@ -386,7 +388,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, start: -0.5, end: 1.5, text: 'Winter', - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, textStyle: ChartTextStyle(color: Colors.black, fontSize: 13), color: const Color.fromRGBO(101, 199, 209, 1)), PlotBand( @@ -394,7 +396,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, start: 4.5, end: 7.5, text: 'Summer', - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, textStyle: ChartTextStyle(color: Colors.black, fontSize: 13), color: const Color.fromRGBO(254, 213, 2, 1)), PlotBand( @@ -402,7 +404,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, start: 1.5, end: 4.5, text: 'Spring', - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, textStyle: ChartTextStyle(color: Colors.black, fontSize: 13), color: const Color.fromRGBO(140, 198, 62, 1)), PlotBand( @@ -410,7 +412,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, start: 7.5, end: 9.5, text: 'Autumn', - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, textStyle: ChartTextStyle(color: Colors.black, fontSize: 13), color: const Color.fromRGBO(217, 112, 1, 1)), PlotBand( @@ -419,7 +421,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, end: 10.5, text: 'Winter', textStyle: ChartTextStyle(color: Colors.black, fontSize: 13), - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, color: const Color.fromRGBO(101, 199, 209, 1)), PlotBand( size: 2, @@ -431,7 +433,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, associatedAxisEnd: 27.5, isVisible: isTileView ? false : isSegment, color: const Color.fromRGBO(224, 155, 0, 1), - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, textStyle: ChartTextStyle(color: Colors.white, fontSize: 17)), PlotBand( start: 7.5, @@ -443,7 +445,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, textAngle: 0, isVisible: isTileView ? false : isSegment, color: const Color.fromRGBO(224, 155, 0, 1), - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, textStyle: ChartTextStyle(color: Colors.white, fontSize: 17)), PlotBand( start: 4.5, @@ -455,7 +457,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, textAngle: 0, isVisible: isTileView ? false : isSegment, color: const Color.fromRGBO(207, 85, 7, 1), - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, textStyle: ChartTextStyle(color: Colors.white, fontSize: 17)), ], majorGridLines: MajorGridLines(width: 0)), primaryYAxis: NumericAxis( @@ -470,7 +472,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, start: 30, end: 40, text: 'High Temperature', - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, color: const Color.fromRGBO(207, 85, 7, 1), textStyle: ChartTextStyle(color: Color.fromRGBO(255, 255, 255, 1))), PlotBand( @@ -478,7 +480,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, start: 20, end: 30, text: 'Average Temperature', - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, color: const Color.fromRGBO(224, 155, 0, 1), textStyle: ChartTextStyle(color: Color.fromRGBO(255, 255, 255, 1))), PlotBand( @@ -486,7 +488,7 @@ SfCartesianChart getPlotBandChart(bool isTileView, start: 10, end: 20, text: 'Low Temperature', - shouldRenderAboveSeries: true, + shouldRenderAboveSeries: false, color: const Color.fromRGBO(237, 195, 12, 1)) ], ), diff --git a/lib/samples/chart/axis_types/category_types/default_category_axis.dart b/lib/samples/chart/axis_types/category_types/default_category_axis.dart index 2ca17fa9..d76cb816 100755 --- a/lib/samples/chart/axis_types/category_types/default_category_axis.dart +++ b/lib/samples/chart/axis_types/category_types/default_category_axis.dart @@ -75,6 +75,7 @@ class _CategoryDefaultState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultCategoryAxisChart(false)), diff --git a/lib/samples/chart/axis_types/category_types/indexed_category_axis.dart b/lib/samples/chart/axis_types/category_types/indexed_category_axis.dart index 442562fd..20412739 100755 --- a/lib/samples/chart/axis_types/category_types/indexed_category_axis.dart +++ b/lib/samples/chart/axis_types/category_types/indexed_category_axis.dart @@ -95,6 +95,7 @@ class _CategoryIndexedState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -124,6 +125,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/axis_types/category_types/label_placement.dart b/lib/samples/chart/axis_types/category_types/label_placement.dart index c8ed6bc3..5d2c71cf 100755 --- a/lib/samples/chart/axis_types/category_types/label_placement.dart +++ b/lib/samples/chart/axis_types/category_types/label_placement.dart @@ -79,6 +79,7 @@ class _CategoryTicksState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -114,6 +115,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/axis_types/date_time_types/date_time_axis_with_label_format.dart b/lib/samples/chart/axis_types/date_time_types/date_time_axis_with_label_format.dart index 5891fec4..28e2a8f5 100755 --- a/lib/samples/chart/axis_types/date_time_types/date_time_axis_with_label_format.dart +++ b/lib/samples/chart/axis_types/date_time_types/date_time_axis_with_label_format.dart @@ -77,6 +77,7 @@ class _DateTimeLabelState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -102,6 +103,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getLabelDateTimeAxisChart(false)), diff --git a/lib/samples/chart/axis_types/date_time_types/default_date_time_axis.dart b/lib/samples/chart/axis_types/date_time_types/default_date_time_axis.dart index 2e3e2062..7a708575 100755 --- a/lib/samples/chart/axis_types/date_time_types/default_date_time_axis.dart +++ b/lib/samples/chart/axis_types/date_time_types/default_date_time_axis.dart @@ -76,6 +76,7 @@ class _DateTimeDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultDateTimeAxisChart(false)), diff --git a/lib/samples/chart/axis_types/logarithmic_types/default_logarithmic_axis.dart b/lib/samples/chart/axis_types/logarithmic_types/default_logarithmic_axis.dart index e5b33a8d..21c58b3f 100644 --- a/lib/samples/chart/axis_types/logarithmic_types/default_logarithmic_axis.dart +++ b/lib/samples/chart/axis_types/logarithmic_types/default_logarithmic_axis.dart @@ -80,6 +80,7 @@ class _LogarithmicAxisDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -107,6 +108,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultLogarithmicAxisChart(false)), diff --git a/lib/samples/chart/axis_types/logarithmic_types/inversed_logarithmic_axis.dart b/lib/samples/chart/axis_types/logarithmic_types/inversed_logarithmic_axis.dart index d802da8c..950826a9 100644 --- a/lib/samples/chart/axis_types/logarithmic_types/inversed_logarithmic_axis.dart +++ b/lib/samples/chart/axis_types/logarithmic_types/inversed_logarithmic_axis.dart @@ -81,6 +81,7 @@ class _LogarithmicAxisInversedState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -107,6 +108,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getInversedLogarithmicAxisChart(false)), diff --git a/lib/samples/chart/axis_types/numeric_types/default_numeric_axis.dart b/lib/samples/chart/axis_types/numeric_types/default_numeric_axis.dart index 9f929e8f..54bbd2f3 100755 --- a/lib/samples/chart/axis_types/numeric_types/default_numeric_axis.dart +++ b/lib/samples/chart/axis_types/numeric_types/default_numeric_axis.dart @@ -76,6 +76,7 @@ class _NumericDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -104,6 +105,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultNumericAxisChart(false)), diff --git a/lib/samples/chart/axis_types/numeric_types/inversed_numeric_axis.dart b/lib/samples/chart/axis_types/numeric_types/inversed_numeric_axis.dart index 0ce9f92b..d1ed628c 100755 --- a/lib/samples/chart/axis_types/numeric_types/inversed_numeric_axis.dart +++ b/lib/samples/chart/axis_types/numeric_types/inversed_numeric_axis.dart @@ -79,6 +79,7 @@ class _NumericInverseState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -106,6 +107,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/axis_types/numeric_types/numeric_axis_with_label_format.dart b/lib/samples/chart/axis_types/numeric_types/numeric_axis_with_label_format.dart index cfeeff58..e3186d45 100755 --- a/lib/samples/chart/axis_types/numeric_types/numeric_axis_with_label_format.dart +++ b/lib/samples/chart/axis_types/numeric_types/numeric_axis_with_label_format.dart @@ -76,6 +76,7 @@ class _NumericLabelState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getLabelNumericAxisChart(false)), diff --git a/lib/samples/chart/cartesian_charts/area_series/area_with_emptypoints.dart b/lib/samples/chart/cartesian_charts/area_series/area_with_emptypoints.dart index 25c6b7c6..73618e09 100755 --- a/lib/samples/chart/cartesian_charts/area_series/area_with_emptypoints.dart +++ b/lib/samples/chart/cartesian_charts/area_series/area_with_emptypoints.dart @@ -94,6 +94,7 @@ class _AreaEmptyState extends State { //frontHeader: model.panelTitle(context), headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -118,6 +119,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getEmptyPointAreaChart(false)), diff --git a/lib/samples/chart/cartesian_charts/area_series/area_with_gradient.dart b/lib/samples/chart/cartesian_charts/area_series/area_with_gradient.dart index dc072320..7120dd8d 100755 --- a/lib/samples/chart/cartesian_charts/area_series/area_with_gradient.dart +++ b/lib/samples/chart/cartesian_charts/area_series/area_with_gradient.dart @@ -77,6 +77,7 @@ class _AreaGradientState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -102,6 +103,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getGradientAreaChart(false)), diff --git a/lib/samples/chart/cartesian_charts/area_series/default_area_chart.dart b/lib/samples/chart/cartesian_charts/area_series/default_area_chart.dart index 752045e3..0389a2ad 100755 --- a/lib/samples/chart/cartesian_charts/area_series/default_area_chart.dart +++ b/lib/samples/chart/cartesian_charts/area_series/default_area_chart.dart @@ -77,6 +77,7 @@ class _AreaDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -102,6 +103,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultAreaChart(false)), diff --git a/lib/samples/chart/cartesian_charts/area_series/vertical_area_chart.dart b/lib/samples/chart/cartesian_charts/area_series/vertical_area_chart.dart index 688c1d5e..639d6838 100755 --- a/lib/samples/chart/cartesian_charts/area_series/vertical_area_chart.dart +++ b/lib/samples/chart/cartesian_charts/area_series/vertical_area_chart.dart @@ -76,6 +76,7 @@ class _AreaVerticalState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -100,6 +101,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getVerticalAreaChart(false)), diff --git a/lib/samples/chart/cartesian_charts/bar_series/bar_width_and_spacing.dart b/lib/samples/chart/cartesian_charts/bar_series/bar_width_and_spacing.dart index 1ada380f..f24f9231 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/bar_width_and_spacing.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/bar_width_and_spacing.dart @@ -92,6 +92,7 @@ class _BarSpacingState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -121,6 +122,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/cartesian_charts/bar_series/bar_with_rounded_corners.dart b/lib/samples/chart/cartesian_charts/bar_series/bar_with_rounded_corners.dart index 463c98c8..d18a18ab 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/bar_with_rounded_corners.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/bar_with_rounded_corners.dart @@ -78,7 +78,8 @@ class _BarRoundedState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, - titleVisibleOnPanelClosed: true, + titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -104,6 +105,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getRoundedBarChart(false)), diff --git a/lib/samples/chart/cartesian_charts/bar_series/bar_with_track.dart b/lib/samples/chart/cartesian_charts/bar_series/bar_with_track.dart index 5533f2f6..31cce29b 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/bar_with_track.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/bar_with_track.dart @@ -94,6 +94,7 @@ class _BarTrackerState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -119,6 +120,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getTrackerBarChart(false)), @@ -239,7 +241,7 @@ List> getBarSeries(bool isTileView) { trackColor: Color.fromRGBO(198, 201, 207, 1), isTrackVisible: true, dataLabelSettings: DataLabelSettings( - isVisible: true, position: CartesianLabelPosition.top), + isVisible: true, labelAlignment: ChartDataLabelAlignment.top), xValueMapper: (_TrackerData sales, _) => sales.employeeName, yValueMapper: (_TrackerData sales, _) => sales.hours, ), diff --git a/lib/samples/chart/cartesian_charts/bar_series/customized_bar_chart.dart b/lib/samples/chart/cartesian_charts/bar_series/customized_bar_chart.dart index c59c95a9..22d63781 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/customized_bar_chart.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/customized_bar_chart.dart @@ -97,6 +97,7 @@ class _BarCustomizationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -126,6 +127,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getCustomizedBarChart(false)), diff --git a/lib/samples/chart/cartesian_charts/bar_series/default_bar_chart.dart b/lib/samples/chart/cartesian_charts/bar_series/default_bar_chart.dart index b8763ecb..53ef3e88 100755 --- a/lib/samples/chart/cartesian_charts/bar_series/default_bar_chart.dart +++ b/lib/samples/chart/cartesian_charts/bar_series/default_bar_chart.dart @@ -79,6 +79,7 @@ class _BarDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -104,6 +105,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultBarChart(false)), diff --git a/lib/samples/chart/cartesian_charts/bubble_series/bubble_filled_with_gradient.dart b/lib/samples/chart/cartesian_charts/bubble_series/bubble_filled_with_gradient.dart index 80abf08c..bcf589f0 100755 --- a/lib/samples/chart/cartesian_charts/bubble_series/bubble_filled_with_gradient.dart +++ b/lib/samples/chart/cartesian_charts/bubble_series/bubble_filled_with_gradient.dart @@ -94,6 +94,7 @@ class _BubbleGradientState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -119,6 +120,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getGradientBubbleChart(false)), diff --git a/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_multiple_series.dart b/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_multiple_series.dart index a354db97..b2359d3d 100755 --- a/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_multiple_series.dart +++ b/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_multiple_series.dart @@ -78,6 +78,7 @@ class _BubbleMultiSeriesState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -103,6 +104,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getMultipleSeriesBubbleChart(false)), diff --git a/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_various_colors.dart b/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_various_colors.dart index a2e122e2..f877a965 100755 --- a/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_various_colors.dart +++ b/lib/samples/chart/cartesian_charts/bubble_series/bubble_with_various_colors.dart @@ -79,6 +79,7 @@ class _BubblePointColorState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -104,6 +105,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getPointColorBubbleChart(false)), diff --git a/lib/samples/chart/cartesian_charts/bubble_series/default_bubble_chart.dart b/lib/samples/chart/cartesian_charts/bubble_series/default_bubble_chart.dart index 33b201e5..3fe78c48 100755 --- a/lib/samples/chart/cartesian_charts/bubble_series/default_bubble_chart.dart +++ b/lib/samples/chart/cartesian_charts/bubble_series/default_bubble_chart.dart @@ -78,6 +78,7 @@ class _BubbleDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -103,6 +104,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultBubbleChart(false)), diff --git a/lib/samples/chart/cartesian_charts/column_series/back_to_back_column.dart b/lib/samples/chart/cartesian_charts/column_series/back_to_back_column.dart index ea9f9e96..1e010b2c 100755 --- a/lib/samples/chart/cartesian_charts/column_series/back_to_back_column.dart +++ b/lib/samples/chart/cartesian_charts/column_series/back_to_back_column.dart @@ -93,6 +93,7 @@ class _ColumnBackState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -120,6 +121,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getBackColumnChart(false)), diff --git a/lib/samples/chart/cartesian_charts/column_series/column_width_and_spacing.dart b/lib/samples/chart/cartesian_charts/column_series/column_width_and_spacing.dart index 76421914..fde09467 100755 --- a/lib/samples/chart/cartesian_charts/column_series/column_width_and_spacing.dart +++ b/lib/samples/chart/cartesian_charts/column_series/column_width_and_spacing.dart @@ -96,6 +96,7 @@ class _ColumnSpacingState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color:model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -126,6 +127,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/cartesian_charts/column_series/column_with_rounded_corners.dart b/lib/samples/chart/cartesian_charts/column_series/column_with_rounded_corners.dart index fdd36d7d..f3d72172 100755 --- a/lib/samples/chart/cartesian_charts/column_series/column_with_rounded_corners.dart +++ b/lib/samples/chart/cartesian_charts/column_series/column_with_rounded_corners.dart @@ -79,6 +79,7 @@ class _ColumnRoundedState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -104,6 +105,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getRoundedColumnChart(false)), @@ -221,7 +223,7 @@ SfCartesianChart getRoundedColumnChart(bool isTileView) { primaryXAxis: CategoryAxis( labelStyle: ChartTextStyle(color: Colors.white), axisLine: AxisLine(width: 0), - labelPosition: LabelPosition.inside, + labelPosition: ChartDataLabelPosition.inside, majorTickLines: MajorTickLines(width: 0), majorGridLines: MajorGridLines(width: 0), ), @@ -248,7 +250,7 @@ List> getColumnSeries(bool isTileView) { enableTooltip: true, width: 0.9, dataLabelSettings: DataLabelSettings( - isVisible: true, position: CartesianLabelPosition.top), + isVisible: true, labelAlignment: ChartDataLabelAlignment.top), dataSource: chartData, borderRadius: BorderRadius.circular(10), xValueMapper: (_ChartData sales, _) => sales.x, diff --git a/lib/samples/chart/cartesian_charts/column_series/column_with_track.dart b/lib/samples/chart/cartesian_charts/column_series/column_with_track.dart index ee089b0f..9a7e1bc8 100755 --- a/lib/samples/chart/cartesian_charts/column_series/column_with_track.dart +++ b/lib/samples/chart/cartesian_charts/column_series/column_with_track.dart @@ -94,6 +94,7 @@ class _ColumnTrackerState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -119,6 +120,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getTrackerColumnChart(false)), @@ -245,7 +247,7 @@ List> getTracker(bool isTileView) { name: 'Marks', dataLabelSettings: DataLabelSettings( isVisible: true, - position: CartesianLabelPosition.top, + labelAlignment: ChartDataLabelAlignment.top, textStyle: ChartTextStyle(fontSize: 10, color: Colors.white))) ]; } diff --git a/lib/samples/chart/cartesian_charts/column_series/customized_column_chart.dart b/lib/samples/chart/cartesian_charts/column_series/customized_column_chart.dart index 8f789f4b..fec9534f 100755 --- a/lib/samples/chart/cartesian_charts/column_series/customized_column_chart.dart +++ b/lib/samples/chart/cartesian_charts/column_series/customized_column_chart.dart @@ -95,6 +95,7 @@ class _ColumnVerticalState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -120,6 +121,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getVerticalColumnChart(false)), @@ -259,7 +261,7 @@ List> getVerticalData(bool isTileView) { enableTooltip: true, isTrackVisible: false, dataLabelSettings: DataLabelSettings( - isVisible: true, position: CartesianLabelPosition.middle), + isVisible: true, labelAlignment: ChartDataLabelAlignment.middle), dataSource: chartData, width: 0.8, xValueMapper: (_ChartData sales, _) => sales.x, diff --git a/lib/samples/chart/cartesian_charts/column_series/default_column_chart.dart b/lib/samples/chart/cartesian_charts/column_series/default_column_chart.dart index e37857f1..b7e11f15 100755 --- a/lib/samples/chart/cartesian_charts/column_series/default_column_chart.dart +++ b/lib/samples/chart/cartesian_charts/column_series/default_column_chart.dart @@ -79,6 +79,7 @@ class _ColumnDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -106,6 +107,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultColumnChart(false)), diff --git a/lib/samples/chart/cartesian_charts/line_series/customized_line_chart.dart b/lib/samples/chart/cartesian_charts/line_series/customized_line_chart.dart index 29a934bd..40f56a46 100755 --- a/lib/samples/chart/cartesian_charts/line_series/customized_line_chart.dart +++ b/lib/samples/chart/cartesian_charts/line_series/customized_line_chart.dart @@ -83,6 +83,7 @@ class _LineDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -111,6 +112,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getCustomizedLineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/line_series/default_line_chart.dart b/lib/samples/chart/cartesian_charts/line_series/default_line_chart.dart index 4c98e537..0355ef0d 100755 --- a/lib/samples/chart/cartesian_charts/line_series/default_line_chart.dart +++ b/lib/samples/chart/cartesian_charts/line_series/default_line_chart.dart @@ -92,6 +92,7 @@ class _LineDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -120,6 +121,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor:model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultLineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/line_series/line_with_dashes.dart b/lib/samples/chart/cartesian_charts/line_series/line_with_dashes.dart index f8bd2549..f8baa035 100755 --- a/lib/samples/chart/cartesian_charts/line_series/line_with_dashes.dart +++ b/lib/samples/chart/cartesian_charts/line_series/line_with_dashes.dart @@ -90,6 +90,7 @@ class _LineDashedState extends State { backLayer: BackPanel(sample), frontLayer: FrontPanel(sample), sideDrawer: null, + color: model.cardThemeColor, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( @@ -117,6 +118,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDashedLineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/line_series/multi_colored_line.dart b/lib/samples/chart/cartesian_charts/line_series/multi_colored_line.dart index 37286891..4e04ec1f 100755 --- a/lib/samples/chart/cartesian_charts/line_series/multi_colored_line.dart +++ b/lib/samples/chart/cartesian_charts/line_series/multi_colored_line.dart @@ -94,6 +94,7 @@ class _LineMultiColorState extends State { //frontHeader: model.panelTitle(context), headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -121,6 +122,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getMultiColorLineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/rangecolumn_series/default_rangecolumn_chart.dart b/lib/samples/chart/cartesian_charts/rangecolumn_series/default_rangecolumn_chart.dart index 7ddc12c4..a2b15fe5 100644 --- a/lib/samples/chart/cartesian_charts/rangecolumn_series/default_rangecolumn_chart.dart +++ b/lib/samples/chart/cartesian_charts/rangecolumn_series/default_rangecolumn_chart.dart @@ -79,6 +79,7 @@ class _RangeColumnDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -106,6 +107,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultRangeColumnChart(false)), @@ -258,7 +260,7 @@ List> getRangeColumnSeries( highValueMapper: (_ChartData sales, _) => sales.high, dataLabelSettings: DataLabelSettings( isVisible: isTileView ? false : true, - position: CartesianLabelPosition.top, + labelAlignment: ChartDataLabelAlignment.top, textStyle: ChartTextStyle(fontSize: 10)), ) ]; diff --git a/lib/samples/chart/cartesian_charts/rangecolumn_series/rangecolumn_with_track.dart b/lib/samples/chart/cartesian_charts/rangecolumn_series/rangecolumn_with_track.dart index e5443eb6..ee557b53 100644 --- a/lib/samples/chart/cartesian_charts/rangecolumn_series/rangecolumn_with_track.dart +++ b/lib/samples/chart/cartesian_charts/rangecolumn_series/rangecolumn_with_track.dart @@ -80,6 +80,7 @@ class _RangeColumnWithTrackState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -107,6 +108,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getRangeColumnwithTrack(false)), @@ -232,7 +234,7 @@ List> getRangeColumnSeries( lowValueMapper: (_ChartData sales, _) => sales.low, highValueMapper: (_ChartData sales, _) => sales.high, dataLabelSettings: DataLabelSettings( - isVisible: !isTileView, position: CartesianLabelPosition.top)) + isVisible: !isTileView, labelAlignment: ChartDataLabelAlignment.top)) ]; } diff --git a/lib/samples/chart/cartesian_charts/rangecolumn_series/vertical_rangecolumn_chart.dart b/lib/samples/chart/cartesian_charts/rangecolumn_series/vertical_rangecolumn_chart.dart index 7399649e..0a448a7a 100644 --- a/lib/samples/chart/cartesian_charts/rangecolumn_series/vertical_rangecolumn_chart.dart +++ b/lib/samples/chart/cartesian_charts/rangecolumn_series/vertical_rangecolumn_chart.dart @@ -78,6 +78,7 @@ class _RangeBarChartState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -106,6 +107,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getRangeBarChart(false)), @@ -256,7 +258,7 @@ List> getRangeColumnSeries( highValueMapper: (_ChartData sales, _) => sales.highSyd, name: 'Sydney', dataLabelSettings: DataLabelSettings( - isVisible: !isTileView, position: CartesianLabelPosition.top)), + isVisible: !isTileView, labelAlignment: ChartDataLabelAlignment.top)), RangeColumnSeries<_ChartData, String>( enableTooltip: true, dataSource: chartData, @@ -265,7 +267,7 @@ List> getRangeColumnSeries( highValueMapper: (_ChartData sales, _) => sales.highMel, name: 'Melbourne', dataLabelSettings: DataLabelSettings( - isVisible: !isTileView, position: CartesianLabelPosition.top)) + isVisible: !isTileView, labelAlignment: ChartDataLabelAlignment.top)) ]; } diff --git a/lib/samples/chart/cartesian_charts/scatter_series/default_scatter_chart.dart b/lib/samples/chart/cartesian_charts/scatter_series/default_scatter_chart.dart index eb7d1714..4093c986 100755 --- a/lib/samples/chart/cartesian_charts/scatter_series/default_scatter_chart.dart +++ b/lib/samples/chart/cartesian_charts/scatter_series/default_scatter_chart.dart @@ -78,6 +78,7 @@ class _ScatterDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -103,6 +104,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultScatterChart(false)), diff --git a/lib/samples/chart/cartesian_charts/scatter_series/scatter_with_various_shapes.dart b/lib/samples/chart/cartesian_charts/scatter_series/scatter_with_various_shapes.dart index 16fa73fc..9b2abab6 100755 --- a/lib/samples/chart/cartesian_charts/scatter_series/scatter_with_various_shapes.dart +++ b/lib/samples/chart/cartesian_charts/scatter_series/scatter_with_various_shapes.dart @@ -93,6 +93,7 @@ class _ScatterShapesState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -119,6 +120,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getShapesScatterChart(false)), diff --git a/lib/samples/chart/cartesian_charts/spline_series/customized_spline_chart.dart b/lib/samples/chart/cartesian_charts/spline_series/customized_spline_chart.dart index 34b133f4..ea1163ac 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/customized_spline_chart.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/customized_spline_chart.dart @@ -83,6 +83,7 @@ class _SplineVerticalState extends State { //frontHeader: model.panelTitle(context), headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -110,6 +111,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getCustomizedSplineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/spline_series/default_spline_chart.dart b/lib/samples/chart/cartesian_charts/spline_series/default_spline_chart.dart index 0bae53da..04d9d647 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/default_spline_chart.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/default_spline_chart.dart @@ -78,6 +78,7 @@ class _SplineDefaultState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -105,6 +106,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultSplineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/spline_series/spline_types.dart b/lib/samples/chart/cartesian_charts/spline_series/spline_types.dart index 791a04c3..04e868b1 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/spline_types.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/spline_types.dart @@ -97,6 +97,7 @@ class _SplineTypesState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -130,6 +131,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getTypesSplineChart(false, _spline)), diff --git a/lib/samples/chart/cartesian_charts/spline_series/spline_with_dashes.dart b/lib/samples/chart/cartesian_charts/spline_series/spline_with_dashes.dart index 67591128..502010a5 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/spline_with_dashes.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/spline_with_dashes.dart @@ -80,6 +80,7 @@ class _SplineDashedState extends State { //frontHeader: model.panelTitle(context), headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -105,6 +106,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDashedSplineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/spline_series/vertical_spline_chart.dart b/lib/samples/chart/cartesian_charts/spline_series/vertical_spline_chart.dart index feb6a711..033933f2 100755 --- a/lib/samples/chart/cartesian_charts/spline_series/vertical_spline_chart.dart +++ b/lib/samples/chart/cartesian_charts/spline_series/vertical_spline_chart.dart @@ -78,6 +78,7 @@ class _SplineVerticalState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -105,6 +106,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getVerticalSplineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/stacked_series/stacked_area_chart.dart b/lib/samples/chart/cartesian_charts/stacked_series/stacked_area_chart.dart index e678ced3..ba650e7f 100644 --- a/lib/samples/chart/cartesian_charts/stacked_series/stacked_area_chart.dart +++ b/lib/samples/chart/cartesian_charts/stacked_series/stacked_area_chart.dart @@ -80,6 +80,7 @@ class _StackedAreaChartState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -107,6 +108,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getStackedAreaChart(false)), diff --git a/lib/samples/chart/cartesian_charts/stacked_series/stacked_bar_chart.dart b/lib/samples/chart/cartesian_charts/stacked_series/stacked_bar_chart.dart index 4f15e1b9..c076687f 100644 --- a/lib/samples/chart/cartesian_charts/stacked_series/stacked_bar_chart.dart +++ b/lib/samples/chart/cartesian_charts/stacked_series/stacked_bar_chart.dart @@ -79,6 +79,7 @@ class _StackedBarChartState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -106,6 +107,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getStackedBarChart(false)), diff --git a/lib/samples/chart/cartesian_charts/stacked_series/stacked_column_chart.dart b/lib/samples/chart/cartesian_charts/stacked_series/stacked_column_chart.dart index 89021439..91747c66 100644 --- a/lib/samples/chart/cartesian_charts/stacked_series/stacked_column_chart.dart +++ b/lib/samples/chart/cartesian_charts/stacked_series/stacked_column_chart.dart @@ -79,6 +79,7 @@ class _StackedColumnChartState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -106,6 +107,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getStackedColumnChart(false)), diff --git a/lib/samples/chart/cartesian_charts/stacked_series/stacked_line_chart.dart b/lib/samples/chart/cartesian_charts/stacked_series/stacked_line_chart.dart index ed4d8a99..192605ce 100644 --- a/lib/samples/chart/cartesian_charts/stacked_series/stacked_line_chart.dart +++ b/lib/samples/chart/cartesian_charts/stacked_series/stacked_line_chart.dart @@ -79,6 +79,7 @@ class _StackedLineChartState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -106,6 +107,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getStackedLineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/stepLine_series/default_stepline_chart.dart b/lib/samples/chart/cartesian_charts/stepLine_series/default_stepline_chart.dart index 95695ae1..f7c11772 100755 --- a/lib/samples/chart/cartesian_charts/stepLine_series/default_stepline_chart.dart +++ b/lib/samples/chart/cartesian_charts/stepLine_series/default_stepline_chart.dart @@ -78,6 +78,7 @@ class _StepLineDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -103,6 +104,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultStepLineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/stepLine_series/stepline_with_dashes.dart b/lib/samples/chart/cartesian_charts/stepLine_series/stepline_with_dashes.dart index 28d5746e..3843cc26 100755 --- a/lib/samples/chart/cartesian_charts/stepLine_series/stepline_with_dashes.dart +++ b/lib/samples/chart/cartesian_charts/stepLine_series/stepline_with_dashes.dart @@ -94,6 +94,7 @@ class _StepLineDashedState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -119,6 +120,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDashedStepLineChart(false)), diff --git a/lib/samples/chart/cartesian_charts/stepLine_series/vertical_stepline_chart.dart b/lib/samples/chart/cartesian_charts/stepLine_series/vertical_stepline_chart.dart index 138e28e8..16c3556c 100755 --- a/lib/samples/chart/cartesian_charts/stepLine_series/vertical_stepline_chart.dart +++ b/lib/samples/chart/cartesian_charts/stepLine_series/vertical_stepline_chart.dart @@ -94,6 +94,7 @@ class _StepLineVerticalState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -120,6 +121,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getVerticalStepLineChart(false)), diff --git a/lib/samples/chart/circular_charts/doughnut_series/default_doughnut_chart.dart b/lib/samples/chart/circular_charts/doughnut_series/default_doughnut_chart.dart index 5a19ddf6..aba0fb07 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/default_doughnut_chart.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/default_doughnut_chart.dart @@ -76,6 +76,7 @@ class _DoughnutDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultDoughnutChart(false)), diff --git a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_center_elevation.dart b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_center_elevation.dart index b666bd14..1fe28ad2 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_center_elevation.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_center_elevation.dart @@ -92,6 +92,7 @@ class _DoughnutDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -117,6 +118,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getElevationDoughnutChart(false)), @@ -208,7 +210,7 @@ SfCircularChart getElevationDoughnutChart(bool isTileView) { CircularChartAnnotation( height: '100%', width: '100%', - child: Container( + widget: Container( child: PhysicalModel( child: Container(), shape: BoxShape.circle, @@ -216,7 +218,7 @@ SfCircularChart getElevationDoughnutChart(bool isTileView) { shadowColor: Colors.black, color: const Color.fromRGBO(230, 230, 230, 1)))), CircularChartAnnotation( - child: Container( + widget: Container( child: const Text('62%', style: TextStyle( color: Color.fromRGBO(0, 0, 0, 0.5), fontSize: 25)))) diff --git a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_color_mapping.dart b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_color_mapping.dart index 522648ef..6e291e34 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_color_mapping.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_color_mapping.dart @@ -76,6 +76,7 @@ class _DoughnutDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDoughnutCustomizationChart(false)), @@ -190,7 +192,7 @@ SfCircularChart getDoughnutCustomizationChart(bool isTileView) { return SfCircularChart( annotations: [ CircularChartAnnotation( - child: Container( + widget: Container( child: const Text('90%', style: TextStyle( color: Colors.grey, fontSize: 25)))) diff --git a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_rounded_corners.dart b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_rounded_corners.dart index 2c330e5b..73b93feb 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_rounded_corners.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/doughnut_with_rounded_corners.dart @@ -93,6 +93,7 @@ class _DoughnutRoundedState extends State { //frontHeader: model.panelTitle(context), headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -121,6 +122,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getRoundedDoughnutChart(false)), diff --git a/lib/samples/chart/circular_charts/doughnut_series/semi_doughnut_chart.dart b/lib/samples/chart/circular_charts/doughnut_series/semi_doughnut_chart.dart index 6023a75d..5b2d7352 100755 --- a/lib/samples/chart/circular_charts/doughnut_series/semi_doughnut_chart.dart +++ b/lib/samples/chart/circular_charts/doughnut_series/semi_doughnut_chart.dart @@ -78,6 +78,7 @@ class _DoughnutSemiState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -104,6 +105,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( @@ -392,7 +394,7 @@ List> getDoughnutSeries( yValueMapper: (_DoughnutData data, _) => data.yData, dataLabelMapper: (_DoughnutData data, _) => data.text, dataLabelSettings: DataLabelSettings( - isVisible: true, labelPosition: LabelPosition.inside)) + isVisible: true, labelPosition: ChartDataLabelPosition.inside)) ]; } diff --git a/lib/samples/chart/circular_charts/pie_series/default_pie_chart.dart b/lib/samples/chart/circular_charts/pie_series/default_pie_chart.dart index 9f1a6477..4a601edf 100755 --- a/lib/samples/chart/circular_charts/pie_series/default_pie_chart.dart +++ b/lib/samples/chart/circular_charts/pie_series/default_pie_chart.dart @@ -76,6 +76,7 @@ class _PieDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -100,6 +101,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultPieChart(false)), diff --git a/lib/samples/chart/circular_charts/pie_series/pie_with_grouping.dart b/lib/samples/chart/circular_charts/pie_series/pie_with_grouping.dart index e85dd019..1114fcc1 100755 --- a/lib/samples/chart/circular_charts/pie_series/pie_with_grouping.dart +++ b/lib/samples/chart/circular_charts/pie_series/pie_with_grouping.dart @@ -91,6 +91,7 @@ class _PieGroupingState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -117,6 +118,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getGroupingPieChart(false)), @@ -229,7 +231,7 @@ List> getPieSeries(bool isTileView) { radius: '90%', dataLabelMapper: (_PieData data, _) => data.xData, dataLabelSettings: DataLabelSettings( - isVisible: true, labelPosition: LabelPosition.inside), + isVisible: true, labelPosition: ChartDataLabelPosition.inside), dataSource: pieData, startAngle: 90, endAngle: 90, diff --git a/lib/samples/chart/circular_charts/pie_series/pie_with_smart_labels.dart b/lib/samples/chart/circular_charts/pie_series/pie_with_smart_labels.dart index 6a61b86a..70e0175d 100755 --- a/lib/samples/chart/circular_charts/pie_series/pie_with_smart_labels.dart +++ b/lib/samples/chart/circular_charts/pie_series/pie_with_smart_labels.dart @@ -76,6 +76,7 @@ class _PieSmartLabelsState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -104,6 +105,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getSmartLabelPieChart(false)), @@ -219,7 +221,7 @@ List> getPieSeries(bool isTileView) { endAngle: 80, dataLabelSettings: DataLabelSettings( isVisible: true, - labelPosition: LabelPosition.outside, + labelPosition: ChartDataLabelPosition.outside, connectorLineSettings: ConnectorLineSettings(type: ConnectorType.curve))) ]; diff --git a/lib/samples/chart/circular_charts/pie_series/pie_with_various_radius.dart b/lib/samples/chart/circular_charts/pie_series/pie_with_various_radius.dart index 9bab1f80..97f12d0f 100755 --- a/lib/samples/chart/circular_charts/pie_series/pie_with_various_radius.dart +++ b/lib/samples/chart/circular_charts/pie_series/pie_with_various_radius.dart @@ -90,9 +90,9 @@ class _PieRadiusState extends State { backLayer: BackPanel(sample), frontLayer: FrontPanel(sample), sideDrawer: null, - //frontHeader: model.panelTitle(context), headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -118,6 +118,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getRadiusPieChart(false)), @@ -236,7 +237,7 @@ List> getPieSeries(bool isTileView) { endAngle: 100, pointRadiusMapper: (_PieData data, _) => data.radius, dataLabelSettings: DataLabelSettings( - isVisible: true, labelPosition: LabelPosition.outside)) + isVisible: true, labelPosition: ChartDataLabelPosition.outside)) ]; } diff --git a/lib/samples/chart/circular_charts/pie_series/semi_pie_chart.dart b/lib/samples/chart/circular_charts/pie_series/semi_pie_chart.dart index b76ea591..0b1c9739 100755 --- a/lib/samples/chart/circular_charts/pie_series/semi_pie_chart.dart +++ b/lib/samples/chart/circular_charts/pie_series/semi_pie_chart.dart @@ -78,6 +78,7 @@ class _PieSemiState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -105,6 +106,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( @@ -430,7 +432,7 @@ List> getPieSeries( startAngle: isTileView ? 270 : startAngle, endAngle: isTileView ? 90 : endAngle, dataLabelSettings: DataLabelSettings( - isVisible: true, labelPosition: LabelPosition.inside)) + isVisible: true, labelPosition: ChartDataLabelPosition.inside)) ]; } diff --git a/lib/samples/chart/circular_charts/radialbar_series/customized_radialbar_chart.dart b/lib/samples/chart/circular_charts/radialbar_series/customized_radialbar_chart.dart index a306ab0c..99084876 100755 --- a/lib/samples/chart/circular_charts/radialbar_series/customized_radialbar_chart.dart +++ b/lib/samples/chart/circular_charts/radialbar_series/customized_radialbar_chart.dart @@ -92,6 +92,7 @@ class _RadialBarCustomizedState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), @@ -118,6 +119,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getCustomizedRadialBarChart(false)), @@ -215,7 +217,7 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { CircularChartAnnotation( angle: 0, radius: '0%', - child: Container( + widget: Container( child: new Image.asset( 'images/car_legend.png', width: 20, @@ -227,7 +229,7 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { CircularChartAnnotation( angle: 0, radius: '0%', - child: Container( + widget: Container( child: new Image.asset( 'images/book.png', width: 20, @@ -239,7 +241,7 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { CircularChartAnnotation( angle: 0, radius: '0%', - child: Container( + widget: Container( child: new Image.asset('images/home.png', width: 20, height: 20, color: Color.fromRGBO(145, 132, 202, 1.0)), ), @@ -247,19 +249,19 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { CircularChartAnnotation( angle: 0, radius: '0%', - child: Container( + widget: Container( child: new Image.asset( 'images/personal_loan.png', width: 20, height: 20, - color: Color.fromRGBO(235, 96, 143, 1.0), + color: Color.fromRGBO(235, 96, 143, 1.0), ), ), ), ]; dynamic colors = [ - Color.fromRGBO(69, 186, 161, 1.0), + Color.fromRGBO(69, 186, 161, 1.0), Color.fromRGBO(230, 135, 111, 1.0), Color.fromRGBO(145, 132, 202, 1.0), Color.fromRGBO(235, 96, 143, 1.0) @@ -318,7 +320,7 @@ SfCircularChart getCustomizedRadialBarChart(bool isTileView) { radius: '0%', height: '90%', width:'90%', - child: Container( + widget: Container( child: new Image.asset( 'images/person.png', height: 100.0, diff --git a/lib/samples/chart/circular_charts/radialbar_series/default_radialbar_chart.dart b/lib/samples/chart/circular_charts/radialbar_series/default_radialbar_chart.dart index 6010d4ab..60a53361 100755 --- a/lib/samples/chart/circular_charts/radialbar_series/default_radialbar_chart.dart +++ b/lib/samples/chart/circular_charts/radialbar_series/default_radialbar_chart.dart @@ -92,6 +92,7 @@ class _RadialBarDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -117,6 +118,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultRadialBarChart(false)), diff --git a/lib/samples/chart/circular_charts/radialbar_series/radialbar_with_legend.dart b/lib/samples/chart/circular_charts/radialbar_series/radialbar_with_legend.dart index 5d460720..5af487ea 100755 --- a/lib/samples/chart/circular_charts/radialbar_series/radialbar_with_legend.dart +++ b/lib/samples/chart/circular_charts/radialbar_series/radialbar_with_legend.dart @@ -76,6 +76,7 @@ class _RadialBarAngleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getAngleRadialBarChart(false)), diff --git a/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_points.dart b/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_points.dart index bd9b6324..84fdda51 100755 --- a/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_points.dart +++ b/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_points.dart @@ -111,6 +111,7 @@ class _LiveVerticalState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -159,6 +160,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getAddRemovePointsChart(chartData)), diff --git a/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_series.dart b/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_series.dart index 1a59c5ab..592fa7e4 100755 --- a/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_series.dart +++ b/lib/samples/chart/dynamic_updates/add_remove_data/add_remove_series.dart @@ -141,6 +141,7 @@ class _LiveVerticalState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -195,6 +196,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getAddRemoveSeriesChart(false)), diff --git a/lib/samples/chart/dynamic_updates/live_update/live_update.dart b/lib/samples/chart/dynamic_updates/live_update/live_update.dart index 987e0c85..42b9add1 100755 --- a/lib/samples/chart/dynamic_updates/live_update/live_update.dart +++ b/lib/samples/chart/dynamic_updates/live_update/live_update.dart @@ -105,6 +105,7 @@ class _LiveUpdateState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -178,6 +179,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getLiveUpdateChart(false)), diff --git a/lib/samples/chart/dynamic_updates/live_update/vertical_live_chart.dart b/lib/samples/chart/dynamic_updates/live_update/vertical_live_chart.dart index 3c528635..f01bcdad 100755 --- a/lib/samples/chart/dynamic_updates/live_update/vertical_live_chart.dart +++ b/lib/samples/chart/dynamic_updates/live_update/vertical_live_chart.dart @@ -96,9 +96,9 @@ class _LiveUpdateState extends State { backLayer: BackPanel(sample), frontLayer: FrontPanel(sample), sideDrawer: null, - //frontHeader: model.panelTitle(context), headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -144,6 +144,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getVerticalLineUpdateChart(false)), diff --git a/lib/samples/chart/dynamic_updates/update_data_source/update_data_source.dart b/lib/samples/chart/dynamic_updates/update_data_source/update_data_source.dart index be3d900f..2d892672 100644 --- a/lib/samples/chart/dynamic_updates/update_data_source/update_data_source.dart +++ b/lib/samples/chart/dynamic_updates/update_data_source/update_data_source.dart @@ -106,6 +106,7 @@ class _LiveVerticalState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -157,6 +158,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 60), child: Container( diff --git a/lib/samples/chart/funnel_charts/default_funnel_chart.dart b/lib/samples/chart/funnel_charts/default_funnel_chart.dart index 32d8b6ea..34853a65 100644 --- a/lib/samples/chart/funnel_charts/default_funnel_chart.dart +++ b/lib/samples/chart/funnel_charts/default_funnel_chart.dart @@ -80,6 +80,7 @@ class _FunnelDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -108,6 +109,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultFunnelChart(false, gapRatio,neckWidth, neckHeight, explode)), diff --git a/lib/samples/chart/funnel_charts/funnel_with_legend.dart b/lib/samples/chart/funnel_charts/funnel_with_legend.dart index 426c2676..c3dd31e6 100644 --- a/lib/samples/chart/funnel_charts/funnel_with_legend.dart +++ b/lib/samples/chart/funnel_charts/funnel_with_legend.dart @@ -76,6 +76,7 @@ class _FunnelLegendState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -100,6 +101,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getLegendFunnelChart(false)), @@ -213,7 +215,7 @@ FunnelSeries<_FunnelData, String> _getFunnelSeries(bool isTileView) { yValueMapper: (_FunnelData data, _) => data.yData, dataLabelSettings: DataLabelSettings( isVisible: isTileView ? false : true, - labelPosition: LabelPosition.inside)); + labelPosition: ChartDataLabelPosition.inside)); } class _FunnelData { diff --git a/lib/samples/chart/funnel_charts/funnel_with_smart_labels.dart b/lib/samples/chart/funnel_charts/funnel_with_smart_labels.dart index b680ee23..cf48fa7e 100644 --- a/lib/samples/chart/funnel_charts/funnel_with_smart_labels.dart +++ b/lib/samples/chart/funnel_charts/funnel_with_smart_labels.dart @@ -78,6 +78,7 @@ class _FunnelSmartLabelState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -97,7 +98,7 @@ class _FrontPanelState extends State { final SubItemList sample; _FrontPanelState(this.sample); final List _labelPositon = ['outside', 'inside'].toList(); - LabelPosition _selectedLabelPosition = LabelPosition.outside; + ChartDataLabelPosition _selectedLabelPosition = ChartDataLabelPosition.outside; String _selectedPosition; final List _modeList = ['shift', 'none', 'hide'].toList(); @@ -108,7 +109,7 @@ class _FrontPanelState extends State { void initState() { super.initState(); _selectedPosition = _labelPositon.first; - _selectedLabelPosition = LabelPosition.outside; + _selectedLabelPosition = ChartDataLabelPosition.outside; } @override @@ -117,6 +118,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( @@ -143,9 +145,9 @@ class _FrontPanelState extends State { setState(() { _selectedPosition = item; if (_selectedPosition == 'inside') { - _selectedLabelPosition = LabelPosition.inside; + _selectedLabelPosition = ChartDataLabelPosition.inside; } else if (_selectedPosition == 'outside') { - _selectedLabelPosition = LabelPosition.outside; + _selectedLabelPosition = ChartDataLabelPosition.outside; } }); } @@ -408,7 +410,7 @@ class _BackPanelState extends State { } SfFunnelChart getFunnelSmartLabelChart(bool isTileView, - [LabelPosition _labelPosition, SmartLabelMode _mode]) { + [ChartDataLabelPosition _labelPosition, SmartLabelMode _mode]) { return SfFunnelChart( smartLabelMode: isTileView ? SmartLabelMode.shift : _mode, title: ChartTitle(text: isTileView ? '' : 'Tournament details'), @@ -423,7 +425,7 @@ SfFunnelChart getFunnelSmartLabelChart(bool isTileView, } FunnelSeries<_FunnelData, String> _getFunnelSeries(bool isTileView, - [LabelPosition _labelPosition]) { + [ChartDataLabelPosition _labelPosition]) { final List<_FunnelData> pieData = <_FunnelData>[ _FunnelData('Finals', 2), _FunnelData('Semifinals', 4), @@ -442,7 +444,7 @@ FunnelSeries<_FunnelData, String> _getFunnelSeries(bool isTileView, // pointColorMapper: (_FunnelData data, _) => data.color, dataLabelSettings: DataLabelSettings( isVisible: true, - labelPosition: isTileView ? LabelPosition.outside : _labelPosition, + labelPosition: isTileView ? ChartDataLabelPosition.outside : _labelPosition, useSeriesColor: true)); } diff --git a/lib/samples/chart/legend/chart_with_customized_legend.dart b/lib/samples/chart/legend/chart_with_customized_legend.dart index d3835914..738ac16d 100755 --- a/lib/samples/chart/legend/chart_with_customized_legend.dart +++ b/lib/samples/chart/legend/chart_with_customized_legend.dart @@ -76,6 +76,7 @@ class _LegendCustomizedState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getLegendCustomizedChart(false)), diff --git a/lib/samples/chart/legend/chart_with_legend.dart b/lib/samples/chart/legend/chart_with_legend.dart index 592b1440..4c0ea319 100755 --- a/lib/samples/chart/legend/chart_with_legend.dart +++ b/lib/samples/chart/legend/chart_with_legend.dart @@ -76,6 +76,7 @@ class _LegendDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getLegendDefaultChart(false)), @@ -222,6 +224,6 @@ List> getPieSeries(bool isTileView) { startAngle: 90, endAngle: 90, dataLabelSettings: DataLabelSettings( - isVisible: true, labelPosition: LabelPosition.outside)), + isVisible: true, labelPosition: ChartDataLabelPosition.outside)), ]; } diff --git a/lib/samples/chart/legend/legend_with_various_options.dart b/lib/samples/chart/legend/legend_with_various_options.dart index edfd12c1..adf31246 100755 --- a/lib/samples/chart/legend/legend_with_various_options.dart +++ b/lib/samples/chart/legend/legend_with_various_options.dart @@ -79,6 +79,7 @@ class _LegendOptionsState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -117,6 +118,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/pyramid_charts/default_pyramid_chart.dart b/lib/samples/chart/pyramid_charts/default_pyramid_chart.dart index b6d0afd5..af7ba7f7 100644 --- a/lib/samples/chart/pyramid_charts/default_pyramid_chart.dart +++ b/lib/samples/chart/pyramid_charts/default_pyramid_chart.dart @@ -81,6 +81,7 @@ class _PyramidDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -118,6 +119,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultPyramidChart(false, _selectedPyramidMode, gapRatio, explode)), diff --git a/lib/samples/chart/pyramid_charts/pyramid_with_legend.dart b/lib/samples/chart/pyramid_charts/pyramid_with_legend.dart index 2376501b..89ff6fae 100644 --- a/lib/samples/chart/pyramid_charts/pyramid_with_legend.dart +++ b/lib/samples/chart/pyramid_charts/pyramid_with_legend.dart @@ -76,6 +76,7 @@ class _PyramidLegendState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -100,6 +101,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getLegendPyramidChart(false)), @@ -239,7 +241,7 @@ PyramidSeries<_PyramidData, String> _getPyramidSeries(bool isTileView) { yValueMapper: (_PyramidData data, _) => data.yData, dataLabelSettings: DataLabelSettings( isVisible: isTileView ? false : true, - labelPosition: LabelPosition.inside)); + labelPosition: ChartDataLabelPosition.inside)); } class _PyramidData { diff --git a/lib/samples/chart/pyramid_charts/pyramid_with_smart_labels.dart b/lib/samples/chart/pyramid_charts/pyramid_with_smart_labels.dart index 5d94cc50..02026ea7 100644 --- a/lib/samples/chart/pyramid_charts/pyramid_with_smart_labels.dart +++ b/lib/samples/chart/pyramid_charts/pyramid_with_smart_labels.dart @@ -79,6 +79,7 @@ class _PyramidSmartLabelState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -98,7 +99,7 @@ class _FrontPanelState extends State { final SubItemList sample; _FrontPanelState(this.sample); final List _labelPositon = ['outside', 'inside'].toList(); - LabelPosition _selectedLabelPosition = LabelPosition.outside; + ChartDataLabelPosition _selectedLabelPosition = ChartDataLabelPosition.outside; String _selectedPosition; final List _modeList = ['shift', 'none', 'hide'].toList(); @@ -109,7 +110,7 @@ class _FrontPanelState extends State { void initState() { super.initState(); _selectedPosition = _labelPositon.first; - _selectedLabelPosition = LabelPosition.outside; + _selectedLabelPosition = ChartDataLabelPosition.outside; } @override @@ -118,6 +119,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( @@ -168,9 +170,9 @@ class _FrontPanelState extends State { setState(() { _selectedPosition = item; if (_selectedPosition == 'inside') { - _selectedLabelPosition = LabelPosition.inside; + _selectedLabelPosition = ChartDataLabelPosition.inside; } else if (_selectedPosition == 'outside') { - _selectedLabelPosition = LabelPosition.outside; + _selectedLabelPosition = ChartDataLabelPosition.outside; } }); } @@ -433,7 +435,7 @@ class _BackPanelState extends State { } SfPyramidChart getPyramidSmartLabelChart(bool isTileView, - [LabelPosition _labelPosition, SmartLabelMode _mode]) { + [ChartDataLabelPosition _labelPosition, SmartLabelMode _mode]) { return SfPyramidChart( onTooltipRender: (TooltipArgs args) { final NumberFormat format = NumberFormat.decimalPattern(); @@ -451,7 +453,7 @@ SfPyramidChart getPyramidSmartLabelChart(bool isTileView, } PyramidSeries<_PyramidData, String> _getPyramidSeries(bool isTileView, - [LabelPosition _labelPosition, + [ChartDataLabelPosition _labelPosition, LabelIntersectAction _labelIntersectAction]) { final List<_PyramidData> pieData = <_PyramidData>[ _PyramidData('Mexico', 127575529, null, Color.fromRGBO(238, 238, 238, 1)), @@ -477,7 +479,7 @@ PyramidSeries<_PyramidData, String> _getPyramidSeries(bool isTileView, pointColorMapper: (_PyramidData data, _) => data.color, dataLabelSettings: DataLabelSettings( isVisible: true, - labelPosition: isTileView ? LabelPosition.outside : _labelPosition, + labelPosition: isTileView ? ChartDataLabelPosition.outside : _labelPosition, useSeriesColor: true)); } diff --git a/lib/samples/chart/series_features/animation/dynamic_animation.dart b/lib/samples/chart/series_features/animation/dynamic_animation.dart index 4bcc82fc..c09af982 100644 --- a/lib/samples/chart/series_features/animation/dynamic_animation.dart +++ b/lib/samples/chart/series_features/animation/dynamic_animation.dart @@ -7,6 +7,7 @@ import 'package:flutter_examples/widgets/customDropDown.dart'; import 'package:flutter_examples/widgets/flutter_backdrop.dart'; import 'package:scoped_model/scoped_model.dart'; import 'package:url_launcher/url_launcher.dart'; +Timer timer; class CartesianDynamicAnimation extends StatefulWidget { final SubItemList sample; @@ -22,6 +23,7 @@ class _CartesianDynamicAnimationState extends State { _CartesianDynamicAnimationState(this.sample); bool panelOpen; final frontPanelVisible = ValueNotifier(true); + @override void initState() { @@ -35,6 +37,7 @@ class _CartesianDynamicAnimationState extends State { @override void dispose() { super.dispose(); + timer.cancel(); } @override @@ -52,11 +55,12 @@ class _CartesianDynamicAnimationState extends State { needCloseButton: false, panelVisible: frontPanelVisible, sampleListModel: model, + toggleFrontLayer: false, frontPanelOpenPercentage: 0.28, appBarAnimatedLeadingMenuIcon: AnimatedIcons.close_menu, appBarActions: [ Padding( - padding: const EdgeInsets.fromLTRB(0, 0, 10, 0), + padding: const EdgeInsets.fromLTRB(0, 0, 0, 0), child: Container( height: 40, width: 40, @@ -70,23 +74,7 @@ class _CartesianDynamicAnimationState extends State { ), ), ), - Padding( - padding: const EdgeInsets.fromLTRB(0, 0, 10, 0), - child: Container( - height: 40, - width: 40, - child: IconButton( - icon: Image.asset(model.informationIcon, - color: Colors.white), - onPressed: () { - if (frontPanelVisible.value) - frontPanelVisible.value = false; - else - frontPanelVisible.value = true; - }, - ), - ), - ), + ], appBarTitle: AnimatedSwitcher( duration: Duration(milliseconds: 1000), @@ -96,6 +84,7 @@ class _CartesianDynamicAnimationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -141,7 +130,6 @@ class _FrontPanelState extends State { String _selectedType = 'Column'; - Timer timer; @override Widget build(BuildContext context) { @@ -155,6 +143,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( @@ -538,7 +527,7 @@ List> getAnimationData( dataLabelSettings: DataLabelSettings( color: Colors.blue, alignment: ChartAlignment.center, - position: CartesianLabelPosition.auto, + labelAlignment: ChartDataLabelAlignment.auto, isVisible: false), markerSettings: MarkerSettings( isVisible: false, @@ -560,7 +549,7 @@ List> getAnimationData( dataLabelSettings: DataLabelSettings( color: Colors.blue, alignment: ChartAlignment.center, - position: CartesianLabelPosition.auto, + labelAlignment: ChartDataLabelAlignment.auto, isVisible: false), borderRadius: const BorderRadius.all(Radius.circular(20)), markerSettings: MarkerSettings( @@ -577,14 +566,13 @@ List> getAnimationData( return >[ ScatterSeries<_DynamicData, String>( dataSource: chartData, - width: 2, xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, color: Color.fromRGBO(0, 168, 181, 1), dataLabelSettings: DataLabelSettings( color: Colors.blue, alignment: ChartAlignment.center, - position: CartesianLabelPosition.auto, + labelAlignment: ChartDataLabelAlignment.auto, isVisible: false), markerSettings: MarkerSettings( isVisible: false, @@ -601,14 +589,13 @@ List> getAnimationData( BubbleSeries<_DynamicData, String>( dataSource: chartData, color: Color.fromRGBO(0, 168, 181, 1), - width: 2, xValueMapper: (_DynamicData sales, _) => sales.country, yValueMapper: (_DynamicData sales, _) => sales.sales, sizeValueMapper: (_DynamicData sales, _) => sales.sales, dataLabelSettings: DataLabelSettings( color: Colors.blue, alignment: ChartAlignment.center, - position: CartesianLabelPosition.auto, + labelAlignment: ChartDataLabelAlignment.auto, isVisible: false), markerSettings: MarkerSettings( isVisible: false, diff --git a/lib/samples/chart/series_features/animation/series_animation.dart b/lib/samples/chart/series_features/animation/series_animation.dart index c0957e6a..c4fb47be 100755 --- a/lib/samples/chart/series_features/animation/series_animation.dart +++ b/lib/samples/chart/series_features/animation/series_animation.dart @@ -76,6 +76,7 @@ class _AnimationDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultAnimationChart(false)), diff --git a/lib/samples/chart/series_features/annotation/chart_with_annotation.dart b/lib/samples/chart/series_features/annotation/chart_with_annotation.dart index fba06de6..e6da506c 100755 --- a/lib/samples/chart/series_features/annotation/chart_with_annotation.dart +++ b/lib/samples/chart/series_features/annotation/chart_with_annotation.dart @@ -94,6 +94,7 @@ class _AnnotationWatermarkState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -119,6 +120,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getWatermarkAnnotationChart(false)), @@ -223,7 +225,7 @@ SfCartesianChart getWatermarkAnnotationChart(bool isTileView) { series: getLineSeries(isTileView), annotations: [ CartesianChartAnnotation( - child: Container( + widget: Container( height: isTileView ? 100 : 150, width: isTileView ? 100 : 150, child: SfCircularChart( @@ -278,7 +280,7 @@ List> getLineSeries(bool isTileView) { isVisible: true, textStyle: ChartTextStyle( color: Colors.white, fontSize: isTileView ? 10 : 12), - position: CartesianLabelPosition.top)), + labelAlignment: ChartDataLabelAlignment.top)), ]; } diff --git a/lib/samples/chart/series_features/annotation/chart_with_watermark.dart b/lib/samples/chart/series_features/annotation/chart_with_watermark.dart index 3b9f19d3..40de970d 100755 --- a/lib/samples/chart/series_features/annotation/chart_with_watermark.dart +++ b/lib/samples/chart/series_features/annotation/chart_with_watermark.dart @@ -101,6 +101,7 @@ class _AnnotationDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -126,6 +127,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultAnnotationChart(false,model.theme)), @@ -233,7 +235,7 @@ SfCartesianChart getDefaultAnnotationChart(bool isTileView,[Brightness currentTh tooltipSettings: InteractiveTooltip(format: 'point.x : point.y')), annotations: [ CartesianChartAnnotation( - child: Container( + widget: Container( child: Text( '€ - \$ ', style: TextStyle( diff --git a/lib/samples/chart/series_features/data_label/default_datalabels.dart b/lib/samples/chart/series_features/data_label/default_datalabels.dart index 10700888..058b2481 100755 --- a/lib/samples/chart/series_features/data_label/default_datalabels.dart +++ b/lib/samples/chart/series_features/data_label/default_datalabels.dart @@ -76,6 +76,7 @@ class _DataLabelDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -101,6 +102,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( @@ -235,7 +237,7 @@ List> getLineSeries( dataLabelSettings: DataLabelSettings( isVisible: true, useSeriesColor: true, - position: CartesianLabelPosition.top)), + labelAlignment: ChartDataLabelAlignment.top)), SplineSeries<_LabelData, num>( legendIconType: LegendIconType.rectangle, enableTooltip: true, @@ -249,7 +251,7 @@ List> getLineSeries( dataLabelSettings: DataLabelSettings( isVisible: true, useSeriesColor: true, - position: CartesianLabelPosition.top)) + labelAlignment: ChartDataLabelAlignment.top)) ]; } diff --git a/lib/samples/chart/series_features/empty_point/chart_with_empty_points.dart b/lib/samples/chart/series_features/empty_point/chart_with_empty_points.dart index 73bf6a2b..719aad08 100755 --- a/lib/samples/chart/series_features/empty_point/chart_with_empty_points.dart +++ b/lib/samples/chart/series_features/empty_point/chart_with_empty_points.dart @@ -81,6 +81,7 @@ class _EmptyPointsState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -119,6 +120,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 60), child: Container( diff --git a/lib/samples/chart/series_features/marker/various_marker_shapes.dart b/lib/samples/chart/series_features/marker/various_marker_shapes.dart index bbfad49c..41003bba 100755 --- a/lib/samples/chart/series_features/marker/various_marker_shapes.dart +++ b/lib/samples/chart/series_features/marker/various_marker_shapes.dart @@ -77,6 +77,7 @@ class _MarkerDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -102,6 +103,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getMarkerDefaultChart(false)), @@ -226,7 +228,7 @@ List> getLineSeries(bool isTileView) { markerSettings: MarkerSettings( isVisible: true, shape: DataMarkerType.pentagon, - imageUrl: 'images/truck.png'), + image: AssetImage('images/truck.png')), ), LineSeries<_ChartNumeric, DateTime>( dataSource: chartData, diff --git a/lib/samples/chart/series_features/sorting/sorting_options.dart b/lib/samples/chart/series_features/sorting/sorting_options.dart index 82b9de57..ac1d9d4f 100755 --- a/lib/samples/chart/series_features/sorting/sorting_options.dart +++ b/lib/samples/chart/series_features/sorting/sorting_options.dart @@ -96,6 +96,7 @@ class _SortingDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -133,6 +134,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 60), child: Container( @@ -478,7 +480,7 @@ List> getLineSeries(bool isTileView, yValueMapper: (_SortingData sales, _) => sales.height, sortingOrder: _sortingOrder != null ? _sortingOrder : SortingOrder.none, dataLabelSettings: DataLabelSettings( - isVisible: true, position: CartesianLabelPosition.auto), + isVisible: true, labelAlignment: ChartDataLabelAlignment.auto), sortFieldValueMapper: (_SortingData sales, _) => _sortby == 'x' ? sales.name : sales.height, ) diff --git a/lib/samples/chart/user_interactions/crosshair/chart_with_crosshair.dart b/lib/samples/chart/user_interactions/crosshair/chart_with_crosshair.dart index 5a98a433..42ee7f61 100755 --- a/lib/samples/chart/user_interactions/crosshair/chart_with_crosshair.dart +++ b/lib/samples/chart/user_interactions/crosshair/chart_with_crosshair.dart @@ -98,6 +98,7 @@ class _DefaultCrossHairState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -134,6 +135,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/user_interactions/selection/selection_modes.dart b/lib/samples/chart/user_interactions/selection/selection_modes.dart index ce726750..e62ca08f 100755 --- a/lib/samples/chart/user_interactions/selection/selection_modes.dart +++ b/lib/samples/chart/user_interactions/selection/selection_modes.dart @@ -95,9 +95,9 @@ class _DefaultSelectionState extends State { backLayer: BackPanel(sample), frontLayer: FrontPanel(sample), sideDrawer: null, - //frontHeader: model.panelTitle(context), headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -130,6 +130,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/user_interactions/tooltip/default_tooltip.dart b/lib/samples/chart/user_interactions/tooltip/default_tooltip.dart index 370b99a4..6503d6c1 100755 --- a/lib/samples/chart/user_interactions/tooltip/default_tooltip.dart +++ b/lib/samples/chart/user_interactions/tooltip/default_tooltip.dart @@ -94,6 +94,7 @@ class _DefaultTooltipState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -122,6 +123,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultTooltipChart(false)), diff --git a/lib/samples/chart/user_interactions/trackball/chart_with_trackball.dart b/lib/samples/chart/user_interactions/trackball/chart_with_trackball.dart index 8182c7cf..39a9f2f6 100755 --- a/lib/samples/chart/user_interactions/trackball/chart_with_trackball.dart +++ b/lib/samples/chart/user_interactions/trackball/chart_with_trackball.dart @@ -97,6 +97,7 @@ class _DefaultTrackballState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -134,6 +135,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 60), child: Container( diff --git a/lib/samples/chart/user_interactions/zooming_panning/pinch_zooming.dart b/lib/samples/chart/user_interactions/zooming_panning/pinch_zooming.dart index 9b2bf044..b3768a8e 100755 --- a/lib/samples/chart/user_interactions/zooming_panning/pinch_zooming.dart +++ b/lib/samples/chart/user_interactions/zooming_panning/pinch_zooming.dart @@ -98,6 +98,7 @@ class _DefaultPanningState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -130,6 +131,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container( diff --git a/lib/samples/chart/user_interactions/zooming_panning/selection_zooming.dart b/lib/samples/chart/user_interactions/zooming_panning/selection_zooming.dart index e7676c25..5358291b 100755 --- a/lib/samples/chart/user_interactions/zooming_panning/selection_zooming.dart +++ b/lib/samples/chart/user_interactions/zooming_panning/selection_zooming.dart @@ -94,6 +94,7 @@ class _DefaultZoomingState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -126,6 +127,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getDefaultZoomingChart(false)), diff --git a/lib/samples/chart/user_interactions/zooming_panning/zooming_with_custom_buttons.dart b/lib/samples/chart/user_interactions/zooming_panning/zooming_with_custom_buttons.dart index d4c458fe..fd714823 100755 --- a/lib/samples/chart/user_interactions/zooming_panning/zooming_with_custom_buttons.dart +++ b/lib/samples/chart/user_interactions/zooming_panning/zooming_with_custom_buttons.dart @@ -150,6 +150,7 @@ class _ButtonZoomingState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), @@ -175,6 +176,7 @@ class _FrontPanelState extends State { rebuildOnChange: true, builder: (context, _, model) { return Scaffold( + backgroundColor: model.cardThemeColor, body: Padding( padding: const EdgeInsets.fromLTRB(5, 0, 5, 50), child: Container(child: getButtonZoomingChart(false)), diff --git a/lib/samples/gauge/animation/radial_bounceout.dart b/lib/samples/gauge/animation/radial_bounceout.dart index b9f6a0f1..338f2663 100644 --- a/lib/samples/gauge/animation/radial_bounceout.dart +++ b/lib/samples/gauge/animation/radial_bounceout.dart @@ -76,6 +76,7 @@ class _RadialBounceOutExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/animation/radial_easeanimation.dart b/lib/samples/gauge/animation/radial_easeanimation.dart index 824cd921..baea8f79 100644 --- a/lib/samples/gauge/animation/radial_easeanimation.dart +++ b/lib/samples/gauge/animation/radial_easeanimation.dart @@ -78,6 +78,7 @@ class _RadialEaseExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/animation/radial_easeincirc.dart b/lib/samples/gauge/animation/radial_easeincirc.dart index 5a226604..cb973058 100644 --- a/lib/samples/gauge/animation/radial_easeincirc.dart +++ b/lib/samples/gauge/animation/radial_easeincirc.dart @@ -78,6 +78,7 @@ class _RadialEaseInCircExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/animation/radial_easeout.dart b/lib/samples/gauge/animation/radial_easeout.dart index a99861bf..65e6f43c 100644 --- a/lib/samples/gauge/animation/radial_easeout.dart +++ b/lib/samples/gauge/animation/radial_easeout.dart @@ -78,6 +78,7 @@ class _RadialEaseOutAnimationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/animation/radial_elasticout.dart b/lib/samples/gauge/animation/radial_elasticout.dart index f3b91e50..6d6212ad 100644 --- a/lib/samples/gauge/animation/radial_elasticout.dart +++ b/lib/samples/gauge/animation/radial_elasticout.dart @@ -78,6 +78,7 @@ class _RadialElasticOutAnimationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/animation/radial_linearanimation.dart b/lib/samples/gauge/animation/radial_linearanimation.dart index 3bf8eeaa..ef2c3011 100644 --- a/lib/samples/gauge/animation/radial_linearanimation.dart +++ b/lib/samples/gauge/animation/radial_linearanimation.dart @@ -78,6 +78,7 @@ class _RadialLinearAnimationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/animation/radial_slowmiddle.dart b/lib/samples/gauge/animation/radial_slowmiddle.dart index 574d764b..f63ecae0 100644 --- a/lib/samples/gauge/animation/radial_slowmiddle.dart +++ b/lib/samples/gauge/animation/radial_slowmiddle.dart @@ -78,6 +78,7 @@ class _RadialSlowMiddleAnimationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/annotation/direction_compass.dart b/lib/samples/gauge/annotation/direction_compass.dart index 58279d05..4fc60b7c 100644 --- a/lib/samples/gauge/annotation/direction_compass.dart +++ b/lib/samples/gauge/annotation/direction_compass.dart @@ -76,6 +76,7 @@ class _RadialCompassState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/annotation/image_annotation.dart b/lib/samples/gauge/annotation/image_annotation.dart index a2117ced..e6094bb7 100644 --- a/lib/samples/gauge/annotation/image_annotation.dart +++ b/lib/samples/gauge/annotation/image_annotation.dart @@ -76,6 +76,7 @@ class _RadialImageAnnotationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/annotation/text_annotation.dart b/lib/samples/gauge/annotation/text_annotation.dart index 7431d86c..ae5a058e 100644 --- a/lib/samples/gauge/annotation/text_annotation.dart +++ b/lib/samples/gauge/annotation/text_annotation.dart @@ -76,6 +76,7 @@ class _RadialTextAnnotationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/axis_feature/custom_labels.dart b/lib/samples/gauge/axis_feature/custom_labels.dart index 97cd1a31..f7852535 100644 --- a/lib/samples/gauge/axis_feature/custom_labels.dart +++ b/lib/samples/gauge/axis_feature/custom_labels.dart @@ -76,6 +76,7 @@ class _GaugeCustomLabelsState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/axis_feature/default_gauge_view.dart b/lib/samples/gauge/axis_feature/default_gauge_view.dart index 663484e8..e7d87b9e 100644 --- a/lib/samples/gauge/axis_feature/default_gauge_view.dart +++ b/lib/samples/gauge/axis_feature/default_gauge_view.dart @@ -76,6 +76,7 @@ class _RadialGaugeDefaultState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/axis_feature/multiple_axis.dart b/lib/samples/gauge/axis_feature/multiple_axis.dart index d96a3b0c..29ef0127 100644 --- a/lib/samples/gauge/axis_feature/multiple_axis.dart +++ b/lib/samples/gauge/axis_feature/multiple_axis.dart @@ -76,6 +76,7 @@ class _MultipleAxisExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/axis_feature/non_linearlabel.dart b/lib/samples/gauge/axis_feature/non_linearlabel.dart index 99af6050..ce112b24 100644 --- a/lib/samples/gauge/axis_feature/non_linearlabel.dart +++ b/lib/samples/gauge/axis_feature/non_linearlabel.dart @@ -75,6 +75,7 @@ class _RadialNonLinearLabelState extends State { frontLayer: FrontPanel(sample), sideDrawer: null, headerClosingHeight: 350, + color: model.cardThemeColor, titleVisibleOnPanelClosed: true, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), diff --git a/lib/samples/gauge/axis_feature/radiallabel_customization.dart b/lib/samples/gauge/axis_feature/radiallabel_customization.dart index 9545d76c..3b682f2b 100644 --- a/lib/samples/gauge/axis_feature/radiallabel_customization.dart +++ b/lib/samples/gauge/axis_feature/radiallabel_customization.dart @@ -76,6 +76,7 @@ class _RadialLabelCustomizationState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/axis_feature/range_colors.dart b/lib/samples/gauge/axis_feature/range_colors.dart index 56141422..78d44495 100644 --- a/lib/samples/gauge/axis_feature/range_colors.dart +++ b/lib/samples/gauge/axis_feature/range_colors.dart @@ -78,6 +78,7 @@ class _RangeColorForLabelsState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/axis_feature/tick_customization.dart b/lib/samples/gauge/axis_feature/tick_customization.dart index ed91a417..3aca387d 100644 --- a/lib/samples/gauge/axis_feature/tick_customization.dart +++ b/lib/samples/gauge/axis_feature/tick_customization.dart @@ -76,6 +76,7 @@ class _RadialTickCustomizationState extends State< RadialTickCustomization> { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/pointer_interaction/radial_pointerdragging.dart b/lib/samples/gauge/pointer_interaction/radial_pointerdragging.dart index a838eabd..89fb9b8b 100644 --- a/lib/samples/gauge/pointer_interaction/radial_pointerdragging.dart +++ b/lib/samples/gauge/pointer_interaction/radial_pointerdragging.dart @@ -76,6 +76,7 @@ class _RadialPointerDraggingState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/pointers/multiple_needle.dart b/lib/samples/gauge/pointers/multiple_needle.dart index 50925bf3..92cb4346 100644 --- a/lib/samples/gauge/pointers/multiple_needle.dart +++ b/lib/samples/gauge/pointers/multiple_needle.dart @@ -76,6 +76,7 @@ class _MultipleNeedleExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/pointers/multiple_ranges.dart b/lib/samples/gauge/pointers/multiple_ranges.dart index 9f3c710f..6cfee690 100644 --- a/lib/samples/gauge/pointers/multiple_ranges.dart +++ b/lib/samples/gauge/pointers/multiple_ranges.dart @@ -76,6 +76,7 @@ class _MultipleRangePointerExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/pointers/text_pointer.dart b/lib/samples/gauge/pointers/text_pointer.dart index 5e2c83dd..f3b9f3b0 100644 --- a/lib/samples/gauge/pointers/text_pointer.dart +++ b/lib/samples/gauge/pointers/text_pointer.dart @@ -76,6 +76,7 @@ class _RadialTextPointerState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/ranges/multiple_ranges.dart b/lib/samples/gauge/ranges/multiple_ranges.dart index 31698090..02712d3e 100644 --- a/lib/samples/gauge/ranges/multiple_ranges.dart +++ b/lib/samples/gauge/ranges/multiple_ranges.dart @@ -76,6 +76,7 @@ class _MultipleRangesExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/ranges/range_dataLabel.dart b/lib/samples/gauge/ranges/range_dataLabel.dart index fcb87218..604d7f7a 100644 --- a/lib/samples/gauge/ranges/range_dataLabel.dart +++ b/lib/samples/gauge/ranges/range_dataLabel.dart @@ -76,6 +76,7 @@ class _RangeDataLabelExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/ranges/range_thickness.dart b/lib/samples/gauge/ranges/range_thickness.dart index 5d1b93af..e71e2796 100644 --- a/lib/samples/gauge/ranges/range_thickness.dart +++ b/lib/samples/gauge/ranges/range_thickness.dart @@ -76,6 +76,7 @@ class _RangeThicknessExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/showcase/clock_sample.dart b/lib/samples/gauge/showcase/clock_sample.dart index 9ffa1b16..c05b2e2e 100644 --- a/lib/samples/gauge/showcase/clock_sample.dart +++ b/lib/samples/gauge/showcase/clock_sample.dart @@ -77,6 +77,7 @@ class _ClockExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/showcase/distance_tracker.dart b/lib/samples/gauge/showcase/distance_tracker.dart index 74594a64..ed78abb8 100644 --- a/lib/samples/gauge/showcase/distance_tracker.dart +++ b/lib/samples/gauge/showcase/distance_tracker.dart @@ -76,6 +76,7 @@ class _DistanceTrackerExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/samples/gauge/showcase/gauge_overview.dart b/lib/samples/gauge/showcase/gauge_overview.dart index e01e1bb0..8db39a0f 100644 --- a/lib/samples/gauge/showcase/gauge_overview.dart +++ b/lib/samples/gauge/showcase/gauge_overview.dart @@ -76,6 +76,7 @@ class _GaugeOverviewExampleState extends State { sideDrawer: null, headerClosingHeight: 350, titleVisibleOnPanelClosed: true, + color: model.cardThemeColor, borderRadius: BorderRadius.vertical( top: Radius.circular(12), bottom: Radius.circular(0)), ), diff --git a/lib/widgets/flutter_backdrop.dart b/lib/widgets/flutter_backdrop.dart index d5c16753..867a4b14 100755 --- a/lib/widgets/flutter_backdrop.dart +++ b/lib/widgets/flutter_backdrop.dart @@ -69,6 +69,8 @@ class Backdrop extends StatefulWidget { /// of the app. final Widget appBarTitle; + final Color color; + /// Widgets to display after the [appBarTitle] widget. /// /// Typically these widgets are [IconButton]s representing common operations. @@ -157,6 +159,7 @@ class Backdrop extends StatefulWidget { this.titleVisibleOnPanelClosed = true, this.frontPanelPadding = EdgeInsets.zero, this.toggleFrontLayer = true, + this.color, //--------Appbar properties------------ this.appBarLeadingMenuIcon, @@ -394,6 +397,7 @@ class BackdropState extends State frontHeader: widget.frontHeader, frontHeaderHeight: widget.frontHeaderHeight, padding: widget.frontPanelPadding, + color: widget.color, child: widget.frontLayer, ), ) @@ -481,6 +485,7 @@ class BackdropPanel extends StatelessWidget { final ShapeBorder shape; final double frontHeaderHeight; final EdgeInsets padding; + final Color color; const BackdropPanel({ Key key, @@ -493,6 +498,7 @@ class BackdropPanel extends StatelessWidget { this.borderRadius, this.frontHeaderHeight, this.padding, + this.color, }) : super(key: key); @override @@ -500,6 +506,7 @@ class BackdropPanel extends StatelessWidget { return Padding( padding: padding, child: Material( + color: color, elevation: 12.0, borderRadius: borderRadius, shape: shape, diff --git a/pubspec.yaml b/pubspec.yaml index 8ee6b15f..11eace5c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,21 +7,17 @@ environment: sdk: ">=2.1.0 <3.0.0" dependencies: + flutter_test: + sdk: flutter flutter: sdk: flutter - cupertino_icons: ^0.1.2 scoped_model: 1.0.1 flutter_gallery_assets: 0.1.8 url_launcher: ^5.0.3 intl: ^0.16.0 - syncfusion_flutter_charts: ^1.0.0-beta.5 - syncfusion_flutter_gauges: ^1.0.0-beta - -dev_dependencies: - flutter_test: - sdk: flutter - - + syncfusion_flutter_charts: ^17.3.14 + syncfusion_flutter_gauges: ^17.3.14 + flutter: uses-material-design: true assets: @@ -32,4 +28,4 @@ flutter: - asset: assets/fonts/Montserrat-Bold.ttf - family: MontserratMedium fonts: - - asset: assets/fonts/Montserrat-Medium.ttf \ No newline at end of file + - asset: assets/fonts/Montserrat-Medium.ttf