Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
org.benoitharrault.puissance4
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.puissance4
Commits
2a0a3281
Commit
2a0a3281
authored
3 years ago
by
Benoît Harrault
Browse files
Options
Downloads
Plain Diff
Merge branch '14-fix-display-layout-style' into 'master'
Resolve "Fix display/layout/style" Closes
#14
See merge request
!12
parents
5d0b60fc
8b5ff842
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!12
Resolve "Fix display/layout/style"
Pipeline
#2037
passed
3 years ago
Stage: update
Stage: build-debug
Stage: build-release
Stage: release
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
lib/cpu_level_page.dart
+3
-3
3 additions, 3 deletions
lib/cpu_level_page.dart
lib/home_page.dart
+3
-3
3 additions, 3 deletions
lib/home_page.dart
lib/match_page.dart
+6
-3
6 additions, 3 deletions
lib/match_page.dart
pubspec.lock
+6
-6
6 additions, 6 deletions
pubspec.lock
with
18 additions
and
15 deletions
lib/cpu_level_page.dart
+
3
−
3
View file @
2a0a3281
...
@@ -26,7 +26,7 @@ class CpuLevelPage extends StatelessWidget {
...
@@ -26,7 +26,7 @@ class CpuLevelPage extends StatelessWidget {
'☺️ FACILE'
,
'☺️ FACILE'
,
style:
Theme
.
of
(
context
)
style:
Theme
.
of
(
context
)
.
textTheme
.
textTheme
.
display1
.
headline4
.
copyWith
(
color:
Colors
.
black
),
.
copyWith
(
color:
Colors
.
black
),
),
),
onPressed:
()
{
onPressed:
()
{
...
@@ -48,7 +48,7 @@ class CpuLevelPage extends StatelessWidget {
...
@@ -48,7 +48,7 @@ class CpuLevelPage extends StatelessWidget {
'🤔 DIFFICILE'
,
'🤔 DIFFICILE'
,
style:
Theme
.
of
(
context
)
style:
Theme
.
of
(
context
)
.
textTheme
.
textTheme
.
display1
.
headline4
.
copyWith
(
color:
Colors
.
white
),
.
copyWith
(
color:
Colors
.
white
),
),
),
onPressed:
()
{
onPressed:
()
{
...
@@ -70,7 +70,7 @@ class CpuLevelPage extends StatelessWidget {
...
@@ -70,7 +70,7 @@ class CpuLevelPage extends StatelessWidget {
'🤯 TRES DIFFICILE'
,
'🤯 TRES DIFFICILE'
,
style:
Theme
.
of
(
context
)
style:
Theme
.
of
(
context
)
.
textTheme
.
textTheme
.
display1
.
headline4
.
copyWith
(
color:
Colors
.
white
),
.
copyWith
(
color:
Colors
.
white
),
),
),
onPressed:
()
{
onPressed:
()
{
...
...
This diff is collapsed.
Click to expand it.
lib/home_page.dart
+
3
−
3
View file @
2a0a3281
...
@@ -23,7 +23,7 @@ class HomePage extends StatelessWidget {
...
@@ -23,7 +23,7 @@ class HomePage extends StatelessWidget {
'🧑 2 JOUEURS 🧑'
,
'🧑 2 JOUEURS 🧑'
,
style:
Theme
.
of
(
context
)
style:
Theme
.
of
(
context
)
.
textTheme
.
textTheme
.
display1
.
headline4
.
copyWith
(
color:
Colors
.
white
),
.
copyWith
(
color:
Colors
.
white
),
),
),
onPressed:
()
{
onPressed:
()
{
...
@@ -43,7 +43,7 @@ class HomePage extends StatelessWidget {
...
@@ -43,7 +43,7 @@ class HomePage extends StatelessWidget {
'🧑 1 JOUEUR 🤖'
,
'🧑 1 JOUEUR 🤖'
,
style:
Theme
.
of
(
context
)
style:
Theme
.
of
(
context
)
.
textTheme
.
textTheme
.
display1
.
headline4
.
copyWith
(
color:
Colors
.
white
),
.
copyWith
(
color:
Colors
.
white
),
),
),
onPressed:
()
{
onPressed:
()
{
...
@@ -63,7 +63,7 @@ class HomePage extends StatelessWidget {
...
@@ -63,7 +63,7 @@ class HomePage extends StatelessWidget {
'🤖 DEMO 🤖'
,
'🤖 DEMO 🤖'
,
style:
Theme
.
of
(
context
)
style:
Theme
.
of
(
context
)
.
textTheme
.
textTheme
.
display1
.
headline4
.
copyWith
(
color:
Colors
.
black
),
.
copyWith
(
color:
Colors
.
black
),
),
),
onPressed:
()
{
onPressed:
()
{
...
...
This diff is collapsed.
Click to expand it.
lib/match_page.dart
+
6
−
3
View file @
2a0a3281
...
@@ -98,7 +98,7 @@ class _MatchPageState extends State<MatchPage> with TickerProviderStateMixin {
...
@@ -98,7 +98,7 @@ class _MatchPageState extends State<MatchPage> with TickerProviderStateMixin {
textAlign:
TextAlign
.
center
,
textAlign:
TextAlign
.
center
,
style:
Theme
.
of
(
context
)
style:
Theme
.
of
(
context
)
.
textTheme
.
textTheme
.
display3
.
headline6
.
copyWith
(
color:
Colors
.
white
),
.
copyWith
(
color:
Colors
.
white
),
)
)
:
Column
(
:
Column
(
...
@@ -108,7 +108,7 @@ class _MatchPageState extends State<MatchPage> with TickerProviderStateMixin {
...
@@ -108,7 +108,7 @@ class _MatchPageState extends State<MatchPage> with TickerProviderStateMixin {
textAlign:
TextAlign
.
center
,
textAlign:
TextAlign
.
center
,
style:
Theme
.
of
(
context
)
style:
Theme
.
of
(
context
)
.
textTheme
.
textTheme
.
title
.
headline5
.
copyWith
(
color:
Colors
.
white
),
.
copyWith
(
color:
Colors
.
white
),
),
),
Padding
(
Padding
(
...
@@ -151,7 +151,10 @@ class _MatchPageState extends State<MatchPage> with TickerProviderStateMixin {
...
@@ -151,7 +151,10 @@ class _MatchPageState extends State<MatchPage> with TickerProviderStateMixin {
return
Text
(
return
Text
(
name
,
name
,
textAlign:
TextAlign
.
center
,
textAlign:
TextAlign
.
center
,
style:
Theme
.
of
(
context
)
.
textTheme
.
title
.
copyWith
(
color:
Colors
.
white
),
style:
Theme
.
of
(
context
)
.
textTheme
.
headline5
.
copyWith
(
color:
Colors
.
white
),
);
);
}
}
...
...
This diff is collapsed.
Click to expand it.
pubspec.lock
+
6
−
6
View file @
2a0a3281
...
@@ -7,7 +7,7 @@ packages:
...
@@ -7,7 +7,7 @@ packages:
name: async
name: async
url: "https://pub.dartlang.org"
url: "https://pub.dartlang.org"
source: hosted
source: hosted
version: "2.
5.0
"
version: "2.
8.2
"
boolean_selector:
boolean_selector:
dependency: transitive
dependency: transitive
description:
description:
...
@@ -28,7 +28,7 @@ packages:
...
@@ -28,7 +28,7 @@ packages:
name: charcode
name: charcode
url: "https://pub.dartlang.org"
url: "https://pub.dartlang.org"
source: hosted
source: hosted
version: "1.
2.0
"
version: "1.
3.1
"
clock:
clock:
dependency: transitive
dependency: transitive
description:
description:
...
@@ -66,14 +66,14 @@ packages:
...
@@ -66,14 +66,14 @@ packages:
name: matcher
name: matcher
url: "https://pub.dartlang.org"
url: "https://pub.dartlang.org"
source: hosted
source: hosted
version: "0.12.1
0
"
version: "0.12.1
1
"
meta:
meta:
dependency: transitive
dependency: transitive
description:
description:
name: meta
name: meta
url: "https://pub.dartlang.org"
url: "https://pub.dartlang.org"
source: hosted
source: hosted
version: "1.
3
.0"
version: "1.
7
.0"
path:
path:
dependency: transitive
dependency: transitive
description:
description:
...
@@ -127,7 +127,7 @@ packages:
...
@@ -127,7 +127,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.
4.3
"
typed_data:
typed_data:
dependency: transitive
dependency: transitive
description:
description:
...
@@ -143,4 +143,4 @@ packages:
...
@@ -143,4 +143,4 @@ 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"
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