Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 70-improve-app-metadata
  • master
  • Release_0.0.28_28
  • Release_0.0.29_29
  • Release_0.0.30_30
  • Release_0.0.31_31
  • Release_0.0.32_32
  • Release_0.0.33_33
  • Release_0.0.34_34
  • Release_0.0.35_35
  • Release_0.0.36_36
  • Release_0.0.37_37
  • Release_0.0.38_38
  • Release_0.0.39_39
  • Release_0.0.40_40
  • Release_0.0.41_41
  • Release_0.0.42_42
  • Release_0.0.43_43
  • Release_0.0.44_44
  • Release_0.0.45_45
  • Release_0.0.46_46
  • Release_0.0.47_47
  • Release_0.0.48_48
  • Release_0.0.49_49
  • Release_0.0.50_50
  • Release_0.0.51_51
  • Release_0.0.52_52
  • Release_0.0.53_53
  • Release_0.0.54_54
  • Release_0.0.55_55
  • Release_0.0.56_56
  • Release_0.0.57_57
  • Release_0.0.58_58
  • Release_0.0.59_59
  • Release_0.0.60_60
  • Release_0.0.61_61
  • Release_0.1.0_62
  • Release_0.1.1_63
  • Release_0.2.0_64
  • Release_0.2.1_65
  • Release_0.3.0_66
  • Release_0.3.1_67
  • Release_0.4.0_68
  • Release_0.4.1_69
  • Release_0.4.2_70
  • Release_0.5.0_71
  • Release_0.6.0_72
  • Release_0.7.0_73
  • Release_0.8.0_74
  • Release_0.8.1_75
  • Release_0.8.2_76
  • Release_0.9.0_77
52 results

Target

Select target project
  • android/org.benoitharrault.puzzlegame
1 result
Select Git revision
  • 70-improve-app-metadata
  • master
  • Release_0.0.28_28
  • Release_0.0.29_29
  • Release_0.0.30_30
  • Release_0.0.31_31
  • Release_0.0.32_32
  • Release_0.0.33_33
  • Release_0.0.34_34
  • Release_0.0.35_35
  • Release_0.0.36_36
  • Release_0.0.37_37
  • Release_0.0.38_38
  • Release_0.0.39_39
  • Release_0.0.40_40
  • Release_0.0.41_41
  • Release_0.0.42_42
  • Release_0.0.43_43
  • Release_0.0.44_44
  • Release_0.0.45_45
  • Release_0.0.46_46
  • Release_0.0.47_47
  • Release_0.0.48_48
  • Release_0.0.49_49
  • Release_0.0.50_50
  • Release_0.0.51_51
  • Release_0.0.52_52
  • Release_0.0.53_53
  • Release_0.0.54_54
  • Release_0.0.55_55
  • Release_0.0.56_56
  • Release_0.0.57_57
  • Release_0.0.58_58
  • Release_0.0.59_59
  • Release_0.0.60_60
  • Release_0.0.61_61
  • Release_0.1.0_62
  • Release_0.1.1_63
  • Release_0.2.0_64
  • Release_0.2.1_65
  • Release_0.3.0_66
  • Release_0.3.1_67
  • Release_0.4.0_68
  • Release_0.4.1_69
  • Release_0.4.2_70
  • Release_0.5.0_71
  • Release_0.6.0_72
  • Release_0.7.0_73
  • Release_0.8.0_74
  • Release_0.8.1_75
  • Release_0.8.2_76
  • Release_0.9.0_77
52 results
Show changes
Commits on Source (2)
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.0.3 app.versionName=0.0.4
app.versionCode=3 app.versionCode=4
...@@ -7,6 +7,8 @@ class Data extends ChangeNotifier { ...@@ -7,6 +7,8 @@ class Data extends ChangeNotifier {
String _image = ''; String _image = '';
List _tiles = []; List _tiles = [];
// application state
bool _shuffling = false;
String get image => _image; String get image => _image;
...@@ -29,6 +31,13 @@ class Data extends ChangeNotifier { ...@@ -29,6 +31,13 @@ class Data extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
bool get shuffling => _shuffling;
set updateShuffling(bool value) {
_shuffling = value;
notifyListeners();
}
void resetGame() { void resetGame() {
_image = ''; _image = '';
notifyListeners(); notifyListeners();
......
...@@ -36,8 +36,10 @@ class Home extends StatelessWidget { ...@@ -36,8 +36,10 @@ class Home extends StatelessWidget {
} }
Future<void> selectImage(Data myProvider, String imageCode) async { Future<void> selectImage(Data myProvider, String imageCode) async {
myProvider.updateShuffling = true;
myProvider.updateImage = imageCode; myProvider.updateImage = imageCode;
myProvider.updateTiles = await splitImageInTiles(myProvider); myProvider.updateTiles = await splitImageInTiles(myProvider);
myProvider.updateShuffling = false;
} }
Container _buildImageSelectorItem(Data myProvider, String image) { Container _buildImageSelectorItem(Data myProvider, String image) {
...@@ -205,10 +207,41 @@ class Home extends StatelessWidget { ...@@ -205,10 +207,41 @@ class Home extends StatelessWidget {
); );
} }
Container _buildShufflingIndicatorWidget() {
return Container(
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'⏳',
style: TextStyle(
fontSize: 60,
fontWeight: FontWeight.w600,
color: Colors.black,
),
),
],
),
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Data _myProvider = Provider.of<Data>(context); Data _myProvider = Provider.of<Data>(context);
var content;
if (_myProvider.shuffling) {
content = _buildShufflingIndicatorWidget();
} else {
if (_myProvider.image == '') {
content = _buildImageSelector(_myProvider);
} else {
content = _buildGameWidget(_myProvider);
}
}
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Puzzle'), title: Text('Puzzle'),
...@@ -223,9 +256,7 @@ class Home extends StatelessWidget { ...@@ -223,9 +256,7 @@ class Home extends StatelessWidget {
), ),
body: SafeArea( body: SafeArea(
child: Center( child: Center(
child: _myProvider.image == '' child: content
? _buildImageSelector(_myProvider)
: _buildGameWidget(_myProvider),
), ),
) )
); );
......