Skip to content
Snippets Groups Projects
Commit 5da77c39 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '7-upgrade-flutter-framework-and-dependencies' into 'master' 

Resolve "Upgrade flutter framework and dependencies"

Closes #7

See merge request !6
parents 7cbf295f 9eb1718e
No related branches found
No related tags found
1 merge request!6Resolve "Upgrade flutter framework and dependencies"
Pipeline #3496 passed
Stage: update
Stage: build-debug
Show whitespace changes
Inline Side-by-side
Showing
with 94 additions and 93 deletions
android/gradle.properties
+ 2
− 2
View file @ 5da77c39
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
app.versionName=0.0.4
app.versionCode=4
app.versionName=0.0.5
app.versionCode=5
fastlane/metadata/android/en-US/changelogs/5.txt 0 → 100644
+ 1
− 0
View file @ 5da77c39
Upgrade Flutter framework and dependencies, clean some code
fastlane/metadata/android/fr-FR/changelogs/5.txt 0 → 100644
+ 1
− 0
View file @ 5da77c39
Mise à jour du framework Flutter et de ses dépendances, nettoyage de code
ios/Flutter/Generated.xcconfig
+ 2
− 1
View file @ 5da77c39
......@@ -7,7 +7,8 @@ FLUTTER_BUILD_DIR=build
FLUTTER_BUILD_NAME=1.0.0
FLUTTER_BUILD_NUMBER=1
EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
DART_OBFUSCATION=false
TRACK_WIDGET_CREATION=false
TRACK_WIDGET_CREATION=true
TREE_SHAKE_ICONS=false
PACKAGE_CONFIG=.dart_tool/package_config.json
ios/Flutter/flutter_export_environment.sh
+ 1
− 1
View file @ 5da77c39
......@@ -8,6 +8,6 @@ export "FLUTTER_BUILD_DIR=build"
export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=false"
export "TRACK_WIDGET_CREATION=true"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.dart_tool/package_config.json"
lib/layout/game.dart
+ 9
− 16
View file @ 5da77c39
import 'dart:math';
import 'package:flutter/material.dart';
import '../provider/data.dart';
import '../utils/game_utils.dart';
class Game {
static Container buildGameWidget(Data myProvider) {
bool gameIsFinished = myProvider.isGameFinished();
......@@ -22,17 +19,15 @@ class Game {
Container(
height: 150,
width: double.maxFinite,
child: gameIsFinished
? Game.buildEndGameMessage(myProvider)
: Text('❇️'),
child: gameIsFinished ? Game.buildEndGameMessage(myProvider) : Text('❇️'),
),
],
),
);
}
static FlatButton buildRestartGameButton(Data myProvider) {
return FlatButton(
static TextButton buildRestartGameButton(Data myProvider) {
return TextButton(
child: Container(
child: Image(
image: AssetImage('assets/icons/button_back.png'),
......@@ -53,13 +48,12 @@ class Game {
Image decorationImage = Image(
image: AssetImage(decorationImageAssetName),
fit: BoxFit.fill
fit: BoxFit.fill,
);
return Container(
margin: EdgeInsets.all(2),
padding: EdgeInsets.all(2),
child: Table(
defaultColumnWidth: IntrinsicColumnWidth(),
children: [
......@@ -70,9 +64,8 @@ class Game {
Column(children: [decorationImage]),
],
),
]
)
],
),
);
}
}
lib/layout/parameters.dart
+ 9
− 12
View file @ 5da77c39
......@@ -4,7 +4,6 @@ import '../provider/data.dart';
import '../utils/game_utils.dart';
class Parameters {
static Container buildParametersSelector(Data myProvider) {
return Container(
padding: EdgeInsets.all(2),
......@@ -17,7 +16,6 @@ class Parameters {
SizedBox(height: 5),
Parameters.buildParameterSelector(myProvider, 'skin'),
SizedBox(height: 5),
Parameters.buildStartGameButton(myProvider),
],
),
......@@ -29,15 +27,14 @@ class Parameters {
children: [
Image(
image: AssetImage('assets/icons/game_win.png'),
fit: BoxFit.fill
fit: BoxFit.fill,
),
]
],
);
return Container(
margin: EdgeInsets.all(2),
padding: EdgeInsets.all(2),
child: Table(
defaultColumnWidth: IntrinsicColumnWidth(),
children: [
......@@ -46,7 +43,7 @@ class Parameters {
decorationImage,
Column(
children: [
FlatButton(
TextButton(
child: Container(
child: Image(
image: AssetImage('assets/icons/button_start.png'),
......@@ -55,13 +52,13 @@ class Parameters {
),
onPressed: () => GameUtils.startGame(myProvider),
),
]
],
),
decorationImage,
],
),
]
)
],
),
);
}
......@@ -81,7 +78,7 @@ class Parameters {
Column(
children: [
_buildParameterButton(myProvider, parameterCode, availableValues[index])
]
],
),
],
),
......@@ -89,7 +86,8 @@ class Parameters {
);
}
static TextButton _buildParameterButton(Data myProvider, String parameterCode, String parameterValue) {
static TextButton _buildParameterButton(
Data myProvider, String parameterCode, String parameterValue) {
String currentValue = myProvider.getParameterValue(parameterCode).toString();
bool isActive = (parameterValue == currentValue);
......@@ -114,5 +112,4 @@ class Parameters {
onPressed: () => myProvider.setParameterValue(parameterCode, parameterValue),
);
}
}
lib/main.dart
+ 16
− 13
View file @ 5da77c39
......@@ -17,7 +17,8 @@ class MyApp extends StatelessWidget {
Widget build(BuildContext context) {
return ChangeNotifierProvider(
create: (BuildContext context) => Data(),
child: Consumer<Data>(builder: (context, data, child) {
child: Consumer<Data>(
builder: (context, data, child) {
return OverlaySupport(
child: MaterialApp(
debugShowCheckedModeBanner: false,
......@@ -29,8 +30,10 @@ class MyApp extends StatelessWidget {
routes: {
Home.id: (context) => Home(),
},
));
}),
),
);
},
),
);
}
}
lib/provider/data.dart
+ 29
− 17
View file @ 5da77c39
......@@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart';
import 'package:shared_preferences/shared_preferences.dart';
class Data extends ChangeNotifier {
// Configuration available values
List _availableLevelValues = ['easy', 'normal', 'hard', 'nightmare'];
List _availableSkinValues = ['colors', 'retro'];
......@@ -34,28 +33,42 @@ class Data extends ChangeNotifier {
getParameterValue(String parameterCode) {
switch (parameterCode) {
case 'level': { return _level; }
break;
case 'skin': { return _skin; }
break;
case 'level':
{
return _level;
}
case 'skin':
{
return _skin;
}
}
}
List getParameterAvailableValues(String parameterCode) {
switch (parameterCode) {
case 'level': { return _availableLevelValues; }
break;
case 'skin': { return _availableSkinValues; }
break;
case 'level':
{
return _availableLevelValues;
}
case 'skin':
{
return _availableSkinValues;
}
}
return [];
}
setParameterValue(String parameterCode, String parameterValue) async {
switch (parameterCode) {
case 'level': { updateLevel(parameterValue); }
case 'level':
{
updateLevel(parameterValue);
}
break;
case 'skin': { updateSkin(parameterValue); }
case 'skin':
{
updateSkin(parameterValue);
}
break;
}
final prefs = await SharedPreferences.getInstance();
......@@ -85,5 +98,4 @@ class Data extends ChangeNotifier {
_gameWon = false;
notifyListeners();
}
}
lib/screens/home.dart
+ 5
− 5
View file @ 5da77c39
......@@ -31,7 +31,7 @@ class _HomeState extends State<Home> {
if (myProvider.gameIsRunning) {
menuActions = [
FlatButton(
TextButton(
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4),
......@@ -43,7 +43,7 @@ class _HomeState extends State<Home> {
margin: EdgeInsets.all(8),
child: Image(
image: AssetImage('assets/icons/button_back.png'),
fit: BoxFit.fill
fit: BoxFit.fill,
),
),
onPressed: () => toast('Long press to quit game...'),
......@@ -60,9 +60,9 @@ class _HomeState extends State<Home> {
child: Center(
child: myProvider.gameIsRunning
? Game.buildGameWidget(myProvider)
: Parameters.buildParametersSelector(myProvider)
: Parameters.buildParametersSelector(myProvider),
),
),
)
);
}
}
pubspec.lock
+ 19
− 26
View file @ 5da77c39
......@@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.2"
version: "2.9.0"
boolean_selector:
dependency: transitive
description:
......@@ -21,21 +21,14 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
collection:
dependency: transitive
description:
......@@ -49,7 +42,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.3.1"
ffi:
dependency: transitive
description:
......@@ -63,7 +56,7 @@ packages:
name: file
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.2"
version: "6.1.4"
flutter:
dependency: "direct main"
description: flutter
......@@ -92,21 +85,21 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
version: "0.12.12"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4"
version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
version: "1.8.0"
nested:
dependency: transitive
description:
......@@ -127,7 +120,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
version: "1.8.2"
path_provider_linux:
dependency: transitive
description:
......@@ -148,7 +141,7 @@ packages:
name: path_provider_windows
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.3"
platform:
dependency: transitive
description:
......@@ -162,7 +155,7 @@ packages:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
version: "2.1.3"
process:
dependency: transitive
description:
......@@ -190,7 +183,7 @@ packages:
name: shared_preferences_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.12"
version: "2.0.13"
shared_preferences_ios:
dependency: transitive
description:
......@@ -218,7 +211,7 @@ packages:
name: shared_preferences_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "2.1.0"
shared_preferences_web:
dependency: transitive
description:
......@@ -244,7 +237,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.2"
version: "1.9.0"
stack_trace:
dependency: transitive
description:
......@@ -265,21 +258,21 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.9"
version: "0.4.12"
vector_math:
dependency: transitive
description:
......@@ -293,14 +286,14 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.7.0"
version: "3.0.0"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0+1"
version: "0.2.0+2"
sdks:
dart: ">=2.17.0 <3.0.0"
flutter: ">=3.0.0"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment