Skip to content
Snippets Groups Projects
Commit 9bba283b authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '63-update-framework-and-dependencies-fix-improve-some-code' into 'master'

Resolve "Update framework and dependencies, fix/improve some code"

Closes #63

See merge request !66
parents d7c531f8 90f2b470
No related branches found
No related tags found
1 merge request!66Resolve "Update framework and dependencies, fix/improve some code"
Pipeline #4846 passed
...@@ -44,7 +44,7 @@ android { ...@@ -44,7 +44,7 @@ android {
defaultConfig { defaultConfig {
applicationId "org.benoitharrault.wordguessing" applicationId "org.benoitharrault.wordguessing"
minSdkVersion 16 minSdkVersion flutter.minSdkVersion
targetSdkVersion 30 targetSdkVersion 30
versionCode appVersionCode.toInteger() versionCode appVersionCode.toInteger()
versionName appVersionName versionName appVersionName
......
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.1.31 app.versionName=0.1.32
app.versionCode=55 app.versionCode=56
Update dependencies, fix/improve some code.
Mise à jour des dépendances, amélioration de code.
...@@ -30,22 +30,18 @@ class Home extends StatelessWidget { ...@@ -30,22 +30,18 @@ class Home extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
border: Border.all( border: Border.all(
color: Colors.teal, color: color,
width: 8, width: 12,
), ),
), ),
child: TextButton( child: GestureDetector(
style: TextButton.styleFrom(
padding: EdgeInsets.all(15),
backgroundColor: color,
),
child: Image( child: Image(
image: AssetImage(imageAsset), image: AssetImage(imageAsset),
width: imageSize, width: imageSize,
height: imageSize, height: imageSize,
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
onPressed: () { onTap: () {
resetGame(_myProvider); resetGame(_myProvider);
Navigator.pushNamed( Navigator.pushNamed(
context, context,
......
...@@ -21,10 +21,10 @@ packages: ...@@ -21,10 +21,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.17.2" version: "1.18.0"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
...@@ -34,10 +34,10 @@ packages: ...@@ -34,10 +34,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: http name: http
sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.0" version: "1.1.2"
http_parser: http_parser:
dependency: transitive dependency: transitive
description: description:
...@@ -58,10 +58,10 @@ packages: ...@@ -58,10 +58,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.1" version: "1.10.0"
nested: nested:
dependency: transitive dependency: transitive
description: description:
...@@ -74,18 +74,18 @@ packages: ...@@ -74,18 +74,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.8.3" version: "1.9.0"
provider: provider:
dependency: "direct main" dependency: "direct main"
description: description:
name: provider name: provider
sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.0.5" version: "6.1.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
...@@ -135,10 +135,10 @@ packages: ...@@ -135,10 +135,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: web name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.1.4-beta" version: "0.3.0"
sdks: sdks:
dart: ">=3.1.0-185.0.dev <4.0.0" dart: ">=3.2.0 <4.0.0"
flutter: ">=1.16.0" flutter: ">=1.16.0"
name: wordguessing name: wordguessing
description: A wordguessing game application. description: A wordguessing game application.
publish_to: 'none' publish_to: 'none'
version: 1.0.0+1 version: 0.1.32+56
environment: environment:
sdk: '^3.0.0' sdk: '^3.0.0'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment