From 12a58856e5f7ca55f26b442cfb54a08ebe096745 Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@hmg.local>
Date: Wed, 20 Oct 2021 16:10:34 +0300
Subject: [PATCH] Chart fix & In-App update implemented

---
 lib/main.dart                             | 25 ++++++++++++++++++-----
 lib/widgets/charts/show_chart.dart        |  7 ++++++-
 lib/widgets/drawer/app_drawer_widget.dart |  5 +++--
 pubspec.yaml                              |  6 ++++--
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index fc36cc59..71420951 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,4 +1,5 @@
-import 'package:diplomaticquarterapp/analytics/google-analytics.dart';
+import 'dart:io';
+
 import 'package:diplomaticquarterapp/core/viewModels/dashboard_view_model.dart';
 import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
 import 'package:diplomaticquarterapp/routes.dart';
@@ -14,6 +15,7 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:in_app_update/in_app_update.dart';
 import 'package:provider/provider.dart';
 
 import 'config/size_config.dart';
@@ -36,12 +38,27 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyApp extends State<MyApp> {
+  AppUpdateInfo _updateInfo;
+
+  Future<void> checkForUpdate() async {
+    InAppUpdate.checkForUpdate().then((info) {
+      if (info.updateAvailable) {
+        InAppUpdate.performImmediateUpdate().then((value) {}).catchError((e) => print(e.toString()));
+      }
+    }).catchError((e) {
+      print(e.toString());
+    });
+  }
+
   @override
   void initState() {
     // ProjectViewModel projectProvider;
     // projectProvider = Provider.of(context);
     // var font = projectProvider.isArabic ? 'Cairo' : 'WorkSans';
 
+    // Re-enable once going live
+    // if (Platform.isAndroid) checkForUpdate();
+
     ThemeNotifier(defaultTheme());
     super.initState();
   }
@@ -83,10 +100,8 @@ class _MyApp extends State<MyApp> {
                   value: RobotProvider().intStream(),
                   initialData: RobotProvider().setValue({}),
                 ),
-                ChangeNotifierProvider<CompareList>(
-                    create: (context) => CompareList()),
-                ChangeNotifierProvider<OrderPreviewViewModel>(
-                    create: (context) => OrderPreviewViewModel()),
+                ChangeNotifierProvider<CompareList>(create: (context) => CompareList()),
+                ChangeNotifierProvider<OrderPreviewViewModel>(create: (context) => OrderPreviewViewModel()),
               ],
               child: Consumer<ProjectViewModel>(
                 builder: (context, projectProvider, child) => MaterialApp(
diff --git a/lib/widgets/charts/show_chart.dart b/lib/widgets/charts/show_chart.dart
index b23d90f5..86c83f5b 100644
--- a/lib/widgets/charts/show_chart.dart
+++ b/lib/widgets/charts/show_chart.dart
@@ -137,7 +137,7 @@ class ShowChart extends StatelessWidget {
             fontWeight: FontWeight.bold,
             fontSize: 10,
           ),
-          interval: null,
+          interval: _fetchLeftTileInterval(),
           margin: 12,
         ),
       ),
@@ -177,6 +177,11 @@ class ShowChart extends StatelessWidget {
     minY -= increasingY.abs();
   }
 
+  double _fetchLeftTileInterval() {
+    final interval = ((lastY - intialY) / 5).toDouble();
+    return interval < 1.0 ? 1.0 : interval;
+  }
+
   double getMaxY() {
     maxY = 0;
     timeSeries.forEach((element) {
diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart
index 0b96d8fe..6209f52d 100644
--- a/lib/widgets/drawer/app_drawer_widget.dart
+++ b/lib/widgets/drawer/app_drawer_widget.dart
@@ -19,6 +19,7 @@ import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doct
 import 'package:diplomaticquarterapp/pages/webRTC/call_page.dart';
 import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
+import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
 import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
 import 'package:diplomaticquarterapp/theme/colors.dart';
 import 'package:diplomaticquarterapp/theme/theme_notifier.dart';
@@ -35,7 +36,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
+
 import '../../config/size_config.dart';
 import '../../locator.dart';
 import 'drawer_item_widget.dart';
@@ -46,10 +47,10 @@ class AppDrawer extends StatefulWidget {
 }
 
 class _AppDrawerState extends State<AppDrawer> {
+
   @override
   void initState() {
     super.initState();
-
     checkUserData();
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 90de021b..15c10362 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: diplomaticquarterapp
 description: A new Flutter application.
 
 
-version: 1.0.4+5
+version: 4.3.5+1
 
 environment:
   sdk: ">=2.9.0 <3.0.0"
@@ -32,7 +32,7 @@ dependencies:
 
 
   #chart
-  fl_chart: ^0.12.1
+  fl_chart: ^0.12.3
 
   # Permissions
   permission_handler: ^5.0.0+hotfix.3
@@ -187,6 +187,8 @@ dependencies:
   speech_to_text:
     path: speech_to_text
 
+  in_app_update: ^1.1.15
+
   badges: ^1.1.4
 #  open_settings: ^2.0.1
   # Dep by Zohaib