Skip to content

Commit 1080d8c

Browse files
andreacioniandreacioni
committed
fix basebottonsheet close icon
1 parent d145b60 commit 1080d8c

File tree

14 files changed

+560
-420
lines changed

14 files changed

+560
-420
lines changed

‎apps/weekly_menu_app/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎apps/weekly_menu_app/ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '11.0'
2+
platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎apps/weekly_menu_app/ios/Podfile.lock‎

Lines changed: 83 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,130 @@
11
PODS:
2-
- Firebase/Analytics (10.12.0):
2+
- Firebase/Analytics (10.22.0):
33
- Firebase/Core
4-
- Firebase/Core (10.12.0):
4+
- Firebase/Core (10.22.0):
55
- Firebase/CoreOnly
6-
- FirebaseAnalytics (~> 10.12.0)
7-
- Firebase/CoreOnly (10.12.0):
8-
- FirebaseCore (= 10.12.0)
9-
- Firebase/RemoteConfig (10.12.0):
6+
- FirebaseAnalytics (~> 10.22.0)
7+
- Firebase/CoreOnly (10.22.0):
8+
- FirebaseCore (= 10.22.0)
9+
- Firebase/RemoteConfig (10.22.0):
1010
- Firebase/CoreOnly
11-
- FirebaseRemoteConfig (~> 10.12.0)
12-
- firebase_analytics (10.4.4):
13-
- Firebase/Analytics (= 10.12.0)
11+
- FirebaseRemoteConfig (~> 10.22.0)
12+
- firebase_analytics (10.10.1):
13+
- Firebase/Analytics (= 10.22.0)
1414
- firebase_core
1515
- Flutter
16-
- firebase_core (2.15.0):
17-
- Firebase/CoreOnly (= 10.12.0)
16+
- firebase_core (2.29.0):
17+
- Firebase/CoreOnly (= 10.22.0)
1818
- Flutter
19-
- firebase_remote_config (4.2.4):
20-
- Firebase/RemoteConfig (= 10.12.0)
19+
- firebase_remote_config (4.4.1):
20+
- Firebase/RemoteConfig (= 10.22.0)
2121
- firebase_core
2222
- Flutter
23-
- FirebaseABTesting (10.14.0):
23+
- FirebaseABTesting (10.24.0):
2424
- FirebaseCore (~> 10.0)
25-
- FirebaseAnalytics (10.12.0):
26-
- FirebaseAnalytics/AdIdSupport (= 10.12.0)
25+
- FirebaseAnalytics (10.22.0):
26+
- FirebaseAnalytics/AdIdSupport (= 10.22.0)
2727
- FirebaseCore (~> 10.0)
2828
- FirebaseInstallations (~> 10.0)
2929
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
3030
- GoogleUtilities/MethodSwizzler (~> 7.11)
3131
- GoogleUtilities/Network (~> 7.11)
3232
- "GoogleUtilities/NSData+zlib (~> 7.11)"
33-
- nanopb (< 2.30910.0, >= 2.30908.0)
34-
- FirebaseAnalytics/AdIdSupport (10.12.0):
33+
- nanopb (< 2.30911.0, >= 2.30908.0)
34+
- FirebaseAnalytics/AdIdSupport (10.22.0):
3535
- FirebaseCore (~> 10.0)
3636
- FirebaseInstallations (~> 10.0)
37-
- GoogleAppMeasurement (= 10.12.0)
37+
- GoogleAppMeasurement (= 10.22.0)
3838
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
3939
- GoogleUtilities/MethodSwizzler (~> 7.11)
4040
- GoogleUtilities/Network (~> 7.11)
4141
- "GoogleUtilities/NSData+zlib (~> 7.11)"
42-
- nanopb (< 2.30910.0, >= 2.30908.0)
43-
- FirebaseCore (10.12.0):
42+
- nanopb (< 2.30911.0, >= 2.30908.0)
43+
- FirebaseCore (10.22.0):
4444
- FirebaseCoreInternal (~> 10.0)
45-
- GoogleUtilities/Environment (~> 7.8)
46-
- GoogleUtilities/Logger (~> 7.8)
47-
- FirebaseCoreInternal (10.14.0):
45+
- GoogleUtilities/Environment (~> 7.12)
46+
- GoogleUtilities/Logger (~> 7.12)
47+
- FirebaseCoreInternal (10.24.0):
4848
- "GoogleUtilities/NSData+zlib (~> 7.8)"
49-
- FirebaseInstallations (10.14.0):
49+
- FirebaseInstallations (10.24.0):
5050
- FirebaseCore (~> 10.0)
5151
- GoogleUtilities/Environment (~> 7.8)
5252
- GoogleUtilities/UserDefaults (~> 7.8)
5353
- PromisesObjC (~> 2.1)
54-
- FirebaseRemoteConfig (10.12.0):
54+
- FirebaseRemoteConfig (10.22.0):
5555
- FirebaseABTesting (~> 10.0)
5656
- FirebaseCore (~> 10.0)
5757
- FirebaseInstallations (~> 10.0)
58+
- FirebaseSharedSwift (~> 10.0)
5859
- GoogleUtilities/Environment (~> 7.8)
5960
- "GoogleUtilities/NSData+zlib (~> 7.8)"
61+
- FirebaseSharedSwift (10.24.0)
6062
- Flutter (1.0.0)
6163
- flutter_keyboard_visibility (0.0.1):
6264
- Flutter
63-
- FMDB (2.7.5):
64-
- FMDB/standard (= 2.7.5)
65-
- FMDB/standard (2.7.5)
66-
- GoogleAppMeasurement (10.12.0):
67-
- GoogleAppMeasurement/AdIdSupport (= 10.12.0)
65+
- GoogleAppMeasurement (10.22.0):
66+
- GoogleAppMeasurement/AdIdSupport (= 10.22.0)
6867
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
6968
- GoogleUtilities/MethodSwizzler (~> 7.11)
7069
- GoogleUtilities/Network (~> 7.11)
7170
- "GoogleUtilities/NSData+zlib (~> 7.11)"
72-
- nanopb (< 2.30910.0, >= 2.30908.0)
73-
- GoogleAppMeasurement/AdIdSupport (10.12.0):
74-
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.12.0)
71+
- nanopb (< 2.30911.0, >= 2.30908.0)
72+
- GoogleAppMeasurement/AdIdSupport (10.22.0):
73+
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.22.0)
7574
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
7675
- GoogleUtilities/MethodSwizzler (~> 7.11)
7776
- GoogleUtilities/Network (~> 7.11)
7877
- "GoogleUtilities/NSData+zlib (~> 7.11)"
79-
- nanopb (< 2.30910.0, >= 2.30908.0)
80-
- GoogleAppMeasurement/WithoutAdIdSupport (10.12.0):
78+
- nanopb (< 2.30911.0, >= 2.30908.0)
79+
- GoogleAppMeasurement/WithoutAdIdSupport (10.22.0):
8180
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
8281
- GoogleUtilities/MethodSwizzler (~> 7.11)
8382
- GoogleUtilities/Network (~> 7.11)
8483
- "GoogleUtilities/NSData+zlib (~> 7.11)"
85-
- nanopb (< 2.30910.0, >= 2.30908.0)
86-
- GoogleUtilities/AppDelegateSwizzler (7.11.5):
84+
- nanopb (< 2.30911.0, >= 2.30908.0)
85+
- GoogleUtilities/AppDelegateSwizzler (7.13.0):
8786
- GoogleUtilities/Environment
8887
- GoogleUtilities/Logger
8988
- GoogleUtilities/Network
90-
- GoogleUtilities/Environment (7.11.5):
89+
- GoogleUtilities/Privacy
90+
- GoogleUtilities/Environment (7.13.0):
91+
- GoogleUtilities/Privacy
9192
- PromisesObjC (< 3.0, >= 1.2)
92-
- GoogleUtilities/Logger (7.11.5):
93+
- GoogleUtilities/Logger (7.13.0):
9394
- GoogleUtilities/Environment
94-
- GoogleUtilities/MethodSwizzler (7.11.5):
95+
- GoogleUtilities/Privacy
96+
- GoogleUtilities/MethodSwizzler (7.13.0):
9597
- GoogleUtilities/Logger
96-
- GoogleUtilities/Network (7.11.5):
98+
- GoogleUtilities/Privacy
99+
- GoogleUtilities/Network (7.13.0):
97100
- GoogleUtilities/Logger
98101
- "GoogleUtilities/NSData+zlib"
102+
- GoogleUtilities/Privacy
99103
- GoogleUtilities/Reachability
100-
- "GoogleUtilities/NSData+zlib (7.11.5)"
101-
- GoogleUtilities/Reachability (7.11.5):
104+
- "GoogleUtilities/NSData+zlib (7.13.0)":
105+
- GoogleUtilities/Privacy
106+
- GoogleUtilities/Privacy (7.13.0)
107+
- GoogleUtilities/Reachability (7.13.0):
102108
- GoogleUtilities/Logger
103-
- GoogleUtilities/UserDefaults (7.11.5):
109+
- GoogleUtilities/Privacy
110+
- GoogleUtilities/UserDefaults (7.13.0):
104111
- GoogleUtilities/Logger
105-
- nanopb (2.30909.0):
106-
- nanopb/decode (= 2.30909.0)
107-
- nanopb/encode (= 2.30909.0)
108-
- nanopb/decode (2.30909.0)
109-
- nanopb/encode (2.30909.0)
112+
- GoogleUtilities/Privacy
113+
- nanopb (2.30910.0):
114+
- nanopb/decode (= 2.30910.0)
115+
- nanopb/encode (= 2.30910.0)
116+
- nanopb/decode (2.30910.0)
117+
- nanopb/encode (2.30910.0)
110118
- path_provider_foundation (0.0.1):
111119
- Flutter
112120
- FlutterMacOS
113-
- PromisesObjC (2.3.1)
121+
- PromisesObjC (2.4.0)
114122
- shared_preferences_foundation (0.0.1):
115123
- Flutter
116124
- FlutterMacOS
117125
- sqflite (0.0.3):
118126
- Flutter
119-
- FMDB (>= 2.7.5)
127+
- FlutterMacOS
120128
- url_launcher_ios (0.0.1):
121129
- Flutter
122130

@@ -128,7 +136,7 @@ DEPENDENCIES:
128136
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
129137
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
130138
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
131-
- sqflite (from `.symlinks/plugins/sqflite/ios`)
139+
- sqflite (from `.symlinks/plugins/sqflite/darwin`)
132140
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
133141

134142
SPEC REPOS:
@@ -140,7 +148,7 @@ SPEC REPOS:
140148
- FirebaseCoreInternal
141149
- FirebaseInstallations
142150
- FirebaseRemoteConfig
143-
- FMDB
151+
- FirebaseSharedSwift
144152
- GoogleAppMeasurement
145153
- GoogleUtilities
146154
- nanopb
@@ -162,33 +170,33 @@ EXTERNAL SOURCES:
162170
shared_preferences_foundation:
163171
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
164172
sqflite:
165-
:path: ".symlinks/plugins/sqflite/ios"
173+
:path: ".symlinks/plugins/sqflite/darwin"
166174
url_launcher_ios:
167175
:path: ".symlinks/plugins/url_launcher_ios/ios"
168176

169177
SPEC CHECKSUMS:
170-
Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
171-
firebase_analytics: 3ff822ee2e90f95b61f0da300df20b378d380fbb
172-
firebase_core: e477125798fc37cd4ab43ca6a8536bf7e0929c00
173-
firebase_remote_config: 2202a8929d451170be6505f90b2953f42ae238ec
174-
FirebaseABTesting: e1535073fac4ff55c7537a6e041155c72d9e6906
175-
FirebaseAnalytics: 0270389efbe3022b54ec4588862dabec3477ee98
176-
FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
177-
FirebaseCoreInternal: d558159ee6cc4b823c2296ecc193de9f6d9a5bb3
178-
FirebaseInstallations: f672b1eda64e6381c21d424a2f680a943fd83f3b
179-
FirebaseRemoteConfig: bc7f260e6596956fafbb532443c19bd3c30f5258
180-
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
178+
Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71
179+
firebase_analytics: 8e6cecb9b9541db49ac40a46eec7c0f519de7252
180+
firebase_core: aaadbddb3cb2ee3792b9804f9dbb63e5f6f7b55c
181+
firebase_remote_config: 13cdfde7862e4cee3b9e97cf3f9e2f1ea2b98c8e
182+
FirebaseABTesting: 4431c2c56ac6e56f463b9cab05cc111078639f99
183+
FirebaseAnalytics: 8d0ff929c63b7f72260f332b86ccf569776b75d3
184+
FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7
185+
FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af
186+
FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e
187+
FirebaseRemoteConfig: e1b992a94d3674dddbcaf5d0d31a0312156ceb1c
188+
FirebaseSharedSwift: 76e1529c32101d80e4f1ca2fba7c39d59f0a390a
189+
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
181190
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
182-
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
183-
GoogleAppMeasurement: 2d800fab85e7848b1e66a6f8ce5bca06c5aad892
184-
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
185-
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
186-
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
187-
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
191+
GoogleAppMeasurement: ccefe3eac9b0aa27f96066809fb1a7fe4b462626
192+
GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
193+
nanopb: 438bc412db1928dac798aa6fd75726007be04262
194+
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
195+
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
188196
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
189-
sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
190-
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
197+
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
198+
url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
191199

