diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index a8000a2..80cd4ad 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -24,7 +24,7 @@ android { applicationId = "fr.ueauvergne.seshat" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. - minSdk = 23 + minSdkVersion(24) targetSdk = flutter.targetSdkVersion versionCode = flutter.versionCode versionName = flutter.versionName diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html index f7fc0b1..d098403 100644 --- a/android/build/reports/problems/problems-report.html +++ b/android/build/reports/problems/problems-report.html @@ -650,7 +650,7 @@ code + .copy-button { diff --git a/lib/ui/add_page/widgets/add_page.dart b/lib/ui/add_page/widgets/add_page.dart index 39808ac..3e85857 100644 --- a/lib/ui/add_page/widgets/add_page.dart +++ b/lib/ui/add_page/widgets/add_page.dart @@ -123,6 +123,12 @@ class _AddPageState extends State { } }, ), + Center( + child: SvgPicture.asset( + 'assets/scan-overlay.svg', + height: (MediaQuery.sizeOf(context).height / 5) * 2, + ), + ), SafeArea( child: SingleChildScrollView( child: Column( @@ -175,7 +181,6 @@ class _AddPageState extends State { ), ), ), - Center(child: SvgPicture.asset('assets/scan-overlay.svg')), SafeArea( child: Column( mainAxisAlignment: MainAxisAlignment.end, diff --git a/lib/ui/sell_page/widgets/scan_screen.dart b/lib/ui/sell_page/widgets/scan_screen.dart index 1b15ee8..b500795 100644 --- a/lib/ui/sell_page/widgets/scan_screen.dart +++ b/lib/ui/sell_page/widgets/scan_screen.dart @@ -51,6 +51,12 @@ class _ScanScreenState extends State { await widget.viewModel.scanBook(barcodes); }, ), + Center( + child: SvgPicture.asset( + 'assets/scan-overlay.svg', + height: (MediaQuery.sizeOf(context).height / 5) * 2, + ), + ), SafeArea( child: Column( children: [ @@ -63,7 +69,6 @@ class _ScanScreenState extends State { ], ), ), - Center(child: SvgPicture.asset('assets/scan-overlay.svg')), Column( mainAxisAlignment: MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/pubspec.lock b/pubspec.lock index 40b0cde..97d2e53 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -265,26 +265,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" url: "https://pub.dev" source: hosted - version: "10.0.9" + version: "11.0.1" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: @@ -502,10 +502,10 @@ packages: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.6" typed_data: dependency: transitive description: @@ -542,10 +542,10 @@ packages: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: