Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
org.benoitharrault.awale
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.awale
Commits
6f739c53
Commit
6f739c53
authored
7 months ago
by
Benoît Harrault
Browse files
Options
Downloads
Plain Diff
Merge branch '20-normalize-activity-application-architecture' into 'master'
Resolve "Normalize Activity application architecture" Closes
#20
See merge request
!18
parents
5669f4e0
6775c64b
No related branches found
No related tags found
1 merge request
!18
Resolve "Normalize Activity application architecture"
Pipeline
#6780
passed
7 months ago
Stage: build-debug
Changes
44
Pipelines
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
lib/ui/widgets/game/game_score.dart
+7
-7
7 additions, 7 deletions
lib/ui/widgets/game/game_score.dart
lib/ui/widgets/game/game_seeds.dart
+6
-6
6 additions, 6 deletions
lib/ui/widgets/game/game_seeds.dart
pubspec.lock
+4
-4
4 additions, 4 deletions
pubspec.lock
pubspec.yaml
+1
-1
1 addition, 1 deletion
pubspec.yaml
with
18 additions
and
18 deletions
lib/ui/widgets/game/game_score.dart
+
7
−
7
View file @
6f739c53
import
'package:flutter/material.dart'
;
import
'package:flutter_custom_toolbox/flutter_toolbox.dart'
;
import
'package:awale/cubit/
game
_cubit.dart'
;
import
'package:awale/models/
game/game
.dart'
;
import
'package:awale/cubit/
activity/activity
_cubit.dart'
;
import
'package:awale/models/
activity/activity
.dart'
;
class
GameScoreWidget
extends
StatelessWidget
{
const
GameScoreWidget
({
...
...
@@ -14,11 +14,11 @@ class GameScoreWidget extends StatelessWidget {
@override
Widget
build
(
BuildContext
context
)
{
return
BlocBuilder
<
GameCubit
,
Game
State
>(
builder:
(
BuildContext
context
,
GameState
game
State
)
{
final
Game
currentGame
=
game
State
.
current
Game
;
return
BlocBuilder
<
ActivityCubit
,
Activity
State
>(
builder:
(
BuildContext
context
,
ActivityState
activity
State
)
{
final
Activity
currentActivity
=
activity
State
.
current
Activity
;
final
bool
isCurrentPlayer
=
(
current
Game
.
currentPlayer
==
playerIndex
);
final
bool
isCurrentPlayer
=
(
current
Activity
.
currentPlayer
==
playerIndex
);
final
baseColor
=
isCurrentPlayer
?
Colors
.
white
:
const
Color
.
fromARGB
(
255
,
230
,
230
,
230
);
...
...
@@ -40,7 +40,7 @@ class GameScoreWidget extends StatelessWidget {
child:
Padding
(
padding:
const
EdgeInsets
.
fromLTRB
(
0
,
65
,
0
,
0
),
child:
Text
(
current
Game
.
scores
[
playerIndex
]
.
toString
(),
current
Activity
.
scores
[
playerIndex
]
.
toString
(),
textAlign:
TextAlign
.
center
,
style:
TextStyle
(
fontSize:
40
,
...
...
This diff is collapsed.
Click to expand it.
lib/ui/widgets/game/game_seeds.dart
+
6
−
6
View file @
6f739c53
...
...
@@ -3,8 +3,8 @@ import 'dart:math';
import
'package:flutter/material.dart'
;
import
'package:flutter_custom_toolbox/flutter_toolbox.dart'
;
import
'package:awale/cubit/
game
_cubit.dart'
;
import
'package:awale/models/
game/game
.dart'
;
import
'package:awale/cubit/
activity/activity
_cubit.dart'
;
import
'package:awale/models/
activity/activity
.dart'
;
class
GameSeedsWidget
extends
StatelessWidget
{
const
GameSeedsWidget
({
...
...
@@ -16,10 +16,10 @@ class GameSeedsWidget extends StatelessWidget {
@override
Widget
build
(
BuildContext
context
)
{
return
BlocBuilder
<
GameCubit
,
Game
State
>(
builder:
(
BuildContext
context
,
GameState
game
State
)
{
final
Game
currentGame
=
game
State
.
current
Game
;
final
String
skin
=
current
Game
.
globalSettings
.
skin
;
return
BlocBuilder
<
ActivityCubit
,
Activity
State
>(
builder:
(
BuildContext
context
,
ActivityState
activity
State
)
{
final
Activity
currentActivity
=
activity
State
.
current
Activity
;
final
String
skin
=
current
Activity
.
globalSettings
.
skin
;
const
ratioScale
=
0.2
;
const
ratioTranslate
=
0.65
;
...
...
This diff is collapsed.
Click to expand it.
pubspec.lock
+
4
−
4
View file @
6f739c53
...
...
@@ -245,10 +245,10 @@ packages:
dependency: transitive
description:
name: path_provider
sha256:
fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
sha256:
"50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
url: "https://pub.dev"
source: hosted
version: "2.1.
4
"
version: "2.1.
5
"
path_provider_android:
dependency: transitive
description:
...
...
@@ -442,10 +442,10 @@ packages:
dependency: transitive
description:
name: win32
sha256: "
2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a
"
sha256: "
10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454
"
url: "https://pub.dev"
source: hosted
version: "5.7.
0
"
version: "5.7.
2
"
xdg_directories:
dependency: transitive
description:
...
...
This diff is collapsed.
Click to expand it.
pubspec.yaml
+
1
−
1
View file @
6f739c53
...
...
@@ -3,7 +3,7 @@ description: Awale game
publish_to
:
"
none"
version
:
0.
2.1
+1
5
version
:
0.
3.0
+1
6
environment
:
sdk
:
"
^3.0.0"
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
Next
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