From 7868ee3820ab1cf9922331ed998c8ab42b60e915 Mon Sep 17 00:00:00 2001 From: jideguru Date: Tue, 17 Mar 2020 19:45:48 +0100 Subject: [PATCH] Fix for #10 --- android/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- lib/main.dart | 32 +++------- lib/screens/home.dart | 19 ------ pubspec.lock | 60 ++++++++++++++++--- pubspec.yaml | 4 -- 6 files changed, 61 insertions(+), 60 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b7faad8..3100ad2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 2819f02..296b146 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/lib/main.dart b/lib/main.dart index 5d1766c..b8dccdf 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_travel_concept/controller/home_controller.dart'; import 'package:flutter_travel_concept/screens/main_screen.dart'; import 'package:flutter_travel_concept/util/const.dart'; -import 'package:provider/provider.dart'; void main() async { runApp(MyApp()); @@ -15,31 +13,15 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { - bool isDark = true; - - @override - void initState() { - super.initState(); - SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values); - SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle( - statusBarColor: isDark ? Constants.darkPrimary : Constants.lightPrimary, - statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark, - )); - } @override Widget build(BuildContext context) { - return ChangeNotifierProvider( - builder: (_) => HomeController(), - child: Consumer( - builder: (_, value, child) { - return MaterialApp( - debugShowCheckedModeBanner: false, - title: Constants.appName, - theme: value.modeChange ? Constants.darkTheme : Constants.lightTheme, - home: MainScreen(), - ); - }, - )); + return MaterialApp( + debugShowCheckedModeBanner: false, + title: Constants.appName, + theme: Constants.lightTheme, + darkTheme: Constants.darkTheme, + home: MainScreen(), + ); } } diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 5211591..40d49b0 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:flutter_travel_concept/controller/home_controller.dart'; import 'package:flutter_travel_concept/screens/details.dart'; import 'package:flutter_travel_concept/widgets/icon_badge.dart'; import 'package:flutter_travel_concept/util/places.dart'; -import 'package:provider/provider.dart'; class Home extends StatefulWidget { @override @@ -15,7 +13,6 @@ class _HomeState extends State { @override Widget build(BuildContext context) { - final provider = Provider.of(context); return Scaffold( appBar: AppBar( @@ -28,22 +25,6 @@ class _HomeState extends State { ), ], ), - drawer: Drawer( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - child: Container(), - ), - FlatButton( - child: provider.modeChange ? Text('Dark mode') : Text('White Mode'), - onPressed: () { - provider.setModeChange = !provider.modeChange; - }, - ), - ], - ), - ), body: ListView( children: [ Padding( diff --git a/pubspec.lock b/pubspec.lock index 109af67..a48c6ef 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,13 +1,27 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.11" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.0" boolean_selector: dependency: transitive description: @@ -29,6 +43,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.14.11" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" cupertino_icons: dependency: "direct main" description: @@ -46,20 +74,27 @@ packages: description: flutter source: sdk version: "0.0.0" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.6" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" path: dependency: transitive description: @@ -74,13 +109,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0+1" - provider: - dependency: "direct main" + petitparser: + dependency: transitive description: - name: provider + name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "3.1.0+1" + version: "2.4.0" quiver: dependency: transitive description: @@ -134,7 +169,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.11" typed_data: dependency: transitive description: @@ -149,5 +184,12 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "3.5.0" sdks: - dart: ">=2.2.2 <3.0.0" + dart: ">=2.4.0 <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 10afce1..83fbc78 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,11 +19,7 @@ environment: dependencies: flutter: sdk: flutter - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 - provider: ^3.1.0+1 dev_dependencies: flutter_test: