Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
org.benoitharrault.wordguessing
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.wordguessing
Commits
68942c31
Commit
68942c31
authored
4 years ago
by
Benoît Harrault
Browse files
Options
Downloads
Plain Diff
Merge branch '41-improve-text-buttons-display' into 'master'
Resolve "Improve text buttons display" Closes
#41
See merge request
!44
parents
ebe7155e
1044c7af
No related branches found
No related tags found
1 merge request
!44
Resolve "Improve text buttons display"
Pipeline
#1125
passed
4 years ago
Stage: update
Stage: build-debug
Stage: build-release
Stage: deploy
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
android/gradle.properties
+2
-2
2 additions, 2 deletions
android/gradle.properties
lib/screens/game_pick_image.dart
+2
-2
2 additions, 2 deletions
lib/screens/game_pick_image.dart
lib/screens/game_pick_word.dart
+12
-4
12 additions, 4 deletions
lib/screens/game_pick_word.dart
with
16 additions
and
8 deletions
android/gradle.properties
+
2
−
2
View file @
68942c31
org.gradle.jvmargs
=
-Xmx1536M
android.useAndroidX
=
true
android.enableJetifier
=
true
app.versionName
=
0.1.1
1
app.versionCode
=
3
5
app.versionName
=
0.1.1
2
app.versionCode
=
3
6
This diff is collapsed.
Click to expand it.
lib/screens/game_pick_image.dart
+
2
−
2
View file @
68942c31
...
...
@@ -131,7 +131,7 @@ class GamePickImagePage extends StatelessWidget {
decoration:
BoxDecoration
(
borderRadius:
BorderRadius
.
circular
(
8
),
border:
Border
.
all
(
color:
Colors
.
teal
,
color:
Colors
.
blue
[
200
]
,
width:
8
,
),
),
...
...
@@ -195,6 +195,7 @@ class GamePickImagePage extends StatelessWidget {
Container
(
margin:
EdgeInsets
.
all
(
2
),
decoration:
BoxDecoration
(
color:
Colors
.
blue
,
borderRadius:
BorderRadius
.
circular
(
6
),
border:
Border
.
all
(
color:
Colors
.
white
,
...
...
@@ -202,7 +203,6 @@ class GamePickImagePage extends StatelessWidget {
),
),
child:
RaisedButton
(
color:
Colors
.
green
,
padding:
EdgeInsets
.
all
(
15
),
child:
Text
(
word
!=
null
?
word
[
myProvider
.
lang
]
:
''
,
...
...
This diff is collapsed.
Click to expand it.
lib/screens/game_pick_word.dart
+
12
−
4
View file @
68942c31
...
...
@@ -137,7 +137,7 @@ class GamePickWordPage extends StatelessWidget {
decoration:
BoxDecoration
(
borderRadius:
BorderRadius
.
circular
(
8
),
border:
Border
.
all
(
color:
Colors
.
teal
,
color:
Colors
.
blue
[
200
]
,
width:
8
,
),
),
...
...
@@ -181,14 +181,22 @@ class GamePickWordPage extends StatelessWidget {
Container
_buildTextContainer
(
Data
myProvider
,
Map
word
)
{
return
Container
(
child:
RaisedButton
(
color:
Colors
.
green
,
margin:
EdgeInsets
.
all
(
2
),
decoration:
BoxDecoration
(
color:
Colors
.
blue
[
800
],
borderRadius:
BorderRadius
.
circular
(
6
),
border:
Border
.
all
(
color:
Colors
.
white
,
width:
6
,
),
),
child:
FlatButton
(
padding:
EdgeInsets
.
all
(
15
),
child:
Text
(
word
!=
null
?
word
[
myProvider
.
lang
]
:
''
,
style:
TextStyle
(
fontSize:
20
,
fontWeight:
FontWeight
.
w
4
00
,
fontWeight:
FontWeight
.
w
6
00
,
color:
Colors
.
white
,
),
),
...
...
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