Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
org.benoitharrault.petitbac
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.petitbac
Commits
2277ffbd
Commit
2277ffbd
authored
4 years ago
by
Benoît Harrault
Browse files
Options
Downloads
Patches
Plain Diff
Disallow multiple simultaneous minigames countdowns
parent
47a4ce6c
No related branches found
No related tags found
1 merge request
!11
Resolve "Fix timer on multiple simultaneous mini games"
Pipeline
#936
passed
4 years ago
Stage: update
Stage: build-debug
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
android/gradle.properties
+2
-2
2 additions, 2 deletions
android/gradle.properties
lib/provider/data.dart
+5
-5
5 additions, 5 deletions
lib/provider/data.dart
lib/screens/home.dart
+14
-12
14 additions, 12 deletions
lib/screens/home.dart
pubspec.lock
+2
-2
2 additions, 2 deletions
pubspec.lock
with
23 additions
and
21 deletions
android/gradle.properties
+
2
−
2
View file @
2277ffbd
org.gradle.jvmargs
=
-Xmx1536M
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.useAndroidX
=
true
android.enableJetifier
=
true
android.enableJetifier
=
true
app.versionName
=
1.2.
2
app.versionName
=
1.2.
3
app.versionCode
=
8
app.versionCode
=
9
This diff is collapsed.
Click to expand it.
lib/provider/data.dart
+
5
−
5
View file @
2277ffbd
...
@@ -7,7 +7,7 @@ class Data extends ChangeNotifier {
...
@@ -7,7 +7,7 @@ class Data extends ChangeNotifier {
bool
_searchingLetter
=
false
;
bool
_searchingLetter
=
false
;
String
_category
=
''
;
String
_category
=
''
;
String
_letter
=
''
;
String
_letter
=
''
;
int
_
timer
=
0
;
int
_
countdown
=
0
;
bool
get
searchingCategory
=
>
_searchingCategory
;
bool
get
searchingCategory
=
>
_searchingCategory
;
...
@@ -37,17 +37,17 @@ class Data extends ChangeNotifier {
...
@@ -37,17 +37,17 @@ class Data extends ChangeNotifier {
notifyListeners
();
notifyListeners
();
}
}
int
get
timer
=
>
_timer
;
int
get
countdown
=
>
_countdown
;
set
update
Timer
(
int
value
)
{
set
update
Countdown
(
int
value
)
{
_
timer
=
value
;
_
countdown
=
value
;
notifyListeners
();
notifyListeners
();
}
}
void
resetGame
()
{
void
resetGame
()
{
_category
=
''
;
_category
=
''
;
_letter
=
''
;
_letter
=
''
;
_
timer
=
0
;
_
countdown
=
0
;
notifyListeners
();
notifyListeners
();
}
}
}
}
This diff is collapsed.
Click to expand it.
lib/screens/home.dart
+
14
−
12
View file @
2277ffbd
...
@@ -14,29 +14,31 @@ class Home extends StatelessWidget {
...
@@ -14,29 +14,31 @@ class Home extends StatelessWidget {
String
_randomLetter
=
''
;
String
_randomLetter
=
''
;
String
_randomCategory
=
''
;
String
_randomCategory
=
''
;
Timer
_timer
;
Timer
_timer
;
int
_
timer
Start
=
10
;
int
_
countdown
Start
=
10
;
Future
<
void
>
startMiniGame
(
BuildContext
context
,
Data
myProvider
)
async
{
Future
<
void
>
startMiniGame
(
BuildContext
context
,
Data
myProvider
)
async
{
if
(
myProvider
.
countdown
==
0
)
{
pickCategory
(
context
,
myProvider
);
pickCategory
(
context
,
myProvider
);
pickLetter
(
context
,
myProvider
);
pickLetter
(
context
,
myProvider
);
startTimer
(
context
,
myProvider
);
startTimer
(
context
,
myProvider
);
}
}
}
Future
<
void
>
startTimer
(
BuildContext
context
,
Data
myProvider
)
async
{
Future
<
void
>
startTimer
(
BuildContext
context
,
Data
myProvider
)
async
{
const
oneSec
=
const
Duration
(
seconds:
1
);
const
oneSec
=
const
Duration
(
seconds:
1
);
if
(
_timer
!=
null
)
{
if
(
_timer
!=
null
)
{
_timer
.
cancel
();
dispose
();
}
}
_
timer
Start
=
10
;
_
countdown
Start
=
10
;
myProvider
.
update
Timer
=
_timer
Start
;
myProvider
.
update
Countdown
=
_countdown
Start
;
_timer
=
new
Timer
.
periodic
(
_timer
=
new
Timer
.
periodic
(
oneSec
,
oneSec
,
(
Timer
timer
)
{
(
Timer
timer
)
{
if
(
_
timer
Start
==
0
)
{
if
(
_
countdown
Start
==
0
)
{
timer
.
cancel
();
timer
.
cancel
();
}
else
{
}
else
{
_
timer
Start
--
;
_
countdown
Start
--
;
myProvider
.
update
Timer
=
_timer
Start
;
myProvider
.
update
Countdown
=
_countdown
Start
;
}
}
},
},
);
);
...
@@ -138,14 +140,14 @@ class Home extends StatelessWidget {
...
@@ -138,14 +140,14 @@ class Home extends StatelessWidget {
mainAxisAlignment:
MainAxisAlignment
.
center
,
mainAxisAlignment:
MainAxisAlignment
.
center
,
children:
<
Widget
>[
children:
<
Widget
>[
FlatButton
(
FlatButton
(
onPressed:
()
=
>
startMiniGame
(
context
,
_myProvider
),
onPressed:
(
_myProvider
.
countdown
!=
0
)
?
null
:
()
=
>
startMiniGame
(
context
,
_myProvider
),
color:
Colors
.
blue
,
color:
Colors
.
blue
,
padding:
EdgeInsets
.
all
(
10.0
),
padding:
EdgeInsets
.
all
(
10.0
),
child:
Row
(
child:
Row
(
mainAxisAlignment:
MainAxisAlignment
.
center
,
mainAxisAlignment:
MainAxisAlignment
.
center
,
children:
<
Widget
>[
children:
<
Widget
>[
Text
(
Text
(
_myProvider
.
timer
.
toString
(),
_myProvider
.
countdown
.
toString
(),
style:
Theme
.
of
(
context
)
.
textTheme
.
headline2
,
style:
Theme
.
of
(
context
)
.
textTheme
.
headline2
,
),
),
],
],
...
...
This diff is collapsed.
Click to expand it.
pubspec.lock
+
2
−
2
View file @
2277ffbd
...
@@ -141,7 +141,7 @@ packages:
...
@@ -141,7 +141,7 @@ packages:
name: test_api
name: test_api
url: "https://pub.dartlang.org"
url: "https://pub.dartlang.org"
source: hosted
source: hosted
version: "0.
2.19
"
version: "0.
3.0
"
typed_data:
typed_data:
dependency: transitive
dependency: transitive
description:
description:
...
@@ -157,5 +157,5 @@ packages:
...
@@ -157,5 +157,5 @@ packages:
source: hosted
source: hosted
version: "2.1.0"
version: "2.1.0"
sdks:
sdks:
dart: ">=2.12.0
-0.0
<3.0.0"
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.16.0"
flutter: ">=1.16.0"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment