Skip to content

Commit 7868ee3

Browse files
committed
Fix for JideGuru#10
1 parent 6ebd7ac commit 7868ee3

File tree

6 files changed

+61
-60
lines changed

6 files changed

+61
-60
lines changed

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.71'
2+
ext.kotlin_version = '1.3.50'
33
repositories {
44
google()
55
jcenter()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.5.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

lib/main.dart

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter/services.dart';
3-
import 'package:flutter_travel_concept/controller/home_controller.dart';
43
import 'package:flutter_travel_concept/screens/main_screen.dart';
54
import 'package:flutter_travel_concept/util/const.dart';
6-
import 'package:provider/provider.dart';
75

86
void main() async {
97
runApp(MyApp());
@@ -15,31 +13,15 @@ class MyApp extends StatefulWidget {
1513
}
1614

1715
class _MyAppState extends State<MyApp> {
18-
bool isDark = true;
19-
20-
@override
21-
void initState() {
22-
super.initState();
23-
SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values);
24-
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
25-
statusBarColor: isDark ? Constants.darkPrimary : Constants.lightPrimary,
26-
statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
27-
));
28-
}
2916

3017
@override
3118
Widget build(BuildContext context) {
32-
return ChangeNotifierProvider(
33-
builder: (_) => HomeController(),
34-
child: Consumer<HomeController>(
35-
builder: (_, value, child) {
36-
return MaterialApp(
37-
debugShowCheckedModeBanner: false,
38-
title: Constants.appName,
39-
theme: value.modeChange ? Constants.darkTheme : Constants.lightTheme,
40-
home: MainScreen(),
41-
);
42-
},
43-
));
19+
return MaterialApp(
20+
debugShowCheckedModeBanner: false,
21+
title: Constants.appName,
22+
theme: Constants.lightTheme,
23+
darkTheme: Constants.darkTheme,
24+
home: MainScreen(),
25+
);
4426
}
4527
}

lib/screens/home.dart

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_travel_concept/controller/home_controller.dart';
32
import 'package:flutter_travel_concept/screens/details.dart';
43
import 'package:flutter_travel_concept/widgets/icon_badge.dart';
54
import 'package:flutter_travel_concept/util/places.dart';
6-
import 'package:provider/provider.dart';
75

86
class Home extends StatefulWidget {
97
@override
@@ -15,7 +13,6 @@ class _HomeState extends State<Home> {
1513

1614
@override
1715
Widget build(BuildContext context) {
18-
final provider = Provider.of<HomeController>(context);
1916

2017
return Scaffold(
2118
appBar: AppBar(
@@ -28,22 +25,6 @@ class _HomeState extends State<Home> {
2825
),
2926
],
3027
),
31-
drawer: Drawer(
32-
child: Column(
33-
crossAxisAlignment: CrossAxisAlignment.start,
34-
children: <Widget>[
35-
Expanded(
36-
child: Container(),
37-
),
38-
FlatButton(
39-
child: provider.modeChange ? Text('Dark mode') : Text('White Mode'),
40-
onPressed: () {
41-
provider.setModeChange = !provider.modeChange;
42-
},
43-
),
44-
],
45-
),
46-
),
4728
body: ListView(
4829
children: <Widget>[
4930
Padding(

pubspec.lock

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4+
archive:
5+
dependency: transitive
6+
description:
7+
name: archive
8+
url: "https://pub.dartlang.org"
9+
source: hosted
10+
version: "2.0.11"
11+
args:
12+
dependency: transitive
13+
description:
14+
name: args
15+
url: "https://pub.dartlang.org"
16+
source: hosted
17+
version: "1.5.2"
418
async:
519
dependency: transitive
620
description:
721
name: async
822
url: "https://pub.dartlang.org"
923
source: hosted
10-
version: "2.3.0"
24+
version: "2.4.0"
1125
boolean_selector:
1226
dependency: transitive
1327
description:
@@ -29,6 +43,20 @@ packages:
2943
url: "https://pub.dartlang.org"
3044
source: hosted
3145
version: "1.14.11"
46+
convert:
47+
dependency: transitive
48+
description:
49+
name: convert
50+
url: "https://pub.dartlang.org"
51+
source: hosted
52+
version: "2.1.1"
53+
crypto:
54+
dependency: transitive
55+
description:
56+
name: crypto
57+
url: "https://pub.dartlang.org"
58+
source: hosted
59+
version: "2.1.3"
3260
cupertino_icons:
3361
dependency: "direct main"
3462
description:
@@ -46,20 +74,27 @@ packages:
4674
description: flutter
4775
source: sdk
4876
version: "0.0.0"
77+
image:
78+
dependency: transitive
79+
description:
80+
name: image
81+
url: "https://pub.dartlang.org"
82+
source: hosted
83+
version: "2.1.4"
4984
matcher:
5085
dependency: transitive
5186
description:
5287
name: matcher
5388
url: "https://pub.dartlang.org"
5489
source: hosted
55-
version: "0.12.5"
90+
version: "0.12.6"
5691
meta:
5792
dependency: transitive
5893
description:
5994
name: meta
6095
url: "https://pub.dartlang.org"
6196
source: hosted
62-
version: "1.1.7"
97+
version: "1.1.8"
6398
path:
6499
dependency: transitive
65100
description:
@@ -74,13 +109,13 @@ packages:
74109
url: "https://pub.dartlang.org"
75110
source: hosted
76111
version: "1.8.0+1"
77-
provider:
78-
dependency: "direct main"
112+
petitparser:
113+
dependency: transitive
79114
description:
80-
name: provider
115+
name: petitparser
81116
url: "https://pub.dartlang.org"
82117
source: hosted
83-
version: "3.1.0+1"
118+
version: "2.4.0"
84119
quiver:
85120
dependency: transitive
86121
description:
@@ -134,7 +169,7 @@ packages:
134169
name: test_api
135170
url: "https://pub.dartlang.org"
136171
source: hosted
137-
version: "0.2.5"
172+
version: "0.2.11"
138173
typed_data:
139174
dependency: transitive
140175
description:
@@ -149,5 +184,12 @@ packages:
149184
url: "https://pub.dartlang.org"
150185
source: hosted
151186
version: "2.0.8"
187+
xml:
188+
dependency: transitive
189+
description:
190+
name: xml
191+
url: "https://pub.dartlang.org"
192+
source: hosted
193+
version: "3.5.0"
152194
sdks:
153-
dart: ">=2.2.2 <3.0.0"
195+
dart: ">=2.4.0 <3.0.0"

pubspec.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ environment:
1919
dependencies:
2020
flutter:
2121
sdk: flutter
22-
23-
# The following adds the Cupertino Icons font to your application.
24-
# Use with the CupertinoIcons class for iOS style icons.
2522
cupertino_icons: ^0.1.2
26-
provider: ^3.1.0+1
2723

2824
dev_dependencies:
2925
flutter_test:

0 commit comments

Comments
 (0)