diff --git a/android/gradle.properties b/android/gradle.properties index db7a1ee2908d6e94aeb319e1c1b548a8bb245891..14eed3944b547f02179b1b42f4b601f91b7957c0 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=0.0.3 -app.versionCode=3 +app.versionName=0.0.4 +app.versionCode=4 diff --git a/lib/main.dart b/lib/main.dart index 067f75bab60bd5564d8eca6025c9fb7bd8fa7924..900d8ea449b856418ec92a062a27d67c0979c4ee 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import 'package:flutter/services.dart'; -import 'package:wordguessing/home_page.dart'; -import 'package:wordguessing/game_pick_word.dart'; + +import 'provider/data.dart'; +import 'screens/home.dart'; +import 'screens/game_pick_word.dart'; void main() { WidgetsFlutterBinding.ensureInitialized(); @@ -12,29 +15,34 @@ void main() { class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - title: 'Jeux de mots et lettres', - theme: ThemeData( - primarySwatch: Colors.blue, - ), - home: HomePage(), - onGenerateRoute: (settings) { - final args = settings.arguments as Map<String, dynamic>; + return ChangeNotifierProvider( + create: (BuildContext context) => Data(), + child: Consumer<Data>(builder: (context, data, child) { + return MaterialApp( + title: 'Jeux de mots et lettres', + theme: ThemeData( + primarySwatch: Colors.blue, + ), + home: Home(), + onGenerateRoute: (settings) { + final args = settings.arguments as Map<String, dynamic>; - switch(settings.name) { - case '/game-pick-word': { - return MaterialPageRoute( - builder: (context) => GamePickWordPage(), - ); - } - break; + switch(settings.name) { + case '/game-pick-word': { + return MaterialPageRoute( + builder: (context) => GamePickWordPage(), + ); + } + break; - default: { print("Unknown menu entry"); } - break; - } + default: { print("Unknown menu entry"); } + break; + } - return null; - }, + return null; + }, + ); + }), ); } } diff --git a/lib/provider/data.dart b/lib/provider/data.dart new file mode 100644 index 0000000000000000000000000000000000000000..26ba51565a5338663d46e626c47259c3d6eb8915 --- /dev/null +++ b/lib/provider/data.dart @@ -0,0 +1,5 @@ +import 'package:flutter/foundation.dart'; + +class Data extends ChangeNotifier { + +} diff --git a/lib/game_pick_word.dart b/lib/screens/game_pick_word.dart similarity index 100% rename from lib/game_pick_word.dart rename to lib/screens/game_pick_word.dart diff --git a/lib/home_page.dart b/lib/screens/home.dart similarity index 82% rename from lib/home_page.dart rename to lib/screens/home.dart index eacdb019bdcd865e6266cfd7b70f66c16df81454..6c24f3108b6394c73939be5aa4dcf3251f6a2af0 100644 --- a/lib/home_page.dart +++ b/lib/screens/home.dart @@ -1,10 +1,15 @@ -import 'dart:math'; - import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../provider/data.dart'; + +class Home extends StatelessWidget { + static const String id = 'home'; -class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { + Data _myProvider = Provider.of<Data>(context); + return Scaffold( backgroundColor: Colors.blue, body: Center( diff --git a/pubspec.lock b/pubspec.lock index 9e492de8c528151eb2996ba9168649f4f374d054..48d7003cad6a290c024a0c80a4794a8720af3640 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -74,6 +74,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.0" + nested: + dependency: transitive + description: + name: nested + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" path: dependency: transitive description: @@ -81,6 +88,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0" + provider: + dependency: "direct main" + description: + name: provider + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.0" sky_engine: dependency: transitive description: flutter @@ -144,3 +158,4 @@ packages: version: "2.1.0" sdks: dart: ">=2.12.0-0.0 <3.0.0" + flutter: ">=1.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index 885e948059d65b493c647ebc917487fab0c401be..d839050ce6d1d1c200d7d0b3c756ec7cce5ca79d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,6 +9,7 @@ environment: dependencies: flutter: sdk: flutter + provider: ^5.0.0 dev_dependencies: flutter_test: