Merge pull request #28 from warioddly/dev

Dev

Author: warioddly

CHANGELOG.md

@@ -1,3 +1,9 @@
+
+## 1.1.0
+
+* Fix bug with background color
+* Optimize render
+
 ## 1.0.9
 
 * Add linear, radial gradient support for charts

example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()

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

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

example/android/settings.gradle

@@ -23,7 +23,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.1.0" apply false
 }
 
 include ":app"

example/lib/charts/basic_bar_chart.dart

@@ -14,6 +14,7 @@ class BasicBarChart extends StatefulWidget {
 class _BasicBarChartState extends State<BasicBarChart> {
 
   final controller = GraphifyController();
+  var _chartCreated = false;
   Timer? timer;
 
   @override
@@ -33,23 +34,51 @@ class _BasicBarChartState extends State<BasicBarChart> {
 
   @override
   Widget build(BuildContext context) {
-    return GraphifyView(
-      controller: controller,
-      initialOptions: const {
-        "xAxis": {
-          "type": "category",
-          "data": ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
-        },
-        "yAxis": {
-          "type": "value"
-        },
-        "series": [
-          {
-            "data": [120, 200, 150, 80, 70, 110, 130],
-            "type": "bar"
-          }
-        ]
-      },
+    return Stack(
+      children: [
+
+        GraphifyView(
+            controller: controller,
+            onCreated: () async {
+              await Future.delayed(const Duration(milliseconds: 400));
+              setState(() {
+                _chartCreated = true;
+              });
+            },
+            initialOptions: const {
+              'backgroundColor': 'transparent',
+              "xAxis": {
+                "type": "category",
+                "data": ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
+              },
+              "yAxis": {
+                "type": "value"
+              },
+              "series": [
+                {
+                  "data": [120, 200, 150, 80, 70, 110, 130],
+                  "type": "bar"
+                }
+              ],
+            },
+          ),
+
+        if (!_chartCreated)
+          Positioned.fill(
+            child: Container(
+              color: Colors.white,
+              child: const Center(
+                child: SizedBox.square(
+                  dimension: 100,
+                  child: CircularProgressIndicator.adaptive(
+                      backgroundColor: Colors.green,
+                  ),
+                )
+              )
+            ),
+          ),
+
+      ],
     );
   }
 

example/lib/charts/basic_line_chart.dart

@@ -36,9 +36,10 @@ class _BasicLineChartState extends State<BasicLineChart> {
     return GraphifyView(
       controller: controller,
       onConsoleMessage: (message) {
-        print("awdawd message$message");
+        print("[ERROR] $message");
       },
       initialOptions: const {
+        "backgroundColor": 'transparent',
         "xAxis": {
           "type": "category",
           "data": ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]

example/lib/charts/nested_pies_chart.dart

@@ -9,6 +9,7 @@ class NestedPiesChart extends StatelessWidget {
     return GraphifyView(
       controller: GraphifyController(),
       initialOptions: const {
+        "backgroundColor": 'transparent',
         "tooltip": {"trigger": "item", "formatter": "{a} <br/>{b}: {c} ({d}%)"},
         "legend": {
           "data": [

example/pubspec.lock

@@ -104,7 +104,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.8"
+    version: "1.0.9"
   integration_test:
     dependency: "direct dev"
     description: flutter
@@ -383,10 +383,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: d7403ef4f042714c9ee2b26eaac4cadae7394cb0d4e608b1dd850c3ff96bd893
+      sha256: c49a98510080378b1525132f407a92c3dcd3b7145bef04fb8137724aadcf1cf0
       url: "https://pub.dev"
     source: hosted
-    version: "3.18.2"
+    version: "3.18.4"
 sdks:
   dart: ">=3.7.0-0 <4.0.0"
   flutter: ">=3.27.0"

example/web/index.html

@@ -34,26 +34,14 @@
 
   <script>
     // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = null;
+    var serviceWorkerVersion = '{{flutter_service_worker_version}}';
   </script>
   <!-- This script adds the flutter initialization JS code -->
   <script src="flutter.js" defer></script>
 </head>
 <body>
   <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine().then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
+    {{flutter_bootstrap_js}}
   </script>
 </body>
 </html>

lib/src/resources/dependencies.js.dart

@@ -41,4 +41,3 @@ const String chartScripts = """
     
 """;
 
-const htmlDependencies = "<script>$dependencies</script>";