Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
org.benoitharrault.puzzlegame
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
android
org.benoitharrault.puzzlegame
Compare revisions
66557b1c2b72202ed4ff5e48a7eaf57abac6d14e to 2b0050ba7e1f577f81e14775d6610f08f081c4ec
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
android/org.benoitharrault.puzzlegame
Select target project
No results found
2b0050ba7e1f577f81e14775d6610f08f081c4ec
Select Git revision
Branches
70-improve-app-metadata
master
Tags
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
Swap
Target
android/org.benoitharrault.puzzlegame
Select target project
android/org.benoitharrault.puzzlegame
1 result
66557b1c2b72202ed4ff5e48a7eaf57abac6d14e
Select Git revision
Branches
70-improve-app-metadata
master
Tags
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
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Allow choose tileset division count
· 4cda62e5
Benoît Harrault
authored
3 years ago
4cda62e5
Merge branch '16-allow-choose-tileset-size' into 'master'
· 2b0050ba
Benoît Harrault
authored
3 years ago
Resolve "Allow choose tileset size" Closes
#16
See merge request
!12
2b0050ba
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
android/gradle.properties
+2
-2
2 additions, 2 deletions
android/gradle.properties
lib/provider/data.dart
+10
-0
10 additions, 0 deletions
lib/provider/data.dart
lib/screens/home.dart
+48
-12
48 additions, 12 deletions
lib/screens/home.dart
with
60 additions
and
14 deletions
android/gradle.properties
View file @
2b0050ba
org.gradle.jvmargs
=
-Xmx1536M
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableJetifier
=
true
app.versionName
=
0.0.
8
app.versionName
=
0.0.
9
app.versionCode
=
8
app.versionCode
=
9
This diff is collapsed.
Click to expand it.
lib/provider/data.dart
View file @
2b0050ba
...
@@ -4,6 +4,9 @@ import '../entities/tile.dart';
...
@@ -4,6 +4,9 @@ import '../entities/tile.dart';
class
Data
extends
ChangeNotifier
{
class
Data
extends
ChangeNotifier
{
// application configuration
int
_tilesCount
=
3
;
// application data
// application data
List
_images
=
[];
List
_images
=
[];
String
_image
=
''
;
String
_image
=
''
;
...
@@ -19,6 +22,13 @@ class Data extends ChangeNotifier {
...
@@ -19,6 +22,13 @@ class Data extends ChangeNotifier {
notifyListeners
();
notifyListeners
();
}
}
int
get
tilesCount
=
>
_tilesCount
;
set
updateTilesCount
(
int
value
)
{
_tilesCount
=
value
;
notifyListeners
();
}
List
get
images
=
>
_images
;
List
get
images
=
>
_images
;
set
updateImages
(
List
value
)
{
set
updateImages
(
List
value
)
{
...
...
This diff is collapsed.
Click to expand it.
lib/screens/home.dart
View file @
2b0050ba
...
@@ -12,9 +12,6 @@ import '../utils/get_images_list.dart';
...
@@ -12,9 +12,6 @@ import '../utils/get_images_list.dart';
class
Home
extends
StatelessWidget
{
class
Home
extends
StatelessWidget
{
static
const
String
id
=
'home'
;
static
const
String
id
=
'home'
;
int
_linesCount
=
4
;
int
_columnsCount
=
4
;
double
_selectorImageSize
=
200
;
double
_selectorImageSize
=
200
;
double
_tipImageSize
=
100
;
double
_tipImageSize
=
100
;
double
_tileImageSize
=
80
;
double
_tileImageSize
=
80
;
...
@@ -84,6 +81,43 @@ class Home extends StatelessWidget {
...
@@ -84,6 +81,43 @@ class Home extends StatelessWidget {
);
);
}
}
FlatButton
_buildTilesetSizeSelectorItem
(
Data
myProvider
,
int
value
)
{
BoxDecoration
border
=
myProvider
.
tilesCount
==
value
?
BoxDecoration
(
borderRadius:
BorderRadius
.
circular
(
4
),
border:
Border
.
all
(
color:
Colors
.
blue
[
100
],
width:
4
,
),
)
:
null
;
return
FlatButton
(
child:
Container
(
padding:
EdgeInsets
.
all
(
5
),
decoration:
border
,
child:
Text
(
value
.
toString
()
+
'x'
+
value
.
toString
()),
),
onPressed:
()
{
myProvider
.
updateTilesCount
=
value
;
},
);
}
Container
_buildTilesetSizeSelector
(
Data
myProvider
)
{
return
Container
(
child:
Center
(
child:
Row
(
mainAxisAlignment:
MainAxisAlignment
.
center
,
crossAxisAlignment:
CrossAxisAlignment
.
center
,
children:
[
_buildTilesetSizeSelectorItem
(
myProvider
,
3
),
_buildTilesetSizeSelectorItem
(
myProvider
,
4
),
],
),
),
);
}
Future
<
List
<
Tile
>>
splitImageInTiles
(
Data
myProvider
)
async
{
Future
<
List
<
Tile
>>
splitImageInTiles
(
Data
myProvider
)
async
{
String
imageAsset
=
getImageAssetName
(
myProvider
.
image
);
String
imageAsset
=
getImageAssetName
(
myProvider
.
image
);
Uint8List
imageData
=
(
await
rootBundle
.
load
(
imageAsset
))
Uint8List
imageData
=
(
await
rootBundle
.
load
(
imageAsset
))
...
@@ -92,12 +126,12 @@ class Home extends StatelessWidget {
...
@@ -92,12 +126,12 @@ class Home extends StatelessWidget {
imglib
.
Image
image
=
imglib
.
decodeImage
(
imageData
);
imglib
.
Image
image
=
imglib
.
decodeImage
(
imageData
);
int
x
=
0
,
y
=
0
;
int
x
=
0
,
y
=
0
;
int
width
=
(
image
.
width
/
_lin
esCount
)
.
round
();
int
width
=
(
image
.
width
/
myProvider
.
til
esCount
)
.
round
();
int
height
=
(
image
.
height
/
_column
sCount
)
.
round
();
int
height
=
(
image
.
height
/
myProvider
.
tile
sCount
)
.
round
();
List
<
Tile
>
tiles
=
List
<
Tile
>();
List
<
Tile
>
tiles
=
List
<
Tile
>();
for
(
int
i
=
0
;
i
<
_lin
esCount
;
i
++
)
{
for
(
int
i
=
0
;
i
<
myProvider
.
til
esCount
;
i
++
)
{
for
(
int
j
=
0
;
j
<
_column
sCount
;
j
++
)
{
for
(
int
j
=
0
;
j
<
myProvider
.
tile
sCount
;
j
++
)
{
tiles
.
add
(
tiles
.
add
(
Tile
(
Tile
(
Image
.
memory
(
Image
.
memory
(
...
@@ -136,9 +170,9 @@ class Home extends StatelessWidget {
...
@@ -136,9 +170,9 @@ class Home extends StatelessWidget {
width:
2
,
width:
2
,
),
),
children:
[
children:
[
for
(
var
row
=
0
;
row
<
_lin
esCount
;
row
++
)
for
(
var
row
=
0
;
row
<
myProvider
.
til
esCount
;
row
++
)
TableRow
(
children:
[
TableRow
(
children:
[
for
(
var
col
=
0
;
col
<
_column
sCount
;
col
++
)
for
(
var
col
=
0
;
col
<
myProvider
.
tile
sCount
;
col
++
)
Column
(
children:
[
tiles
[
tileIndex
++
]
.
widget
(
myProvider
)]),
Column
(
children:
[
tiles
[
tileIndex
++
]
.
widget
(
myProvider
)]),
]),
]),
]
]
...
@@ -236,9 +270,11 @@ class Home extends StatelessWidget {
...
@@ -236,9 +270,11 @@ class Home extends StatelessWidget {
_myProvider
.
image
==
''
_myProvider
.
image
==
''
?
Text
(
''
)
?
Text
(
''
)
:
IconButton
(
:
IconButton
(
icon:
const
Icon
(
Icons
.
arrow_left_outlined
),
icon:
const
Icon
(
Icons
.
arrow_left_outlined
),
onPressed:
()
=
>
resetGame
(
_myProvider
),
onPressed:
()
=
>
resetGame
(
_myProvider
),
),
)
,
_myProvider
.
image
==
''
?
_buildTilesetSizeSelector
(
_myProvider
)
:
Text
(
''
),
],
],
),
),
body:
SafeArea
(
body:
SafeArea
(
...
...
This diff is collapsed.
Click to expand it.