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

Merge branch '87-use-flutter_custom_toolbox-for-common-features' into 'master'

Resolve "Use flutter_custom_toolbox for common features"

Closes #87

See merge request !85
parents f74f3b59 7c9dfc58
No related branches found
No related tags found
1 merge request!85Resolve "Use flutter_custom_toolbox for common features"
Pipeline #6558 failed
...@@ -11,5 +11,8 @@ insert_final_newline = true ...@@ -11,5 +11,8 @@ insert_final_newline = true
[*.json] [*.json]
indent_size = 2 indent_size = 2
[*.yaml]
indent_size = 2
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
.buildlog/ .buildlog/
.history .history
.svn/ .svn/
migrate_working_dir/
# IntelliJ related # IntelliJ related
*.iml *.iml
......
File deleted
File deleted
File deleted
File deleted
...@@ -13,10 +13,10 @@ packages: ...@@ -13,10 +13,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: async name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.11.0" version: "2.12.0"
auto_size_text: auto_size_text:
dependency: transitive dependency: transitive
description: description:
...@@ -194,11 +194,11 @@ packages: ...@@ -194,11 +194,11 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: "0.1.0" ref: "0.1.1"
resolved-ref: ff755f2ce78457881908d5a3afce728a47315469 resolved-ref: ba7137ca9edec7e503ed3dbfe7f6ede7e9cfbf4d
url: "https://git.harrault.fr/android/flutter-toolbox.git" url: "https://git.harrault.fr/android/flutter-toolbox.git"
source: git source: git
version: "0.1.0" version: "0.1.1"
flutter_lints: flutter_lints:
dependency: "direct dev" dependency: "direct dev"
description: description:
...@@ -474,10 +474,10 @@ packages: ...@@ -474,10 +474,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.0" version: "1.4.0"
synchronized: synchronized:
dependency: transitive dependency: transitive
description: description:
...@@ -498,10 +498,10 @@ packages: ...@@ -498,10 +498,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: typed_data name: typed_data
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.2" version: "1.4.0"
unicons: unicons:
dependency: transitive dependency: transitive
description: description:
......
...@@ -3,7 +3,7 @@ description: A random application, for testing purpose only. ...@@ -3,7 +3,7 @@ description: A random application, for testing purpose only.
publish_to: "none" publish_to: "none"
version: 1.1.3+68 version: 1.2.0+69
environment: environment:
sdk: "^3.0.0" sdk: "^3.0.0"
...@@ -16,7 +16,7 @@ dependencies: ...@@ -16,7 +16,7 @@ dependencies:
flutter_custom_toolbox: flutter_custom_toolbox:
git: git:
url: https://git.harrault.fr/android/flutter-toolbox.git url: https://git.harrault.fr/android/flutter-toolbox.git
ref: 0.1.0 ref: 0.1.1
# specific # specific
camera: ^0.11.0+2 camera: ^0.11.0+2
...@@ -31,15 +31,3 @@ flutter: ...@@ -31,15 +31,3 @@ flutter:
uses-material-design: true uses-material-design: true
assets: assets:
- assets/translations/ - assets/translations/
fonts:
- family: Nunito
fonts:
- asset: assets/fonts/Nunito-Bold.ttf
weight: 700
- asset: assets/fonts/Nunito-Medium.ttf
weight: 500
- asset: assets/fonts/Nunito-Regular.ttf
weight: 400
- asset: assets/fonts/Nunito-Light.ttf
weight: 300
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment