Chart fix & In-App update implemented

merge-requests/447/head
haroon amjad 4 years ago
parent 0c895348e7
commit 12a58856e5

@ -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/core/viewModels/dashboard_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
import 'package:diplomaticquarterapp/routes.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/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:in_app_update/in_app_update.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'config/size_config.dart'; import 'config/size_config.dart';
@ -36,12 +38,27 @@ class MyApp extends StatefulWidget {
} }
class _MyApp extends State<MyApp> { 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 @override
void initState() { void initState() {
// ProjectViewModel projectProvider; // ProjectViewModel projectProvider;
// projectProvider = Provider.of(context); // projectProvider = Provider.of(context);
// var font = projectProvider.isArabic ? 'Cairo' : 'WorkSans'; // var font = projectProvider.isArabic ? 'Cairo' : 'WorkSans';
// Re-enable once going live
// if (Platform.isAndroid) checkForUpdate();
ThemeNotifier(defaultTheme()); ThemeNotifier(defaultTheme());
super.initState(); super.initState();
} }
@ -83,10 +100,8 @@ class _MyApp extends State<MyApp> {
value: RobotProvider().intStream(), value: RobotProvider().intStream(),
initialData: RobotProvider().setValue({}), initialData: RobotProvider().setValue({}),
), ),
ChangeNotifierProvider<CompareList>( ChangeNotifierProvider<CompareList>(create: (context) => CompareList()),
create: (context) => CompareList()), ChangeNotifierProvider<OrderPreviewViewModel>(create: (context) => OrderPreviewViewModel()),
ChangeNotifierProvider<OrderPreviewViewModel>(
create: (context) => OrderPreviewViewModel()),
], ],
child: Consumer<ProjectViewModel>( child: Consumer<ProjectViewModel>(
builder: (context, projectProvider, child) => MaterialApp( builder: (context, projectProvider, child) => MaterialApp(

@ -137,7 +137,7 @@ class ShowChart extends StatelessWidget {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 10, fontSize: 10,
), ),
interval: null, interval: _fetchLeftTileInterval(),
margin: 12, margin: 12,
), ),
), ),
@ -177,6 +177,11 @@ class ShowChart extends StatelessWidget {
minY -= increasingY.abs(); minY -= increasingY.abs();
} }
double _fetchLeftTileInterval() {
final interval = ((lastY - intialY) / 5).toDouble();
return interval < 1.0 ? 1.0 : interval;
}
double getMaxY() { double getMaxY() {
maxY = 0; maxY = 0;
timeSeries.forEach((element) { timeSeries.forEach((element) {

@ -19,6 +19,7 @@ import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doct
import 'package:diplomaticquarterapp/pages/webRTC/call_page.dart'; import 'package:diplomaticquarterapp/pages/webRTC/call_page.dart';
import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.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/services/family_files/family_files_provider.dart';
import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/theme/theme_notifier.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:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
import '../../config/size_config.dart'; import '../../config/size_config.dart';
import '../../locator.dart'; import '../../locator.dart';
import 'drawer_item_widget.dart'; import 'drawer_item_widget.dart';
@ -46,10 +47,10 @@ class AppDrawer extends StatefulWidget {
} }
class _AppDrawerState extends State<AppDrawer> { class _AppDrawerState extends State<AppDrawer> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
checkUserData(); checkUserData();
} }

@ -2,7 +2,7 @@ name: diplomaticquarterapp
description: A new Flutter application. description: A new Flutter application.
version: 1.0.4+5 version: 4.3.5+1
environment: environment:
sdk: ">=2.9.0 <3.0.0" sdk: ">=2.9.0 <3.0.0"
@ -32,7 +32,7 @@ dependencies:
#chart #chart
fl_chart: ^0.12.1 fl_chart: ^0.12.3
# Permissions # Permissions
permission_handler: ^5.0.0+hotfix.3 permission_handler: ^5.0.0+hotfix.3
@ -187,6 +187,8 @@ dependencies:
speech_to_text: speech_to_text:
path: speech_to_text path: speech_to_text
in_app_update: ^1.1.15
badges: ^1.1.4 badges: ^1.1.4
# open_settings: ^2.0.1 # open_settings: ^2.0.1
# Dep by Zohaib # Dep by Zohaib

Loading…
Cancel
Save