From 643d978f5bf48d0b29321e31a3765284d9999b44 Mon Sep 17 00:00:00 2001 From: Shounak Mulay Date: Sat, 29 Jul 2023 11:14:26 +0530 Subject: [PATCH 1/4] Update dependency versions and launch configs --- .idea/runConfigurations/dev.xml | 8 + .idea/runConfigurations/dev_profile.xml | 8 + .idea/runConfigurations/prod.xml | 8 + .idea/runConfigurations/prod_profile.xml | 8 + .idea/runConfigurations/prod_release.xml | 8 + .idea/runConfigurations/qa.xml | 8 + .idea/runConfigurations/qa_profile.xml | 8 + .idea/runConfigurations/qa_release.xml | 8 + .metadata | 30 +- .vscode/launch.json | 67 ++- .../intl/translations/translation_loader.dart | 2 +- pubspec.lock | 398 +++++++++--------- pubspec.yaml | 20 +- scripts/build-runner.sh | 2 +- scripts/generate-translations.sh | 4 +- 15 files changed, 359 insertions(+), 228 deletions(-) create mode 100644 .idea/runConfigurations/dev.xml create mode 100644 .idea/runConfigurations/dev_profile.xml create mode 100644 .idea/runConfigurations/prod.xml create mode 100644 .idea/runConfigurations/prod_profile.xml create mode 100644 .idea/runConfigurations/prod_release.xml create mode 100644 .idea/runConfigurations/qa.xml create mode 100644 .idea/runConfigurations/qa_profile.xml create mode 100644 .idea/runConfigurations/qa_release.xml diff --git a/.idea/runConfigurations/dev.xml b/.idea/runConfigurations/dev.xml new file mode 100644 index 00000000..c7ea1825 --- /dev/null +++ b/.idea/runConfigurations/dev.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/dev_profile.xml b/.idea/runConfigurations/dev_profile.xml new file mode 100644 index 00000000..00523694 --- /dev/null +++ b/.idea/runConfigurations/dev_profile.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/prod.xml b/.idea/runConfigurations/prod.xml new file mode 100644 index 00000000..4a4725e9 --- /dev/null +++ b/.idea/runConfigurations/prod.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/prod_profile.xml b/.idea/runConfigurations/prod_profile.xml new file mode 100644 index 00000000..88604b30 --- /dev/null +++ b/.idea/runConfigurations/prod_profile.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/prod_release.xml b/.idea/runConfigurations/prod_release.xml new file mode 100644 index 00000000..8ed33d1c --- /dev/null +++ b/.idea/runConfigurations/prod_release.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/qa.xml b/.idea/runConfigurations/qa.xml new file mode 100644 index 00000000..3f4a7b0b --- /dev/null +++ b/.idea/runConfigurations/qa.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/qa_profile.xml b/.idea/runConfigurations/qa_profile.xml new file mode 100644 index 00000000..b606d8fc --- /dev/null +++ b/.idea/runConfigurations/qa_profile.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/qa_release.xml b/.idea/runConfigurations/qa_release.xml new file mode 100644 index 00000000..3a3a204f --- /dev/null +++ b/.idea/runConfigurations/qa_release.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.metadata b/.metadata index fd70cabc..cede9b40 100644 --- a/.metadata +++ b/.metadata @@ -1,10 +1,36 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: 77d935af4db863f6abd0b9c31c7e6df2a13de57b + revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 channel: stable project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: linux + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: macos + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: windows + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/.vscode/launch.json b/.vscode/launch.json index e6b10e5e..0ac26ecd 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,17 +4,74 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ - { - "name": "flutter_template", + "name": "dev", "request": "launch", - "type": "dart" + "type": "dart", + "toolArgs": ["--dart-define=flavor=dev"], + "args": ["--flavor=dev"] + }, + { + "name": "dev-profile", + "request": "launch", + "type": "dart", + "toolArgs": ["--dart-define=flavor=dev"], + "args": ["--flavor=dev"], + "flutterMode": "profile" + }, + { + "name": "dev-release", + "request": "launch", + "type": "dart", + "toolArgs": ["--dart-define=flavor=dev"], + "args": ["--flavor=dev"], + "flutterMode": "release" + }, + { + "name": "qa", + "request": "launch", + "type": "dart", + "toolArgs": ["--dart-define=flavor=qa"], + "args": ["--flavor=qa"] }, { - "name": "flutter_template (profile mode)", + "name": "qa-profile", "request": "launch", "type": "dart", + "toolArgs": ["--dart-define=flavor=qa"], + "args": ["--flavor=qa"], "flutterMode": "profile" + }, + { + "name": "qa-release", + "request": "launch", + "type": "dart", + "toolArgs": ["--dart-define=flavor=qa"], + "args": ["--flavor=qa"], + "flutterMode": "release" + }, + { + "name": "prod", + "request": "launch", + "type": "dart", + "toolArgs": ["--dart-define=flavor=prod"], + "args": ["--flavor=prod"] + }, + { + "name": "prod-profile", + "request": "launch", + "type": "dart", + "toolArgs": ["--dart-define=flavor=prod"], + "args": ["--flavor=prod"], + "flutterMode": "profile" + }, + { + "name": "prod-release", + "request": "launch", + "type": "dart", + "toolArgs": ["--dart-define=flavor=prod"], + "args": ["--flavor=prod"], + "flutterMode": "release" } ] -} \ No newline at end of file +} diff --git a/lib/presentation/intl/translations/translation_loader.dart b/lib/presentation/intl/translations/translation_loader.dart index 586485f0..08d0e445 100644 --- a/lib/presentation/intl/translations/translation_loader.dart +++ b/lib/presentation/intl/translations/translation_loader.dart @@ -10,7 +10,7 @@ class CodegenLoader extends AssetLoader { const CodegenLoader(); @override - Future> load(String fullPath, Locale locale) { + Future?> load(String path, Locale locale) { return Future.value(mapLocales[locale.toString()]); } diff --git a/pubspec.lock b/pubspec.lock index c5dd62ae..0f448a93 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "503361166f4a100e0d7eb7fb5a62c6f0322512f2bcb48d6922caf98f24b0ab90" + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "56.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "93fcd81a6716e69864516750590cf1e699420615046bda19100238aa7b429785" + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.8.0" + version: "5.13.0" analyzer_plugin: dependency: transitive description: @@ -29,42 +29,42 @@ packages: dependency: transitive description: name: archive - sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d + sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" url: "https://pub.dev" source: hosted - version: "3.3.6" + version: "3.3.7" args: dependency: transitive description: name: args - sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.2" async: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" auto_route: dependency: "direct main" description: name: auto_route - sha256: "7faca1e83d05794deec4e160976c06345da3eeaca7b0e78e39edd657c1b86335" + sha256: "46037eb6acfefcb3627f1baeef1ea0ce4eed2d01dba26e060d4a231dc4f3c29c" url: "https://pub.dev" source: hosted - version: "6.0.0+1" + version: "7.7.1" auto_route_generator: dependency: "direct dev" description: name: auto_route_generator - sha256: a3f11c3b1e6e884d1592924f3b7212855f1c7c8791c12d3b41b87ab81fb9d3b8 + sha256: e9245cc56f04a4473c281346d194efa2c89a0f8e4f1c02a5b3b43e242c3e1c75 url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "7.2.0" boolean_selector: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: build - sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" build_config: dependency: transitive description: @@ -93,34 +93,34 @@ packages: dependency: transitive description: name: build_daemon - sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" + sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "4.0.0" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" build_runner: dependency: "direct dev" description: name: build_runner - sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 + sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.6" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" + sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" url: "https://pub.dev" source: hosted - version: "7.2.7" + version: "7.2.10" built_collection: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: built_value - sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0" + sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" url: "https://pub.dev" source: hosted - version: "8.4.4" + version: "8.6.1" cached_network_image: dependency: "direct main" description: @@ -165,10 +165,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" charcode: dependency: transitive description: @@ -181,18 +181,18 @@ packages: dependency: transitive description: name: checked_yaml - sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" cli_util: dependency: transitive description: name: cli_util - sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 url: "https://pub.dev" source: hosted - version: "0.3.5" + version: "0.4.0" clock: dependency: transitive description: @@ -205,18 +205,18 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" collection: dependency: "direct main" description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.1" convert: dependency: transitive description: @@ -237,10 +237,10 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" cupertino_icons: dependency: "direct main" description: @@ -253,50 +253,50 @@ packages: dependency: transitive description: name: dart_style - sha256: "6d691edde054969f0e0f26abb1b30834b5138b963793e56f69d3a9a4435e6352" + sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.2" dio: dependency: "direct main" description: name: dio - sha256: "3e5c4a94d112540d0c9a6b7f3969832e1604eb8cde0f88d0808382f9f632100b" + sha256: "3866d67f93523161b643187af65f5ac08bc991a5bcdaf41a2d587fe4ccb49993" url: "https://pub.dev" source: hosted - version: "5.0.3" + version: "5.3.0" drift: dependency: "direct main" description: name: drift - sha256: "2a16754641485ca4eaf31bb7961f3ec26bcddad1ce4869a37f238791e164c073" + sha256: "01e7237766b3404f08489ed0dc531a2fa5f5a42d7fa7787da6cc0a10e8d2632f" url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.10.0" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: d71542e30e27c920d5a73ccad409a0828a0c9588f5bbbc58aad6407259299a8b + sha256: "407eb1f149332238c567f06cc89b6aaee848de00d9031c76dc372dc16d993bca" url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "2.10.0" dynamic_color: dependency: "direct main" description: name: dynamic_color - sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b + sha256: de4798a7069121aee12d5895315680258415de9b00e717723a1bd73d58f0126d url: "https://pub.dev" source: hosted - version: "1.6.2" + version: "1.6.6" easy_localization: dependency: "direct main" description: name: easy_localization - sha256: "6a2e99fa0bfe5765bf4c6ca9b137d5de2c75593007178c5e4cd2ae985f870080" + sha256: "30ebf25448ffe169e0bd9bc4b5da94faa8398967a2ad2ca09f438be8b6953645" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" easy_logger: dependency: "direct main" description: @@ -325,10 +325,10 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" file: dependency: transitive description: @@ -362,42 +362,42 @@ packages: dependency: transitive description: name: flutter_cache_manager - sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3" + sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.3.1" flutter_displaymode: dependency: "direct main" description: name: flutter_displaymode - sha256: "136b0314fdc78fe995b0b75061fe9ff8210dffca84f8f8110f8f71029479db3b" + sha256: "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.6.0" flutter_dotenv: dependency: "direct main" description: name: flutter_dotenv - sha256: d9283d92059a22e9834bc0a31336658ffba77089fb6f3cc36751f1fc7c6661a3 + sha256: "9357883bdd153ab78cbf9ffa07656e336b8bbb2b5a3ca596b0b27e119f7c7d77" url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "5.1.0" flutter_hooks: dependency: "direct main" description: name: flutter_hooks - sha256: "6a126f703b89499818d73305e4ce1e3de33b4ae1c5512e3b8eab4b986f46774c" + sha256: "9eab8fd7aa752c3c1c0a364f9825851d410eb935243411682f4b1b0a4c569d71" url: "https://pub.dev" source: hosted - version: "0.18.6" + version: "0.20.0" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" flutter_localizations: dependency: transitive description: flutter @@ -407,10 +407,10 @@ packages: dependency: "direct main" description: name: flutter_riverpod - sha256: b3c3a8a9714b7f88dd2a41e1efbc47f76d620b06ab427c62ae7bc82298cd7dbb + sha256: b83ac5827baadefd331ea1d85110f34645827ea234ccabf53a655f41901a9bf4 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.6" flutter_staggered_grid_view: dependency: "direct main" description: @@ -441,18 +441,18 @@ packages: dependency: "direct dev" description: name: freezed - sha256: e819441678f1679b719008ff2ff0ef045d66eed9f9ec81166ca0d9b02a187454 + sha256: "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" freezed_annotation: dependency: "direct main" description: name: freezed_annotation - sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338 + sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.1" frontend_server_client: dependency: transitive description: @@ -465,18 +465,18 @@ packages: dependency: "direct main" description: name: get_it - sha256: "290fde3a86072e4b37dbb03c07bec6126f0ecc28dad403c12ffe2e5a2d751ab7" + sha256: "529de303c739fca98cd7ece5fca500d8ff89649f1bb4b4e94fb20954abcd7468" url: "https://pub.dev" source: hosted - version: "7.2.0" + version: "7.6.0" glob: dependency: transitive description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" golden_toolkit: dependency: "direct dev" description: @@ -489,34 +489,34 @@ packages: dependency: "direct main" description: name: google_fonts - sha256: "927573f2e8a8d65c17931e21918ad0ab0666b1b636537de7c4932bdb487b190f" + sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982 url: "https://pub.dev" source: hosted - version: "4.0.3" + version: "5.1.0" graphs: dependency: transitive description: name: graphs - sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" hooks_riverpod: dependency: "direct main" description: name: hooks_riverpod - sha256: "7e673817a7db4d6403a079882485affd3156d79c06209389353d0977d513f905" + sha256: "117edbe7e5cfc02e31a94f97e2acd4581f54bc37fcda9dce1f606f8ac851ba24" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.7" http: dependency: transitive description: name: http - sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "0.13.5" + version: "1.1.0" http_multi_server: dependency: transitive description: @@ -537,10 +537,10 @@ packages: dependency: transitive description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" io: dependency: transitive description: @@ -553,74 +553,74 @@ packages: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.7" json_annotation: dependency: "direct main" description: name: json_annotation - sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.8.1" json_serializable: dependency: "direct main" description: name: json_serializable - sha256: dadc08bd61f72559f938dd08ec20dbfec6c709bba83515085ea943d2078d187a + sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 url: "https://pub.dev" source: hosted - version: "6.6.1" + version: "6.7.1" lints: dependency: transitive description: name: lints - sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.1" logger: dependency: "direct main" description: name: logger - sha256: db2ff852ed77090ba9f62d3611e4208a3d11dfa35991a81ae724c113fcb3e3f7 + sha256: "66cb048220ca51cf9011da69fa581e4ee2bed4be6e82870d9e9baae75739da49" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "2.0.1" logging: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" mason: dependency: "direct dev" description: name: mason - sha256: b4030d8799f255caa914beb2604dcd749d0ebd815c3f0209ed223f9370098c10 + sha256: fdc9ea905e7c690fe39d2f9946b7aead86fd976f8edf97d2521a65d260bbf509 url: "https://pub.dev" source: hosted - version: "0.1.0-dev.47" + version: "0.1.0-dev.50" mason_logger: dependency: transitive description: name: mason_logger - sha256: ca34d14e998cd7a7738e7320b102aa45fb363aa49a290084b211ababf75bb7ee + sha256: ba82162ab33d58324f040e37f9270bc1b7c00710315b385d1dc2f14917263cbb url: "https://pub.dev" source: hosted - version: "0.2.5" + version: "0.2.7" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.15" material_color_utilities: dependency: transitive description: @@ -633,10 +633,10 @@ packages: dependency: "direct dev" description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: @@ -697,42 +697,42 @@ packages: dependency: "direct main" description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_provider: dependency: "direct main" description: name: path_provider - sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9" + sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" url: "https://pub.dev" source: hosted - version: "2.0.13" + version: "2.0.15" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7" + sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86" url: "https://pub.dev" source: hosted - version: "2.0.24" + version: "2.0.27" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "12eee51abdf4d34c590f043f45073adbb45514a108bd9db4491547a2fd891059" + sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.4" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.1.11" path_provider_platform_interface: dependency: transitive description: @@ -745,26 +745,18 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130 + sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" url: "https://pub.dev" source: hosted - version: "2.1.5" - pedantic: - dependency: transitive - description: - name: pedantic - sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" - url: "https://pub.dev" - source: hosted - version: "1.11.1" + version: "2.1.7" petitparser: dependency: transitive description: name: petitparser - sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.4.0" platform: dependency: transitive description: @@ -777,18 +769,18 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pointycastle: dependency: transitive description: name: pointycastle - sha256: "57b6b78df14175658f09c5dfcfc51a46ad9561a3504fe679913dab404d0cc0f2" + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" url: "https://pub.dev" source: hosted - version: "3.7.0" + version: "3.7.3" pool: dependency: transitive description: @@ -797,14 +789,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" - process: - dependency: transitive - description: - name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" - url: "https://pub.dev" - source: hosted - version: "4.2.4" provider: dependency: transitive description: @@ -817,18 +801,18 @@ packages: dependency: transitive description: name: pub_semver - sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c + sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.3" recase: dependency: transitive description: @@ -841,10 +825,10 @@ packages: dependency: transitive description: name: riverpod - sha256: b0fbf7927333c5c318f7e2c22c8b4fd2542ba294de0373e80ecdb34e0dcd8dc4 + sha256: "80e48bebc83010d5e67a11c9514af6b44bbac1ec77b4333c8ea65dbc79e2d8ef" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.6" rxdart: dependency: "direct main" description: @@ -857,98 +841,98 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41 + sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1" url: "https://pub.dev" source: hosted - version: "2.0.18" + version: "2.2.0" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521 + sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076 url: "https://pub.dev" source: hosted - version: "2.0.17" + version: "2.2.0" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310" + sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4 url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.3.2" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707" + sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1" url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.3.0" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc" + sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8" + sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.2.0" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436" + sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.3.0" shelf: dependency: transitive description: name: shelf - sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler - sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306 + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" shelf_static: dependency: transitive description: name: shelf_static - sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c + sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" shimmer: dependency: "direct main" description: name: shimmer - sha256: "1f1009b5845a1f88f1c5630212279540486f97409e9fc3f63883e71070d107bf" + sha256: "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" sky_engine: dependency: transitive description: flutter @@ -958,18 +942,18 @@ packages: dependency: transitive description: name: source_gen - sha256: c2bea18c95cfa0276a366270afaa2850b09b4a76db95d546f3d003dcc7011298 + sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 url: "https://pub.dev" source: hosted - version: "1.2.7" + version: "1.4.0" source_helper: dependency: transitive description: name: source_helper - sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f" + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.4" source_map_stack_trace: dependency: transitive description: @@ -998,42 +982,42 @@ packages: dependency: transitive description: name: sqflite - sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758" + sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a" url: "https://pub.dev" source: hosted - version: "2.2.6" + version: "2.3.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684" + sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.5.0" sqlite3: dependency: transitive description: name: sqlite3 - sha256: cab735283879114cef78ee69071d652a7303d8376727c688ad56a2013997a8d0 + sha256: db65233e6b99e99b2548932f55a987961bc06d82a31a0665451fa0b4fff4c3fb url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "2.1.0" sqlite3_flutter_libs: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: "02f80aea54a19a36b347dedf6d4181ecd9107f5831ea6139cfd0376a3de197ba" + sha256: "1e20a88d5c7ae8400e009f38ddbe8b001800a6dffa37832481a86a219bc904c7" url: "https://pub.dev" source: hosted - version: "0.5.13" + version: "0.5.15" sqlparser: dependency: transitive description: name: sqlparser - sha256: "91f47610aa54d8abf9d795a7b4e49b2a788f65d7493d5a68fbf180c3cbcc6f38" + sha256: "9611f46d30a4e8286e54d17a1b5182d132512dc6fc3da90c45ad8ec2828a58b1" url: "https://pub.dev" source: hosted - version: "0.27.0" + version: "0.30.3" stack_trace: dependency: transitive description: @@ -1078,10 +1062,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b" + sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.0" term_glyph: dependency: transitive description: @@ -1094,26 +1078,26 @@ packages: dependency: transitive description: name: test - sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d + sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4" url: "https://pub.dev" source: hosted - version: "1.22.0" + version: "1.24.1" test_api: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.5.1" test_core: dependency: transitive description: name: test_core - sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888" + sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93" url: "https://pub.dev" source: hosted - version: "0.4.20" + version: "0.5.1" timing: dependency: transitive description: @@ -1126,18 +1110,18 @@ packages: dependency: "direct main" description: name: tuple - sha256: "0ea99cd2f9352b2586583ab2ce6489d1f95a5f6de6fb9492faaf97ae2060f0aa" + sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" typed_data: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" uuid: dependency: "direct main" description: @@ -1158,26 +1142,26 @@ packages: dependency: transitive description: name: vm_service - sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7 + sha256: ada49637c27973c183dad90beb6bd781eea4c9f5f955d35da172de0af7bd3440 url: "https://pub.dev" source: hosted - version: "9.4.0" + version: "11.8.0" watcher: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" webkit_inspection_protocol: dependency: transitive description: @@ -1190,34 +1174,34 @@ packages: dependency: transitive description: name: win32 - sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46 + sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0 url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "5.0.6" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" xml: dependency: transitive description: name: xml - sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.3.0" yaml: dependency: transitive description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sdks: - dart: ">=2.19.2 <3.0.0" + dart: ">=3.0.6 <4.0.0" flutter: ">=3.4.0-17.0.pre" diff --git a/pubspec.yaml b/pubspec.yaml index 64101045..2c58e955 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+25 environment: - sdk: ">=2.19.2 <3.0.0" + sdk: ">=3.0.6 <4.0.0" scripts: generate: @@ -61,33 +61,33 @@ scripts: dependencies: - auto_route: ^6.0.0+1 - collection: ^1.17.0 + auto_route: ^7.7.1 + collection: ^1.17.1 cupertino_icons: ^1.0.5 dio: ^5.0.3 drift: ^2.5.0 easy_localization: ^3.0.1 flutter: sdk: flutter - flutter_displaymode: ^0.5.0 - flutter_hooks: ^0.18.6 + flutter_displaymode: ^0.6.0 + flutter_hooks: ^0.20.0 flutter_riverpod: ^2.3.2 flutter_staggered_grid_view: ^0.6.2 flutter_state_notifier: ^0.7.3 freezed_annotation: ^2.2.0 get_it: ^7.2.0 hooks_riverpod: ^2.3.2 - json_annotation: ^4.8.0 + json_annotation: ^4.8.1 json_serializable: ^6.6.1 - logger: ^1.3.0 + logger: ^2.0.1 path: ^1.8.2 rxdart: ^0.27.7 shared_preferences: ^2.0.18 - shimmer: ^2.0.0 + shimmer: ^3.0.0 sqlite3_flutter_libs: ^0.5.13 tuple: ^2.0.1 uuid: ^3.0.7 - google_fonts: ^4.0.3 + google_fonts: ^5.1.0 easy_logger: ^0.0.2 path_provider: ^2.0.13 dynamic_color: ^1.6.2 @@ -96,7 +96,7 @@ dependencies: flutter_dotenv: ^5.0.2 dev_dependencies: - auto_route_generator: ^6.0.0 + auto_route_generator: ^7.2.0 build_runner: ^2.3.3 drift_dev: ^2.5.2 flutter_lints: ^2.0.1 diff --git a/scripts/build-runner.sh b/scripts/build-runner.sh index 9ff5cf3e..2e507351 100755 --- a/scripts/build-runner.sh +++ b/scripts/build-runner.sh @@ -1,3 +1,3 @@ #!/bin/sh -flutter pub run build_runner build --delete-conflicting-outputs \ No newline at end of file +dart run build_runner build --delete-conflicting-outputs \ No newline at end of file diff --git a/scripts/generate-translations.sh b/scripts/generate-translations.sh index 8874ac92..3fec63b3 100755 --- a/scripts/generate-translations.sh +++ b/scripts/generate-translations.sh @@ -1,5 +1,5 @@ #!/bin/sh -flutter pub run easy_localization:generate -S assets/translations -O lib/presentation/intl/translations -o translation_loader.dart +dart run easy_localization:generate -S assets/translations -O lib/presentation/intl/translations -o translation_loader.dart -flutter pub run easy_localization:generate -S assets/translations -O lib/presentation/intl/translations -o translation_keys.dart -f keys +dart run easy_localization:generate -S assets/translations -O lib/presentation/intl/translations -o translation_keys.dart -f keys From a743ac26a760cac8deb9783f6598b2fb8f5d3322 Mon Sep 17 00:00:00 2001 From: Shounak Mulay Date: Sat, 29 Jul 2023 11:37:57 +0530 Subject: [PATCH 2/4] Remove depricated code --- lib/foundation/logger/logger.dart | 2 +- lib/navigation/base/app_router.dart | 5 +---- .../destinations/weather/home/home_page.dart | 2 +- lib/presentation/template_app.dart | 14 +------------- pubspec.yaml | 1 - test/presentation/base/widget_tester_ext.dart | 1 - 6 files changed, 4 insertions(+), 21 deletions(-) diff --git a/lib/foundation/logger/logger.dart b/lib/foundation/logger/logger.dart index 6b0a9612..576cf2d8 100644 --- a/lib/foundation/logger/logger.dart +++ b/lib/foundation/logger/logger.dart @@ -12,7 +12,7 @@ class LogHelper { final logger = Logger( filter: _FlutterTemplateLogFilter(), printer: PrettyPrinter(printEmojis: false), - level: Level.verbose, + level: Level.trace, ); _instance = logger; diff --git a/lib/navigation/base/app_router.dart b/lib/navigation/base/app_router.dart index 15ae7216..1f273d9c 100644 --- a/lib/navigation/base/app_router.dart +++ b/lib/navigation/base/app_router.dart @@ -14,10 +14,7 @@ part 'app_router.gr.dart'; class AppRouter extends _$AppRouter { @override List get routes => [ - AutoRoute( - path: HomeScreen.path, - page: HomeRoute.page, - ), + AutoRoute(path: HomeScreen.path, page: HomeRoute.page, initial: true), AutoRoute( path: SearchScreen.path, page: SearchRoute.page, diff --git a/lib/presentation/destinations/weather/home/home_page.dart b/lib/presentation/destinations/weather/home/home_page.dart index 652ca10a..4436adcc 100644 --- a/lib/presentation/destinations/weather/home/home_page.dart +++ b/lib/presentation/destinations/weather/home/home_page.dart @@ -17,7 +17,7 @@ class HomePage extends ConsumerWidget { const HomePage({ Key? key, - required this.homeScreen, + this.homeScreen = const HomeScreen(), }) : super(key: key); @override diff --git a/lib/presentation/template_app.dart b/lib/presentation/template_app.dart index 49ad4929..f8586321 100644 --- a/lib/presentation/template_app.dart +++ b/lib/presentation/template_app.dart @@ -1,15 +1,11 @@ import 'package:dynamic_color/dynamic_color.dart'; import 'package:easy_localization/easy_localization.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_template/flavors/flavor.dart'; -import 'package:flutter_template/flavors/flavor_config.dart'; import 'package:flutter_template/navigation/base/app_router.dart'; import 'package:flutter_template/presentation/base/theme/theme_data/template_app_theme_data.dart'; import 'package:flutter_template/presentation/base/widgets/snackbar/snackbar.dart'; import 'package:flutter_template/presentation/base/widgets/theme/theme_listener.dart'; -import 'package:flutter_template/presentation/destinations/weather/home/home_screen.dart'; import 'package:get_it/get_it.dart'; class TemplateApp extends StatelessWidget { @@ -19,11 +15,6 @@ class TemplateApp extends StatelessWidget { @override Widget build(BuildContext context) { - const enableDevicePreview = - String.fromEnvironment("enableDevicePreview") == "true"; - final useDevicePreview = - enableDevicePreview && kDebugMode && FlavorConfig.flavor == Flavor.dev; - return ProviderScope( child: ThemeStateListener( builder: (themeState) => DynamicColorBuilder( @@ -35,13 +26,10 @@ class TemplateApp extends StatelessWidget { ? buildTheme(darkDynamic.harmonized()) : material3DarkTheme; return MaterialApp.router( - useInheritedMediaQuery: useDevicePreview, theme: lightTheme, darkTheme: darkTheme, themeMode: themeState.themeMode, - routerDelegate: _appRouter.delegate( - initialRoutes: [HomeRoute(homeScreen: const HomeScreen())], - ), + routerDelegate: _appRouter.delegate(), routeInformationParser: _appRouter.defaultRouteParser(), localizationsDelegates: context.localizationDelegates, supportedLocales: context.supportedLocales, diff --git a/pubspec.yaml b/pubspec.yaml index 2c58e955..27760f09 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -27,7 +27,6 @@ scripts: build_runner: flutter pub run build_runner build --delete-conflicting-outputs launch: dev: flutter run --flavor dev --dart-define=flavor=dev - dev-preview: flutter run --flavor dev --dart-define=flavor=dev --dart-define=enableDevicePreview="true" qa: flutter run --flavor qa --dart-define=flavor=qa prod: flutter run --flavor prod --dart-define=flavor=prod test: diff --git a/test/presentation/base/widget_tester_ext.dart b/test/presentation/base/widget_tester_ext.dart index 68b03589..514fe6a7 100644 --- a/test/presentation/base/widget_tester_ext.dart +++ b/test/presentation/base/widget_tester_ext.dart @@ -80,7 +80,6 @@ extension WidgetTesterExt on WidgetTester { data: mediaQueryData, child: MaterialApp( locale: context.locale, - useInheritedMediaQuery: true, home: ProviderScope( overrides: [ viewModelProvider.overrideWith(fakeViewModelGenerator), From 1071163f225905db72206a7e35ba711e572e0c25 Mon Sep 17 00:00:00 2001 From: Shounak Mulay Date: Sat, 29 Jul 2023 12:12:03 +0530 Subject: [PATCH 3/4] Upgrade gradle version --- android/build.gradle | 4 ++-- android/gradle/wrapper/gradle-wrapper.properties | 2 +- pubspec.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 488d1383..8b75747c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e6df0b7a..cb046be6 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip diff --git a/pubspec.yaml b/pubspec.yaml index 27760f09..c4d5743c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -89,7 +89,7 @@ dependencies: google_fonts: ^5.1.0 easy_logger: ^0.0.2 path_provider: ^2.0.13 - dynamic_color: ^1.6.2 + dynamic_color: ^1.6.6 faker: ^2.1.0 cached_network_image: ^3.2.3 flutter_dotenv: ^5.0.2 From d7b3430468c2e1ca605f5ee942d906be1205ba25 Mon Sep 17 00:00:00 2001 From: Shounak Mulay Date: Sat, 29 Jul 2023 12:12:57 +0530 Subject: [PATCH 4/4] Update golden files --- .../search_page_default_state.iphone11.png | Bin 4717 -> 4647 bytes .../search_page_default_state.smallPhone.png | Bin 3652 -> 3573 bytes .../search_page_favorite_icon.iphone11.png | Bin 4946 -> 4843 bytes .../search_page_favorite_icon.smallPhone.png | Bin 3926 -> 3830 bytes .../goldens/search_page_loading.iphone11.png | Bin 5375 -> 5323 bytes .../search_page_loading.smallPhone.png | Bin 4135 -> 4091 bytes .../search_page_no_results.iphone11.png | Bin 4534 -> 4455 bytes .../search_page_no_results.smallPhone.png | Bin 3502 -> 3442 bytes .../goldens/search_page_results.iphone11.png | Bin 4946 -> 4843 bytes .../search_page_results.smallPhone.png | Bin 3926 -> 3830 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/test/presentation/goldens/destinations/weather/search/goldens/search_page_default_state.iphone11.png b/test/presentation/goldens/destinations/weather/search/goldens/search_page_default_state.iphone11.png index 7b236c5ea51b1714e583b82f4f28ec4237cc8832..f8c44738fd5478f009efdc55ccd82d91ce303c4a 100644 GIT binary patch delta 1657 zcmV-<28Q|VB&Q^hKz|X@NklOb)aOAj2 zwa_TCj21G&o^D%;b2Vq~ymvHup7r_8{AbP)FZb7-dykAUb_)goM1En>3jpBWB9nmz zmkrd>XP*A}qSpYxJ;W=Mkq0t=j?U{u_uqg2xNzagxt#087hfK4zy0=H&IQ21GPm%Y zK7DHZ;U9czF6X*@`N!k6*M2mYa{+L$*lGhHHMdthhtbl~()h?netmA|yYIgH#u#I~ z^UgcYcL2^e#uz{N!M}~$w{Oqwe86n`7M{QStFPSgcG+W(ePDd)Pyb{gzm_uD!|#7+ zJo~xNE_xa4qo4ldr{j(P`pKe~0rwPJZIf{UB7fArePqsW{pN3sbLY<7(XsD;=%M{u z1^@@lzJ=$bAN}q9IyC@yFl6XW&QFON%Gn`8Uh_S_Z=z};{4`{OIy)voxqoC1{BL{xY_4PPn?4I1Ov1yyn#X5z0f&pNHULt>13+pYw%T^? z^7(_YhMhxk9f#o>4#pbx{yZFnHOylji=MZJd6;{6KK+^L-xF2a+t;?o>dDn&EdbobR!^>u?Q7dJkDD2uOIw@c{QAaR z76riJwZ6VFwzf8B9yc>QKYaD#ID7WocS}334cf70f2e&t~Rp) z2iOCXkO#Sc9i4T+*PnZCtgWr>`owR%@y2-c(MPkn>({T36DLmWdTuYXQ`h>^OD~PD zeD$llo_p}Y2gl!h;~Tr48>7EQ_wl{$tp=g~WI`qY`7MK1z?dxxzy08+vOKuUN3NC^)BshRI;`}%XwP5Q&Lso!Hi zb#4*g@m^o!)vH&>AAjKsyPg9$NM?rT@r{kKyu7^Y6Homf`{m{3u{PoD+l%;)_xc*A z%m5rTw%Pzl36r!2Cn;urNa%N7cwwwg_;AX5;XB^zYuw)6-t`Q?L38BvsWUr^UIYO5 z4qI)rF%6>xlYj;X4AhY^#?GP_0l>Y(E0d82cNYHx6w?|E3V}nf00000NkvXXu0mjf DYwC>{ delta 1722 zcmV;r21WU&B<&=SKz|Y!Nkl}JN5Op?v)#55+5tZkfZE3uIx znwZ#Ll-e6B1*_czy=VyHwKw)clpuoM_y^bvOGHCU5J9RDOTnTd#kA36GAa3iwgkebM`q)V+@ST0{|jN_Im>WTw9aj z2bc}I?vo$?)PC;)fNO|%lOX{ze_gkzg>Jt2_;~o?U)=pdmoJY${Nf*t^XGSVzZL)o z&ced8wzf9z`|!OBS?eo*@mInFa7ek;20&_I?|A;NOP4NBU(W6Jl7~_h6F4o)I^~MiE%n?;H1QoEqyV*7tf(09-{T+mrFa*5>%uv(Jp3ot>%2PyG+1tE;Qy=YICn-09VVecu>bHJkecZEgYTR|#$?>Ou_SDq)ObyQi_dht6#u#7!+rL@lJ^?sn zuCy0Zf5&sr#;Nhb*5;!2AO*l7wY9Z5Ha1R8J#K1v)=#Xvy#~NklkLeBeGb5<+LIv$ zLw|MMq8EJfi7$=i<(0YTpWl3LeDKtV=AM7+t+&RJBTHBP9-jR2pNuEJ^v840k8v=r z#bgYtSf3_pj%@|rvduZM%Mhuyv=cVpq<8DnX8(@VR1 z6L#dt?%%{6ggqQRa&*^g9ExkP%X2s^uMCHS@N@8*w1-7;s|}OE1|omjgGc7T|M<`c ze`Fjxc5LqXW8XjjEO0Oh4}0o2KL49zd3ky6`OOzL7q}bXAaJVr)`{duo53Juh_xzi0zBw+vbLpzz!?$00aqijw=2{$_J?z$3p8oUk@+&Xx zY7btM2j}&05caU279K60e}3+tcD=^SFTcEiom~BU*e%!M@a*C2*|X#C|KacUbq|Z+ zHF>!9FfX^-lOYB_f2pbAnQTwS`ib>oF92M{)=#XD$@XOGaZ|(d!q(=vXXDgDHU+@p zwXtz(Y;A2$J#K1vzV+-g*Im@9~>v|Iyt`i>@!o3U%KP= zJ1U1e@d4m}nQTwS*4F0u=CjX?ot>Sj3ddhjcmQBge5wtz!3OFB zlRyTef4Xkk0gs$MJ=WINW?uNrnKSdvojp6&ZoYZuxt*PzvAViC^V}F?oIihl+;GDU zGtbR?j?X>+{P^pyes$)#W5% zXP&!w@#0usUY>bwj4|H6cyX-EF+1-$KEJs+*FRWmYir|?)2C;i8>2r**YUmW<~n}) zsi)HL{PaT)&9&G4xQ-VtTo9hCgj;QsfdLv2 z$7Y_p>86`zo`GqE2d*N&{rKbgqmN+G+-d_LHT50OWHK4Y=XlESnX_ld^>aL(_RRM7 zxc>UqojW(a_{0-4&jB1HQ$N-A^{;(xtgNieyzp-R!`dzD z>od>o$9KHf=lJ&9Z;zk)=tpOs12{+n+-d`p5eF$Fn)-C=$z(E)&+#PXYvDWI>vP=R z-kx~|;GmiMbZP)tB)8hLAqI*BlRyR}47D`IxV+z+0N~o;9g{%@b{DDt1RHXNE<1tL Q^Z)<=07*qoM6N<$f&_cNhX4Qo diff --git a/test/presentation/goldens/destinations/weather/search/goldens/search_page_default_state.smallPhone.png b/test/presentation/goldens/destinations/weather/search/goldens/search_page_default_state.smallPhone.png index e9136131359be76a8893fe36e1415878d2f3b8fe..7406c0b42d69ee0a09ce96befff5a35c4953c019 100644 GIT binary patch delta 1482 zcmYjQeKeB`7=ML6=+5nSLosvf-t=L)xV17LeL3B(QkP1u`AXrmY*?5yZ*`M8NZs9( zVy|*a4*AG!$e4V*%9g3bFb(f`+16&$8Z&nFanHHWKfgbo=Xaj-{C>Zu#a3f;Z3hVL z-M!-wJ@5U%{>#Bp*v26OoB1HT0H0flTe5$65%ZPbqwinkEZ$icTe$kS!)6yOfA68l zcV4_lF&pSzZAwTz`1k5E$EPJRJ6gLaYpXiDbl1Hp(f*GsE^eWCKO|^7^7)dRXdqeMroe&g=wv`op=94%prqlXGemxOALq3se97$%m+^%4_as+9j+8*nq3EAll>ihX23;V|)!xTy%Q5uBfCmNf2bBvfnX7*q~%#7}QcB-Tq8GF@y^RygK z5OacgK+T4jAd%OcDm$j9*yvUhd+GMhrs28nASzyZ$lSxK@ojW?ze|yCy?cYYlVF+P z2Cy6FXRg&4n_MBzg8@g?wNl;%Sve^_d>0lZpKh6j)Y65QRUKISUqwb2TK)s(LDO~S zA8p;}!e%$%7>CAOW^M&O{pg4JBP7HQS2I}_cPfTaYJ0R-vDs+CYi*PRA{m9JCVd>> z=}EN6&P%gvACJdF-avXjeR{G%fOPwY@kT`0r`sAY8Jij@XR%gI6~}S4 zEF?l;jU)-Y>YgVo_&MDtM&0G1jUdZDQSWt|Hd>y-QYe{Eo@k2O_GitspI;H=4Aiwq z(`=58wUccs~oog8APj1Bp!3W16Ys- z&I0;sEmwK9k}7VfMYX|R21nA%mi!pa`*d#Ah*AYaM$L!hlalQ4pwZzKo?K#gtaBVT zjV#2Hg*sU{p)`D%OgKJ0@c7cWrJZ(>U7mqh6zHhEheREiJ+7A*L-G$UY(817uEZOE z`=bKbF^u^N%v6&tU=_16K5Qhu)b!l?Bbd_67rigKkO%PWyhdBu?1pRJMiraMWLX4_ z79oxEN9NF*zL{(GT)mp2+@`>~H(~;}Rk$eX(W$LxBx7{d{pJ4IV%pf?P{x}tzH%nZ zD%tE!696$RKG9_hfdFSXj$&q>fbciJeQ1T}fM=JMT}6=7dP@PNY8>vE&u zcH2-uQ~st1?Xz)b=swgWT&<;{9WU#>ruu4W2)r#4t%t>iAq!VQrZX%n=X$aNz@fC- zNGI*)r`c2iLvI+ZhnG7wZ0!-0^nEsrSicysc|u zqhFHN#Iu~-1WRKR9^;Lfu_o&*S$Eya@=!nDwanb8b0y5EhYL*R&;D#Hv(s#YRe=HU X{)cb765>Vx^R?I8cX!#&unYeJ``9X7 literal 3652 zcmeHKX;4#F6n+s4j0>nZpsaSNZ{SP}rtE3mhPRvZ|Q^C5uYBSV4#Mwk0bXfhuk92#X0 zja2(1mm#Og&}~6c=L?mhW?Er9iKC8Jmb3QwW;_tDxs$P+m2-O0p6`~F4c-YINlOb0 zx*Hh!n=Wwqo`9K1hdp2L!-yk}X*Q3Fs{}L+Of8;a$Hyu>(B#xCAA%WQCAKj9 zxGN-vt|YMc-aeNaPj_dd^9)4~^0K|mFDQgW<&eZOBt=j(ea7l5Op&(6AIvSXWL^~8 z8ee#$EggD^)u;|iuyO8!cF(D^nV;eRLFi_aYC63v%_;(K3S^v!aMRUFlry4iJZb19*8@yr4RCm96 z)9RtzOIYVL(SCF_YEpvq-&KS{ShNy4-Bn+Tqv&siaC=rrhpc8yrqCO}_hWNQ=uAly zj&PuV@Bp6;^k1x~cv@A3BaA2Rma@qwMG=cQpZW~YC&ncxbIq(+_z+Ru;h8a0CT3;U z*q9TZhpshTRChg4)XT(fe*VfX#q+~PrjK*m@6&NUl(D8w59 zc#>Z%RSm-&9=$Hrs;9QnvJfS_ELDK9ldrf22~vFO&-FhXJm{e!4>v>H?}aQmQ0ST( zUvP#_IyNyev9po94`(;b9j!eITxk1P(a$-|-5Hcj=VUXBD>$7`Xm+9n_zDDqV=?;C z_Ds#wM$>dO%dE?j69@$E`1p7yJ}wJqm>$DDSy$V+#ZMJr8D`446tboO!K)}Q&nls( zo|Q3u7}kIkY62F{Q)@8#7QJ=tK3V<^P$f)~=)3LENR2RP3rMkY{kQ^03bLultu{Ea1hFTZ+2G?_TH1Wxj)c|rTBsZ{PtKZ z7Q02=ABW&&G9`-i%t(_ I;6oSw0>i)OQ2+n{ diff --git a/test/presentation/goldens/destinations/weather/search/goldens/search_page_favorite_icon.iphone11.png b/test/presentation/goldens/destinations/weather/search/goldens/search_page_favorite_icon.iphone11.png index b353e7c96acab20a9835fc60fa16601440d375ab..f9af7254a3d29ed6b19d0777bfffb7a02c8733d6 100644 GIT binary patch delta 1916 zcmX|?c~nzp8pba&mDaFSQD8umYDXxCwt(yyh*YN(%Q7RQY!adw$!LHGNERTu&<=;= z$Rd+kmXL6II*7>Lluf`O=*_TRS%k19gn+3{AY4NNfj}nMp85X$-t(UKd!G0AeB+La z)AxhG2O$@N{zk7{T}XH&rZIaF%2egVqg=c6qT~usuzqFZ&Wl&4h~$B0!oeGEq`%%8 z^Dpc9u!-j3dJ(zab+|k3g~HF-;f8YXOwbSHJm;|3w(1|CJLMG|cD3{2OJDqZA;p|J zs;-oG!&Tk*X#wn0<-{1|$T<^EU65V-LEyssEHd8~Sk#_ko0ykcOs+YFv#5L;u;{&H zT{3nC>>_2nW zu-0N{uu@{^k(>|~W8x?HG)czvmklPpHvDT+h91F*9{p${g08lj+^>kCr--}#>V8bj zv;pFVh8t%`t3Xn=W~K@L)fb?C5|s@6=bvUd->n1pkMIma3*2(EY@s`Y%#X^M8*MZy zGX*k$zh^I*d~_Q7|4Q~6%Ei1kKHutu#_E~LedI2?1Z4-dW_@P0y3j?_k2(eVp`&Bb zC^H-HOedhNmULJ%v%*7##2#tT~c)O~Yvs0JW@Dd;OI_#vt5ebZ2OX z>rZMA5c2)Aw8PP{v3O1A<$nHc!ZVFMP#4?z^G^?}OxGjXx$gymYcZIuIjcZVt#Zag zqpvnR@wCid?wwRmH^w^<3z7x>uA@~BrLGCQOjbbyLP98py{1UG*d5y2-4P0lB<+nS zAd!BvKYWWRa#jtvdmDC}k5QvlS!n@@XrBBjqA%lcIGKCHaU|%i=};t`AYd^I+}n07 zLBqJD&|knrC=YoUB3U1U)vUk~0XWDmLNCP>!Z=-C#;P0iT7aSUsrthi5k)OJRenQr zf2M@3kUq9xo1jkJs?bHf?lt@@R=u88=e{B3HiXbcf8lSXd`=*xzB+jBA|3cDx%cv1 zLvow}>O=YXq3KK1;rc$d|9Wp**bM$OPV=#Qa*DK1O+50wP(m9ak2G zKOOC(3W07LJB6~5L+8L+ql{@cZ+v<@`V*=N!6DAK+0E!u{r3E0DMO(wM|#KKhJJs5 zAdiiWMU!A&%)ahwh*JZ#5QRcwF>igqEXP2U_V&@0W7e{*7MW~=Q*(vMnwFjqrZi|@ zihHtz{Z(7bM$c?8z+UP8rWlRcuYz9HMIDM_vcjY$IWfrZ=8fQioYon>{Jac_z|rlk+iFye}ib}n&9R7kj`7C@AlV7L{cOiU|8N~ zPGBfOM&t>zi-l8=6B@Xr*n6&Cu*KWmyLZnTj_%ACs~b*i zay#}Lp#)9`Lk)e8C0{b;OxxXbx!5iOd?QM1YDrO8!d7?|xw^aR#VoMwlXMcr%3kaK-M0($oeCP!*}crD>XPS{qR9TmndWFMNlxoC=D zcRO^n;=4L;;8LIIxxvd0z22I6bws1?iE?iT^G8YcUbThzAIbYM(z+Ibl`y4w`=TK8 zc_>?`-p9&S3gXGrUly8yYeZuy+Juc60XoB z+*>w;BgS`sJ2XUOu~KJhAh2Ez5TCFm#D@9=8iTD>jT-T@SSG@u`iUh6E!v4nsDyP zzySQtK!hVN4kl--dNvWZ8pdDiG*%=uIV;u(&Q7zrvyGW!fek2q%&yZo$!T^rZPb{CZOHs&O+is` z+i}e!NgXG3)L?gAHBX{>7y=aVqlB`IWBCapf`e=b!V3b5i2Ks>?|shw+~>M}*R}k+ zSBGw&V)@Q~e(D=~i&aZxFVQjwL0b;)%(IkctEJ1@eoif%u-+KjcI$l8_whNmYj#%e z-tpeHteX_X)1mKn#g5k`?X#R}J-;n$&(OcZC08f*zB+w3uc1Bq{Lb;0FOT(yCgZdy zqT+saoQhYX;+4x@4yb4Z)r;3s=Z5t)1*r(vY~KZZsB|-efbN*OAy{LGc5TIJo3)_; zajkf z$8RLT5QFa;&%Y0JO0=Lazena)i%VVR?(WRAwD9EQWQK5bA`FRCZbwLq@=V%-$01~P z?=r8(>2^zF6>CdaUU+(XdLa%mGs~?s(T=lh9%Z2_Vckd-Bak zAjsKNGkb>6-XRa`DD?HffG&HmXrvW$2RxK#ouvskEh^t?eBn}eW+r1JS7e<$07M*R zgmGzdCyG&Y45(^M$_4(r6voY-?jBpdFX8SO9Qst0lp7^H=LDHGRoY30gb25zWobxJv_zTPORZQalqx&ST{s z8B!64jA09tvkTM1Djw&%el?42775j(r6_o;br7{EAk)!h8)wLu*&vOzC34P%Rvi36 zB%1+k^c5T<4_^olen!$aq!U%{qKDdwWAEj2hvFRFkB#yqQrXa?B1iA)!`iMWo7LcGnBTs zSgfB3iQ`c}Vj|<@|7>;aVaD$y1l!KyUeqMz){VnHWKE#UuE2dFtPG4&p2KR7xqRn( zc+9Z)#viK^TQxg-uL*h`;y=j4}k;ES=%^BM}%BvLv+W2b4W+^SP> z`12T-kHcJT1=W+&@J+ZX(WC98Y}M#ShGs8cAZ@BiY!iu|*N&1#Azp6iKd?OHEk&cb zEdNWwSee49A`q(1!MET7M}PchxSX6EHp{0VSeD_=g@lq{iW}?SUQA$3)aozx|AM(d z><;S(3U2bb8K~@rsbXoK(jKrPV4mcY9fRXVZpcN@P>Jf%#Nu^K^Ru^>{v)6D^d17( zQbK@$3!2CSl$FFdxoe^h0wVxbuI>7`!{HEbjpgsBsJNk#fWHc|aM3UVTTCY=oWO)& zu{0?&RUcGQ0(L_D6Ch7FF98+Wix*EMBzo^8Q3zKVj52>OvG#exG=-48dw6@n7cKab zQoQ|OE8q2I34>9L@V$}&ihq%vyDXGPZ>5}}ZKt*FQ# z;q&>uVsSh;7fzP;36IyeH{Np}Pb}Bpumef;2xQ&gVUa9HW-fH#8HAiB)pIv!Mb1P{#YHCVR{jof{w46+i;2AXknU2XkpyWjI=qqgvmkvaw zv^3K5*s(`Qa(te|SYK^wFTX|b=@C)fpjtW97wD&gLvI70Yt!)HgGG>Zb??HOpv>!F zz(d^O!yU>bg5!Ud;M{zUir{`mU3Yjblyj#bajWa1h@9a0V&)M_`TAj=Mr02FJc>dL z{#Gb-nZ>0=*{RbrACW2IV_$#Qsfv@9qU>Bc%EA-E0>8oCaB0g~h z`*9Dc?^talArYKQj*%TpX^D>wu#h1yE1CP-^XO1j=C`~Rk|$j^(`bg_C?&Uganhkfy_5v+-Bsjyj{Bbw?@zr>V`I+02v-74tDR>$W~Pj$11DprH{P6C*QuC^&Uo zb9`ltrIE6owmhREI^=^yQA_a6xTR>KqNq%PGDP5m*J90{v-h8S&$;*9`~7`Czwe!a z>7lp6=`Q~|b2{Q5r288SsGAECa?$cbH2mBjzW?lmJLXPHSl)PM3M2T)k28P$(?2t- zV_($TO;^-^DgSEtDKq0>jK{{2TdB~W;|`p@@p4uQr`|vj5=N zpRtDy=bd#c{%(DdC*LoiH0adG-PWt*yrA2yorUIEFv00#z}IFh7YxAa8S%hFjLY^; z^h`sG%hRnzs%YvVYJ9aNF^!zfx0ns^AZHoj1h-qgB*+QTCZ;!xB!iC`C4qFaHhrB1bf2F;8T0Y~TvC10%xzAmOA+ z2{NltmJ5*3g3GbuMfy^qXNN<7>cwX(=9dZdzW69$o0G&J5CJbUOfV7nyq7Uz+iuSZ z6?%QJxJx8yun1c!fmmqD7{IO+8Gfr9Xjf{0N`C|OkP$fxuT-C4BQF_@?Y^XZ;PdTO zMuhG0Y8l9RUav;}8m0u?)Qm8~?ZH-~(6Cp$T*bB=RY-v(qhZcekCPN{fVrw>>@RW^ z4=%4jpenK?t?XT6ljY_`#bmwQ*Rt|jqn`&0=W_AF(Y2a7ALss8M^(xDqVC)gJ%}t3 z3C#1+%?`Bb?y#NbQ|;O18ZS<-|JW&;+Cemv|EAth{b-G-m)0e3*u(mR?<4awj{5j; zcBM_k^jWU#3kPgj5|97$<1oWJh9598sZ+e$&sefd)iRk(ig|nvj@uc2W7$z!6uUYl zu3YnAX*tT*G`6i^EU_rGa<(RmXq@wnJryS0M=vzaX&yBS_^nXktZ^%HS@Ga)14RDJ zLQ8UHG2-n%qi3$ChXJ|_52IjE*hX)E6^6_(W^kmgZ3z_xVSyB zk@$Cou4*y35=^Nip7gPGp%Zv@4!Uq>aa={$s7o`GEUgMdn)2h|7@AKojr0~IFY%_g z&1JPPw^l)-j*mWY`W+WCoYC*-NB_lIIFIk|p+8#S)&pq!q4<sI{ zKNLL%Pj)KOC8N$ZQnudCfpUbdE4AW6yt7DDf&J^eX8-P5ZJ*oHH*_ z%h=QJ@sd;tELe2(n5}D@2k*W$R!twn<=X7b*T-9YL30O+nTk%jbQaA|qwcO)fSg1<8J z@BejU*8U=7pl0wzRv((Yy(|)SrI9Y)K%hNYQk&~DrV$g>w=d8G4EAp5A!$|uFU$Ht zC-c`vYuc$>o27~wcnor*mD9KTW?P@%2iHLQE$DoyS8^ImtJS)TC&Ux6I_99!XiQ2; zswHi@mzCiN1i}i>PneXF0?{Un#~BWI6~3D)#RCW*;^sjgmbe0>15@6Dz|fsva9NaV zYEub<#O!d-w+g+c;!UKT|DyF}bbF{n?W&Ixa+86UpoqK4l{} z!)QBe?Z=0}WYgw<9%=d)d)>vUPp@87)qk`3X1W5LH%HG=@?Oj^Iu2@ZKV- z+C)2okNvyUhM<+*h?X~t>uX1n1;KO*UpJ$K2W5TzLHwt~R?*P=q~+HE>Ff~WZ*n=t zm;YqIlU;$@1Vkv!tL9#CI;5U-%Dg+URKuqU2S=r!-=g+V3 zP)Cnd@_4*bh4tSg5{cs|KkBctfuCsnNRVq~p=-!-jg*omj|$z5CziPVo~^@Hb=HU- z-mG49r1#MPGMCEGogvLg2@LasOI3&Q2j*Mqt!+2ZjuU6=of3#XKU;~t4n z?zhOJ*GYwl{m!aRH!9v3uVpDT{j-fbEp>xYdrW e_P1RlJ^={vk1I}`i*p57$C literal 3926 zcmeH~dsLI>9mijY6{iL4*a`?3x^A+L0#b@Z0!gK|hy${URZF-HM9^?cgSkLRusw|8 zxUA>YGA;tGLyrQ1AR)m(f{2M+Lb!||5C|kdfEN-HE=dR>3+;MN&&E7%JKJA8|NNf! zdEe)~{Jx*(`+MHJ--QNR9z1do007INGpEl1fEfV*%*zh!H;q`)x=T&L40kRt0HF0b zE|?DX;R1rrA22oYfy-Y2fHe?w`qX)1`SJuRNiv(&uHu`qtL(ml6*`;$xcCkK11IJUZ)^X6_th|G}jN$`9wRvP!wqo{KfG(2my{$ zrB;W3sQ^yBTu3*xp714W`-w~Rzy!&B_bt^3b(JZTJ{62=%vm1_+!U^^t};%hvZN=< zs6`onp#Z$n+#rYFWug>FWt(Qwq1ZigY+x)WCx_nD)PxQ!8Iww-#Hky4d9&pDNTd(X z4!-^9c`8BU5SOpaQs&SZ3~#0(hWnhsGU}qYX0@s!BQ6l5d<0(P6&u%3c<|R@a6ITH zJ5*`B(}vj3p1+6GEokeF+g(vm$Xp-e)%X6yg6zwKzcBRE{Lynv%Bl}fB_k{)F4r-| zjc7i=I<_1xMs7_9;xQPYc{+T*b7BgXOV+7dn@hncVC37D$ez}XF;KP|t(B3IE!tm= z=mEZeR`khkWTH)zmx4B>2ioE!RH!lAmgPrj4VMcP7k+I=XQAfEN zcBNfCcYBODyEJwQ$wV-pm^XNt=J6+7Pz7+MA7Xo2CvUdgYQ|FMALsHr>|_$7Ofp9b z1@1Ns9ZSuWQ#4&+JNI7owFSIjnfT;#Khm}F>*Ktv^=A)i?6R|B4dTs0%EkgS9{8-& z$@z@f>^}~)O3fdHh*bfd#d>#rs|SO0gu>Pz-~V!`c}w$zqV-+M)y$Cl(vo*j{*frVt{L`<)=W!IaDW|+niqRNM0ZmFT;Yu84+rk>Mqhv5<`Mpk5~TOttyeZ7tv zzOdZhy1F_~K1p5`VAtjcy5yn}{=o2Xp1iranP>99PF!5RN+A+mDviaD zjcC4glgS@Zca|`QGKaB{TTJV0ZRfwO-dTre!?0h8T)lS?H zhvzd%jFZ~OAl#!lO&*%kzjiD$C$RCt?Q{U2^LJ|h$%B4)wcY&be}AqD)NBHPzN@>N zu4)k?y!9Vmq~+Hm4b|A`4&G8`$SJWIh4#bq>tEbfVcZzmcw0d;ITQI)3)aoL zIs(7?w`h1cJ8i0+C>bnZlfS+F8X>zz+kFx0RL|M$C=^w|utwrymmIG<4fn!{p-9}7 z+S=M+KPH{-IU&}q#?7uw=gCbb%U7$_JF;R`(x=#=5T6h~jZmWNgX!-;P2C!o(0qyR zS>UmXvRUu#;UQF!k)&U~f8~ZDVU9&r<+<<%2M0TGsT|!LEMskc24~W5esQrAheo60 zuvo0L#gj)QU@&ioc@%ZHSKZI|WU!)sf3&i8+lC+FG8I&u!l=E_nlhzc<;-3aO7=~l!1J2796Xccf}u(ySGu}Ab+ zac0Q1>5Xv(t1*G<3$Qz0u13E^8Q;6)g}a=+^z5bQ#rxnrLiPyxe-P4dG`}q3Zk$W6 S<(dACfuIjUPtyWoKKmOb{HII+ diff --git a/test/presentation/goldens/destinations/weather/search/goldens/search_page_loading.iphone11.png b/test/presentation/goldens/destinations/weather/search/goldens/search_page_loading.iphone11.png index a2f8c9506dc587a0f8d74ed0bfb665cbf74253fc..f5215e28d3aafab924866a008e1dcc04a04965fe 100644 GIT binary patch delta 2521 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 bt&FIm4Nh4Zk5Y~Rczh8Q9LW6#;p%?@dn-tf diff --git a/test/presentation/goldens/destinations/weather/search/goldens/search_page_loading.smallPhone.png b/test/presentation/goldens/destinations/weather/search/goldens/search_page_loading.smallPhone.png index abbb9e0dfdbccfc713cdca27855cb855620082d0..27b1a90b57d267f37053c119d944b83cb668d837 100644 GIT binary patch delta 2106 zcmYL~d03NI7KgtOY)~S0RG_j5Qd`slQDhN8f+AvT#q}c$2$6ANMRoQ` zh8}&tclYt^3c2uEY3x*N|F}3HVN$gFy!0o(L`-z~+Eefq8?S#k{oDS{NB_BD(+^GL z$OrqkBs&~+-I6$$uyOBq53FWU9zWPVd*!EI+he^^$jIELVOL~snhs0+Mq1LZd{xAn z5BhhOW|1vZeRzmb1_X0R@>(p-n!L#fq5v{XO&Ld`AbGPxQ(S|rr+`rQMmN(-8$R2Z z|>kS;m@x+c2x)RB2@*1hJTg36yWSKQa^q zizSI7-(N7GibGorr&6iD%kWO^DG&0zv6+clf3dLT{|2UwR4|W|9Yt>j= ztjas;Z9|^6R;M&+CqNXuEYkx{8A7@xd8&2!XsrZY(?Jk3-zK0neU1k_;bZ%vJrr2& zZ!|Ao2ePx%YrxVxX;N8qaq`Zksk1!h7iQg6a;4#5Ee`0k==TQl|K;p@lL5C}t-+qU zaLQlgGl=Q3jM}SdZpafJ@(=kckOD&nSbr4d%%`#H;I2hf%5LkgphTscOFLc`Y3#9Q zMrleEym5K&Bc5e=$Mm99t z8!59GvvqQELDxNes1HQ9ZdVkxu5x|>oLJ+2D8lQ4lEd+)Y(s`dji&6HDNvfK)fx@T zXe=yUKVr=7fV8q36;vt+cBxYqhDuG37PSRRtWFQ|B+5U!G%Vtj5(65!xk{ctYqlN} z9m?gJf;JkU{o1>AIYwx`*K;;y8~kf1c~J*jFy$!;5X;8K#>;3d5Vso$m)TSD0bv&%shjo zS)33D9E@4?I&YXMa2Z~OUg!Z)l3Uulh5?)h{LB3Un8mfg5LX<+iXue%LHDRQH1YgV z^Xs8CDX^1;z5GJ_-22l~X;z=n%&DDlf%WPEknJ08=C-gf&K{H(=?Bq^)e1pdjFLIu zZL@ytx|1lljvyu;CMX5pb?)4 z-vQ18UW|{TmRoZrFKTWz&~TYv>u`m62Taoyu!PV*aB}HL>Fyrd&W44A|r^}MNqEX%*L;*(sT|9zu&s=C` zB?q@A3G{TrTKLS*OKV8!;H5iidMLMmJ45ZXVi$rUOaA$qCK2)5;3xLU^8Bci!CSf~ zniN&_ew2J99=i7!N0Z*>0O=)WrVdN-RRU*hi`F!z38c>^c90#-RQY|Rrc4B5iF#)y zExBS^1dHp_?ilgGN*EY0t(9LU{OdBtO=6{NI+cG>;a0jQy~Qyf@q2uwbTrlf#+$f} ziuoYk)a3AAR(4xgl%ArdN7(bNl%C$IHh+0m42g$9f8r8CRU~X|>w8-my^5HpW=MQW zeT$FHZ&wdS`zXM{^j{;S$3QBIv>B+J*TE>etvsQog_sRpbM~&&w^+4CaAoh)_ul|< z*0C60BxxlVBR78oQT%0jU7{+xfZJ2;bej>xbDJ59-mSwux_j-HOO|xcX^un@`k@Vk6rqY>Soh%$_~*HWcLAwEBDPV$91F$5QicyKBIIIweg!jQ*9~E zJtwuvSXZxqccDyQ4cy_h(^^K&*_Z{D^^q!LBH)YwGtwkMRZ{Z*oTc^uU*#dT^O(1} zW0p;-!Tp+x$X;jGkaMwE5(hR5(^Ik%Y{&LY66uYNY4dG2f>yM>OSfEqvXEGr(kS%s z&i#ooIDew5{8+dTfXWCiF`FEl`gLdP%VBAYKR-qPmh3XwhRF@#v>cxjTy)-FgufV!r9bMTIeF<%Rdjqf literal 4135 zcmeHKc~nzp7JmUHR74nCMUll?tK*>HFyJyUAWEtn4uk>`1wwGwu%;5jViJ@Q#wDhn zsvOy3abbxGE-ZnVgc>DP3`k=@$SP3+3A`W}5)wit+Ht0*g%SH_kMEy%-u=#Z-*E?(H=E^J*a?PAk;+7JkKI2n2S3ayqNEjaqF0ab{LqTU!x7PrdsV!#qGSWtrqqGq!3^;OHevO`560-4nYi z&e#ZN$I2#JG@Sm{#GpXKbFzwKRu*^}yf1GQdA~oJH=)K3O1wD+4^BKz!#-m1Kdz#N zB5j&UwL8Qd{R31S+6QpDxyIVDa;LcB5ZbqTV0CVBWq1AK0(U~ROyB2T>kMsP@a!Vw zXZTDj7Y&(s#eL&2l-25T<47U9S7h(l^5{LVPLFvLoT&2U+^}AH=E8I=9aMTlB~4f= z;T37UTFcGBrW+FnlC0#bRyx2{KfL-HZ_d-HJFaYXaw9%B-_KBY(hMY&8I6D4QJ|IU zE5qH&e3&}`Po;b;h(*Y(0mY4RM6&}Cw@dDI#wbc-MIjL;HOCa%s-Bf-SC}$#A_uH- zmr|j;tu(q_uE&OefNCx`$H@)1OYD&9{_GTlvBKgrUL~!l*av(_a!rjwtsq-&(y^nM zOe!tVOxbGwn!?gG(gHaNHB=3=aMBqx56PaIG!xoRN==g+(FtW{$)tu+1OjF5VQS-0 z5<&}hJYe~R3!RI*{lHiJ8DEhgL=Fig!pXmO=wi&gAF+)5@7?MCU-W8vPZ9IaYq(hb z#`prw-r^+2;^bCfdO5s1vE5w)Fey_8813pf9FA70Bkni0-wRs-u2zvb+Ld)oCR3{< zySez@b!KdQ=aJvAk3GiZbZ0M*8^N7Zh;%Y)nvAG{p;|7ChfluV(fEIK`0mG3iu4zY z{r4CYfB&jH5j2pL1d&@o8yr+GoEhsa~ zO-+ZDsVq~c-}Yg^>&G94^0JLIoC+*uYFQ3a&afU7P_k3l{g>k!QiV!c=AC&CnosllPcNh3bYHarzB;epKO`P8!r=1PO@)W z`*YXMt>ZMHkPVLsEz2+{+F11+i1qNNSY%8Nl?B_so@|t&5lCggn&y2O$QY^wG1?gB zA=crw++N*5NcmiD1YQBd2o7yAzuLetTg$UvbA8Vm&9t66S9#-WqzD>Ol-3FiPsHk? zND%t5PI$1VBQD1q@QO7ulKh(O4#e5Kt)ys|H`cBo(Hm=B;(x5u*4JN9_uJw-qs1^q zK>L~sh}eZ@?Dhc#K6Nh8^gXrU0TH8pPb&sk|CO3hPcj~SIqxQ^)0BMo8w$GQh7?l9 z8{g3BgHkYJ5Gm`5izGW|GtOs~sRxqU7)R6 zjruap`WUGOJnN8zgfk@M*Abdz9hkS$15)47L?Ok1+lK(rK}mZ( zMne<7wS`qQlIPqk?KIUswV6>LojS6abl|CXKJ@`d#ostL^DPIoWI$Nd|ETt_|8EA6 zw}WpF-r}LFYI&$~m1mWZ_k@l5p3OlB_ur}NE=A;qUQ#x;wXNeTJxBihBKyw5%v`(2 zqw#8f_POrU_wi*)3)em6kj(s1%ngBdV7J}#QrPu?Tiwak8iT5UZAh(TYpCjr{$Dg} zecH+HxRSnG*D+`|Z?YDqNYLt6s51f(!ttLftmL26xC0*q)oIRxpFD_=dkN#r9;9&X z+|V*B`L!ol1ouf-1YQ^}+;FyTr@TvzPd=A&iLOQy(@@VKWxE#T_sB#wsoxKsf%UR2 zTn`?HL|O#@t_YxUUk(C=Pq9eakr=*m9Vthqt=|ol3D(XP;!?VLQWOE1x92A=v1lpt zWvcLJ%`DMLAGyA@WfU1J0ns4|JT&ElGWhrN{HvXRe6jy3;P>^r-&r(2x}EOAKXtkJ o$jS`orH}BvZ=(DIA@syDlt)ID@}xGWEyF$#0t*kOZ%#b^Z=K!sYybcN diff --git a/test/presentation/goldens/destinations/weather/search/goldens/search_page_no_results.iphone11.png b/test/presentation/goldens/destinations/weather/search/goldens/search_page_no_results.iphone11.png index 93d0fb84e8c6671c24dfbfd1a6477903a69a2335..8fec4a199fe2ddbf44815da4cbbb4a48de861ea9 100644 GIT binary patch delta 1414 zcmYjQeNYm17>01tP1D<@s57OxE7zOxA`a4@m55RsU~X@UHePkVao-Q(?hxL7Q~T-U zXd!#3EPV!gzw*J)>}QidNXx3u42yQArDgPElJER-BqCLH`j!!+omiF;m-FALiQ4%- zgy=RYGfU0)RILCCdce~m0KjU=0)XBEu5<=NDIWq1wZH;$7m^+h-a~a6NPBn}%O%zz z41XOr=2@3L1mjp<2%Q5Mjm1D}(Zcd_EZK0YT9c!A6)JcQTPJTP0huj?VaKpE%sj#P zps=t|#|PEj8Kdl<%zo>MF3pt@g%sp@9$a8nLDvJD;@g8-)(S+dU8qp2C>m?Vjd4t} zy|tE?o5%O{`VMP5R7Twg6L;@CeDpg8&$vQZs$=w%oJV6&X&|}|jQf=ToZ393h?N_i7}n7}TZCw2IxHzE~>!{uA7(d8!t{zT984B^EN{M}D+7tu9|iQZJo zjE0@J^mmua-wGb;?(Wu&z^EA=`rbkug`9CIPFgj_1ZXG`M=J#l6(cxhmq<4*U&AEl zZ!c0WUP}>NfeWAs1WIMr2BvT#6}H{#EwZOZB*#!{!?hOK0vgJ}PGr8`b&|nboR3iT{6ss>u{O5JK1Y|vhjz+g z9jM)jT-4GE94}}!&&sWPY@r}H-@L$9zvrC0lT^AacO@y*%owc*K1~hPT=!z-MgQ2{ z*J>=FO zs=O_b@Qgi`7*Dj-)R|yLXevmVb{1q(QKO80PI1DU{sqwQ;yweT@5(xBWPbX^)VmqU z1|)rf*@)3i#_?s!k85n*M3Xkn>z9z|qFIs>WqgIulzOo!_8~EFVTa^y5(ML0i_Isk z$h}@&dJZ88--<2CsI@-WbcmqxxxZKE!yrI1Jqa96wTUSBy{tL=LPOOj1@V_`%N%7t zgX`GE3IvZE6xH}-;KEk`W0OtrW-d3#o?kXZqzH>Q`wM5lVuBjPUyuFvX<$?+0aJs* zW!8{pG+ip!Eyz5}%A;!#4-cWgcK!XC*jRTcz$&ye*?t+|WaHyFc{xhm{*7+FfGYR8 zG*HV4@Nb}}8{L3ZusVbvWgPV2e&f4pHSOnU^;54^3yRK@oatOBIXjM`DvM;0lschs z=Ivu!c_b#$Cs$53)k`v_wmgnU&OI>%AC>4hbM>>qbJDtyrD1~cxw<~De=Uq46Bet4 z!Z+<&>Ea98P8iK*;f4gmJ6Fo(KX^=S`#iS+vo|FB!{C{Ovo=IyjY_ZA2M2ab4>>uZ ziA17dcKUL8lZrGRDZxpzP&kYE6r(MXFia0~{5o|i;-FkOmZcUr!MN<1oS3FKueM42 z_$kKn^j&OJtJWkwfRt4!BX+i{iBqA$ck-2k?C>`2t% Jri16N{sWtE3K{?a delta 1471 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 LA}U;TC?Wel%u~`= literal 3502 zcmeHKYfRHu6#rM9pcQq~2m=Z@H`yYSK^+BKsDfI^GV0U;7RqC#7Gd;ZdDYeyU5K(m zQE@1vwk8W0g0>(+DX$8eHkCI6icl!f@un^1Rge}|vq!Q-9gE)@nWY3et*eFT_77H=-(OZ1GUUmvu`?NsSK*(mNm?*wdrO}8~4!Y{u zW{v=h!PufW_AiPaHpbIvG$m^lWnJDs`1GpG1}77;=NFP{+@yslb9*iNS(7P4dZEtX(e1bTa#SK!t?FA${hM95 zxDQjEC>E9uzW z%4c?0**Qs_-yX;tW5raO%Hc)=1aR{azX7bi;%s(MP>>X*6_b===EVn)h~7zW(DcFV zhjLGm*llITNX60V^ojY?tJlus@py)|l<(*&F}Ays^9~ayvYJrUPn#E6`cgJUe!eHBeP77Q1yR(C8Xs ztWv=ddi@CUbTZq7n0oK4azOtEz#H@a6S&H#HZae7wlO5!$K7CL+qq^`1**Ia#ynE3 z*LDb|a>PJhARr+G{*qidi?h!l=sSg%&TE&wsJ6-n!Ex|DY%sPNnvh@xltMsX8ZFduhKGm6qp;?97cz`&BD-wd`LPx_ z3P$EE&EO(J=5991OUD-VFQ94}p=HY8k<>(=nb6B$ap^U_)~<|+RXT@emn1PXu~YA* ze%8eiX3D#wClXJqnM5k?6;Jl&ZHP=ZLzmUmlv$|wI&(RK$0BkOv{-~0b)UM8Q`u$e zICY(cgYEr5o-K>HA}&<8_Az@Q!3EgIj~=;eYes8JYMGb;&_Z2woVy1MCgt;4#P3NY zbPW?lu^8wX68-fo-YJ!}C%u01U1_sk!T(zYiQPIYmmXXe!aXQBn81UxR*Yd(*XqTg zMNMf-Ga`9ztWE#hE_5RTCbhA44Y!B&CH&e*o$XgIDZ=fFL`wHr<-)>3$l0^GG-5^( zD~qS5SLN{3)rOS8`ZWDqE)?1Vi56F|)N*IpjeV$dJokG@ZUv9?cC2&7*1C^S{E;IF~q-d0iWoK~l6+xdsQ-#mR?Z zN=O5+#unwImi=^pw%pT0CaS;7(v(ru_9}+q`2k@g0xD%mGR9S;YB$Byq)_5RtX&$( z9UZBW&4z}mrFJAPOpI2trg|evaogmP3?iI0u$%wg7t?%-z7+`=<4i m>&5ynefBzE-jy${ETH5TKkQq7)eG~V3kWzKcue3MdF6Me9JuHJ diff --git a/test/presentation/goldens/destinations/weather/search/goldens/search_page_results.iphone11.png b/test/presentation/goldens/destinations/weather/search/goldens/search_page_results.iphone11.png index b353e7c96acab20a9835fc60fa16601440d375ab..f9af7254a3d29ed6b19d0777bfffb7a02c8733d6 100644 GIT binary patch delta 1916 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 e_P1RlJ^={vk1I}`i*p57$C literal 3926 zcmeH~dsLI>9mijY6{iL4*a`?3x^A+L0#b@Z0!gK|hy${URZF-HM9^?cgSkLRusw|8 zxUA>YGA;tGLyrQ1AR)m(f{2M+Lb!||5C|kdfEN-HE=dR>3+;MN&&E7%JKJA8|NNf! zdEe)~{Jx*(`+MHJ--QNR9z1do007INGpEl1fEfV*%*zh!H;q`)x=T&L40kRt0HF0b zE|?DX;R1rrA22oYfy-Y2fHe?w`qX)1`SJuRNiv(&uHu`qtL(ml6*`;$xcCkK11IJUZ)^X6_th|G}jN$`9wRvP!wqo{KfG(2my{$ zrB;W3sQ^yBTu3*xp714W`-w~Rzy!&B_bt^3b(JZTJ{62=%vm1_+!U^^t};%hvZN=< zs6`onp#Z$n+#rYFWug>FWt(Qwq1ZigY+x)WCx_nD)PxQ!8Iww-#Hky4d9&pDNTd(X z4!-^9c`8BU5SOpaQs&SZ3~#0(hWnhsGU}qYX0@s!BQ6l5d<0(P6&u%3c<|R@a6ITH zJ5*`B(}vj3p1+6GEokeF+g(vm$Xp-e)%X6yg6zwKzcBRE{Lynv%Bl}fB_k{)F4r-| zjc7i=I<_1xMs7_9;xQPYc{+T*b7BgXOV+7dn@hncVC37D$ez}XF;KP|t(B3IE!tm= z=mEZeR`khkWTH)zmx4B>2ioE!RH!lAmgPrj4VMcP7k+I=XQAfEN zcBNfCcYBODyEJwQ$wV-pm^XNt=J6+7Pz7+MA7Xo2CvUdgYQ|FMALsHr>|_$7Ofp9b z1@1Ns9ZSuWQ#4&+JNI7owFSIjnfT;#Khm}F>*Ktv^=A)i?6R|B4dTs0%EkgS9{8-& z$@z@f>^}~)O3fdHh*bfd#d>#rs|SO0gu>Pz-~V!`c}w$zqV-+M)y$Cl(vo*j{*frVt{L`<)=W!IaDW|+niqRNM0ZmFT;Yu84+rk>Mqhv5<`Mpk5~TOttyeZ7tv zzOdZhy1F_~K1p5`VAtjcy5yn}{=o2Xp1iranP>99PF!5RN+A+mDviaD zjcC4glgS@Zca|`QGKaB{TTJV0ZRfwO-dTre!?0h8T)lS?H zhvzd%jFZ~OAl#!lO&*%kzjiD$C$RCt?Q{U2^LJ|h$%B4)wcY&be}AqD)NBHPzN@>N zu4)k?y!9Vmq~+Hm4b|A`4&G8`$SJWIh4#bq>tEbfVcZzmcw0d;ITQI)3)aoL zIs(7?w`h1cJ8i0+C>bnZlfS+F8X>zz+kFx0RL|M$C=^w|utwrymmIG<4fn!{p-9}7 z+S=M+KPH{-IU&}q#?7uw=gCbb%U7$_JF;R`(x=#=5T6h~jZmWNgX!-;P2C!o(0qyR zS>UmXvRUu#;UQF!k)&U~f8~ZDVU9&r<+<<%2M0TGsT|!LEMskc24~W5esQrAheo60 zuvo0L#gj)QU@&ioc@%ZHSKZI|WU!)sf3&i8+lC+FG8I&u!l=E_nlhzc<;-3aO7=~l!1J2796Xccf}u(ySGu}Ab+ zac0Q1>5Xv(t1*G<3$Qz0u13E^8Q;6)g}a=+^z5bQ#rxnrLiPyxe-P4dG`}q3Zk$W6 S<(dACfuIjUPtyWoKKmOb{HII+