Skip to content

Commit 87665aa

Browse files
imtooriimtoori
committed
Merge branch 'develop'
2 parents 0e88e92 + c76887c commit 87665aa

25 files changed

+1104
-1148
lines changed

‎packages/chatty/lib/ui/common/my_channel_preview.dart‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import 'package:collection/collection.dart' show IterableExtension;
22
import 'package:flutter/material.dart';
3-
import 'package:flutter/widgets.dart';
4-
import 'package:jiffy/jiffy.dart';
53
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
6-
import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
74

85
/*Navigator.push(
96
context,

‎packages/imessage/lib/message_page.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/cupertino.dart';
2-
import 'package:flutter/material.dart';
32
import 'package:imessage/message_list_view.dart';
43
import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'
54
show

‎packages/stream_chat_v1/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
defaultConfig {
4141
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4242
applicationId "com.example.example"
43-
minSdkVersion 21
43+
minSdkVersion 22
4444
targetSdkVersion 30
4545
versionCode flutterVersionCode.toInteger()
4646
versionName flutterVersionName

‎packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -177,7 +177,7 @@
177177
isa = PBXProject;
178178
attributes = {
179179
LastSwiftUpdateCheck = 1140;
180-
LastUpgradeCheck = 1020;
180+
LastUpgradeCheck = 1300;
181181
ORGANIZATIONNAME = "The Chromium Authors";
182182
TargetAttributes = {
183183
97C146ED1CF9000F007C117D = {
@@ -245,27 +245,29 @@
245245
"${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework",
246246
"${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework",
247247
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
248-
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
248+
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
249249
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
250+
"${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework",
250251
"${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework",
251252
"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
252253
"${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
253254
"${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework",
254255
"${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",
255256
"${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework",
256257
"${BUILT_PRODUCTS_DIR}/image_gallery_saver/image_gallery_saver.framework",
257-
"${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
258+
"${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
258259
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
259-
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
260+
"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
261+
"${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework",
260262
"${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
263+
"${BUILT_PRODUCTS_DIR}/sentry_flutter/sentry_flutter.framework",
261264
"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
262-
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
265+
"${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework",
263266
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
264267
"${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework",
265268
"${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework",
266-
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
267-
"${BUILT_PRODUCTS_DIR}/video_compress/video_compress.framework",
268-
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
269+
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
270+
"${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
269271
"${BUILT_PRODUCTS_DIR}/video_thumbnail/video_thumbnail.framework",
270272
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
271273
);
@@ -276,25 +278,27 @@
276278
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
277279
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
278280
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
281+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
279282
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework",
280283
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
281284
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
282285
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework",
283286
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",
284287
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework",
285288
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver.framework",
286-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
289+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
287290
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
288-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
291+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
292+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework",
289293
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
294+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sentry_flutter.framework",
290295
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",
291-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
296+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework",
292297
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
293298
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework",
294299
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework",
295-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
296-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_compress.framework",
297-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
300+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
301+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
298302
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_thumbnail.framework",
299303
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
300304
);
@@ -442,7 +446,10 @@
442446
);
443447
INFOPLIST_FILE = Runner/Info.plist;
444448
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
445-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
449+
LD_RUNPATH_SEARCH_PATHS = (
450+
"$(inherited)",
451+
"@executable_path/Frameworks",
452+
);
446453
LIBRARY_SEARCH_PATHS = (
447454
"$(inherited)",
448455
"$(PROJECT_DIR)/Flutter",
@@ -581,7 +588,10 @@
581588
);
582589
INFOPLIST_FILE = Runner/Info.plist;
583590
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
584-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
591+
LD_RUNPATH_SEARCH_PATHS = (
592+
"$(inherited)",
593+
"@executable_path/Frameworks",
594+
);
585595
LIBRARY_SEARCH_PATHS = (
586596
"$(inherited)",
587597
"$(PROJECT_DIR)/Flutter",
@@ -615,7 +625,10 @@
615625
);
616626
INFOPLIST_FILE = Runner/Info.plist;
617627
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
618-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
628+
LD_RUNPATH_SEARCH_PATHS = (
629+
"$(inherited)",
630+
"@executable_path/Frameworks",
631+
);
619632
LIBRARY_SEARCH_PATHS = (
620633
"$(inherited)",
621634
"$(PROJECT_DIR)/Flutter",

‎packages/stream_chat_v1/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 = "1020"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎packages/stream_chat_v1/lib/advanced_options_page.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:example/localizations.dart';
33
import 'package:example/routes/routes.dart';
44
import 'package:example/stream_version.dart';
55
import 'package:flutter/material.dart';
6-
import 'package:flutter/services.dart';
76
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
87
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
98

@@ -294,10 +293,7 @@ class _AdvancedOptionsPageState extends State<AdvancedOptionsPage> {
294293
),
295294
);
296295

297-
final client = StreamChatClient(
298-
apiKey,
299-
logLevel: Level.INFO,
300-
)..chatPersistenceClient = chatPersistentClient;
296+
final client = buildStreamChatClient(apiKey);
301297

302298
try {
303299
await client.connectUser(

0 commit comments

Comments
 (0)