192-
PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
200+
PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
193201

194202
COCOAPODS: 1.14.2

‎apps/weekly_menu_app/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
97C146E61CF9000F007C117D /* Project object */ = {
168168
isa = PBXProject;
169169
attributes = {
170-
LastUpgradeCheck = 1430;
170+
LastUpgradeCheck = 1510;
171171
ORGANIZATIONNAME = "The Chromium Authors";
172172
TargetAttributes = {
173173
97C146ED1CF9000F007C117D = {
@@ -272,12 +272,12 @@
272272
);
273273
inputPaths = (
274274
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
275-
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
276275
"${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework",
277276
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
278277
"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
279278
"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
280279
"${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework",
280+
"${BUILT_PRODUCTS_DIR}/FirebaseSharedSwift/FirebaseSharedSwift.framework",
281281
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
282282
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
283283
"${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
@@ -289,12 +289,12 @@
289289
);
290290
name = "[CP] Embed Pods Frameworks";
291291
outputPaths = (
292-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
293292
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework",
294293
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
295294
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
296295
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
297296
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework",
297+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSharedSwift.framework",
298298
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
299299
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
300300
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
@@ -384,7 +384,7 @@
384384
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
385385
GCC_WARN_UNUSED_FUNCTION = YES;
386386
GCC_WARN_UNUSED_VARIABLE = YES;
387-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
387+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
388388
MTL_ENABLE_DEBUG_INFO = NO;
389389
OTHER_LDFLAGS = "-ObjC";
390390
SDKROOT = iphoneos;
@@ -470,7 +470,7 @@
470470
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
471471
GCC_WARN_UNUSED_FUNCTION = YES;
472472
GCC_WARN_UNUSED_VARIABLE = YES;
473-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
473+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
474474
MTL_ENABLE_DEBUG_INFO = YES;
475475
ONLY_ACTIVE_ARCH = YES;
476476
OTHER_LDFLAGS = "-ObjC";
@@ -520,7 +520,7 @@
520520
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
521521
GCC_WARN_UNUSED_FUNCTION = YES;
522522
GCC_WARN_UNUSED_VARIABLE = YES;
523-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
523+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
524524
MTL_ENABLE_DEBUG_INFO = NO;
525525
OTHER_LDFLAGS = "-ObjC";
526526
SDKROOT = iphoneos;

‎apps/weekly_menu_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎apps/weekly_menu_app/lib/widgets/screens/explore_recipes_screen/screen.dart‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'dart:developer';
2+
13
import 'package:cached_network_image/cached_network_image.dart';
24
import 'package:data/repositories.dart';
35
import 'package:flutter/material.dart';
@@ -52,8 +54,14 @@ class _ExploreRecipeTab extends HookConsumerWidget {
5254
final linkTextTheme = Theme.of(context).textTheme.labelLarge!;
5355
final labelTextTheme = Theme.of(context).textTheme.labelMedium!;
5456

55-
final recipeUri =
56-
recipe.recipeUrl != null ? Uri.parse(recipe.recipeUrl!) : null;
57+
Uri? recipeUri;
58+
try {
59+
recipeUri =
60+
recipe.recipeUrl != null ? Uri.parse(recipe.recipeUrl!) : null;
61+
} catch (e, st) {
62+
log("invalid url for recipe ${recipe.idx}", stackTrace: st, error: e);
63+
}
64+
5765
await showCustomModalBottomSheet(
5866
context: context,
5967
builder: (context) {

‎apps/weekly_menu_app/lib/widgets/shared/bottom_sheet.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ class BaseBottomSheet extends StatelessWidget {
5858
title: Text(appBarTitle!),
5959
elevation: 0,
6060
automaticallyImplyLeading: false,
61-
leading: Icon(Icons.close),
61+
leading: IconButton(
62+
icon: Icon(Icons.close),
63+
onPressed: () => Navigator.of(context).pop(),
64+
splashRadius: 15,
65+
),
6266
)
6367
: null,
6468
body: body,

0 commit comments

Comments
 (0)