Skip to content

Commit 72538f1

Browse files
d3xvnd3xvn
authored
Merge pull request #100 from GetStream/fix/update-sample
fix: Updates stream chat for the project and brings it up to date
2 parents 016d7ae + d77ff6a commit 72538f1

File tree

12 files changed

+64
-35
lines changed

12 files changed

+64
-35
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 33
29+
compileSdkVersion 34
3030
ndkVersion '21.4.7075529'
3131

3232
sourceSets {
@@ -41,7 +41,7 @@ android {
4141
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4242
applicationId "com.example.example"
4343
minSdkVersion 22
44-
targetSdkVersion 33
44+
targetSdkVersion 34
4545
versionCode flutterVersionCode.toInteger()
4646
versionName flutterVersionName
4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎packages/stream_chat_v1/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.7.10'
2+
ext.kotlin_version = '1.9.22'
33
repositories {
44
google()
55
jcenter()

‎packages/stream_chat_v1/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>

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

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@
163163
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
164164
0BC14C55242B5A7A0028DE94 /* Embed App Extensions */,
165165
5468FC796DAC9C565B3989B4 /* [CP] Embed Pods Frameworks */,
166+
98FF9499337F40CD1C913E4B /* [CP] Copy Pods Resources */,
166167
);
167168
buildRules = (
168169
);
@@ -180,7 +181,7 @@
180181
isa = PBXProject;
181182
attributes = {
182183
LastSwiftUpdateCheck = 1140;
183-
LastUpgradeCheck = 1300;
184+
LastUpgradeCheck = 1510;
184185
ORGANIZATIONNAME = "The Chromium Authors";
185186
TargetAttributes = {
186187
97C146ED1CF9000F007C117D = {
@@ -248,18 +249,17 @@
248249
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
249250
"${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework",
250251
"${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework",
251-
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
252252
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
253253
"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
254254
"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
255255
"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
256256
"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
257257
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
258258
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
259-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
260259
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
261260
"${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework",
262261
"${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework",
262+
"${BUILT_PRODUCTS_DIR}/audio_session/audio_session.framework",
263263
"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
264264
"${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
265265
"${BUILT_PRODUCTS_DIR}/file_selector_ios/file_selector_ios.framework",
@@ -268,11 +268,14 @@
268268
"${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework",
269269
"${BUILT_PRODUCTS_DIR}/image_gallery_saver/image_gallery_saver.framework",
270270
"${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
271+
"${BUILT_PRODUCTS_DIR}/just_audio/just_audio.framework",
271272
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
273+
"${BUILT_PRODUCTS_DIR}/media_kit_video/media_kit_video.framework",
272274
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
273275
"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
274276
"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
275277
"${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
278+
"${BUILT_PRODUCTS_DIR}/screen_brightness_ios/screen_brightness_ios.framework",
276279
"${BUILT_PRODUCTS_DIR}/sentry_flutter/sentry_flutter.framework",
277280
"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
278281
"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
@@ -282,24 +285,24 @@
282285
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
283286
"${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
284287
"${BUILT_PRODUCTS_DIR}/video_thumbnail/video_thumbnail.framework",
285-
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
288+
"${BUILT_PRODUCTS_DIR}/volume_controller/volume_controller.framework",
289+
"${BUILT_PRODUCTS_DIR}/wakelock_plus/wakelock_plus.framework",
286290
);
287291
name = "[CP] Embed Pods Frameworks";
288292
outputPaths = (
289293
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework",
290294
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework",
291-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
292295
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
293296
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
294297
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
295298
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
296299
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
297300
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
298301
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
299-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
300302
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
301303
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
302304
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework",
305+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audio_session.framework",
303306
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
304307
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
305308
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_selector_ios.framework",
@@ -308,11 +311,14 @@
308311
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework",
309312
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver.framework",
310313
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
314+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/just_audio.framework",
311315
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
316+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/media_kit_video.framework",
312317
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
313318
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
314319
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
315320
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
321+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/screen_brightness_ios.framework",
316322
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sentry_flutter.framework",
317323
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",
318324
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
@@ -322,7 +328,8 @@
322328
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
323329
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
324330
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_thumbnail.framework",
325-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
331+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/volume_controller.framework",
332+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock_plus.framework",
326333
);
327334
runOnlyForDeploymentPostprocessing = 0;
328335
shellPath = /bin/sh;
@@ -344,6 +351,24 @@
344351
shellPath = /bin/sh;
345352
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
346353
};
354+
98FF9499337F40CD1C913E4B /* [CP] Copy Pods Resources */ = {
355+
isa = PBXShellScriptBuildPhase;
356+
buildActionMask = 2147483647;
357+
files = (
358+
);
359+
inputPaths = (
360+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
361+
"${PODS_CONFIGURATION_BUILD_DIR}/firebase_messaging/firebase_messaging_Privacy.bundle",
362+
);
363+
name = "[CP] Copy Pods Resources";
364+
outputPaths = (
365+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/firebase_messaging_Privacy.bundle",
366+
);
367+
runOnlyForDeploymentPostprocessing = 0;
368+
shellPath = /bin/sh;
369+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
370+
showEnvVarsInLog = 0;
371+
};
347372
A83A30E8FF0298FDB3189FB1 /* [CP] Check Pods Manifest.lock */ = {
348373
isa = PBXShellScriptBuildPhase;
349374
buildActionMask = 2147483647;
@@ -441,7 +466,7 @@
441466
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
442467
GCC_WARN_UNUSED_FUNCTION = YES;
443468
GCC_WARN_UNUSED_VARIABLE = YES;
444-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
469+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
445470
MTL_ENABLE_DEBUG_INFO = NO;
446471
SDKROOT = iphoneos;
447472
SUPPORTED_PLATFORMS = iphoneos;
@@ -468,7 +493,7 @@
468493
"$(PROJECT_DIR)/Flutter",
469494
);
470495
INFOPLIST_FILE = Runner/Info.plist;
471-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
496+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
472497
LD_RUNPATH_SEARCH_PATHS = (
473498
"$(inherited)",
474499
"@executable_path/Frameworks",
@@ -533,7 +558,7 @@
533558
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
534559
GCC_WARN_UNUSED_FUNCTION = YES;
535560
GCC_WARN_UNUSED_VARIABLE = YES;
536-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
561+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
537562
MTL_ENABLE_DEBUG_INFO = YES;
538563
ONLY_ACTIVE_ARCH = YES;
539564
SDKROOT = iphoneos;
@@ -582,7 +607,7 @@
582607
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
583608
GCC_WARN_UNUSED_FUNCTION = YES;
584609
GCC_WARN_UNUSED_VARIABLE = YES;
585-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
610+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
586611
MTL_ENABLE_DEBUG_INFO = NO;
587612
SDKROOT = iphoneos;
588613
SUPPORTED_PLATFORMS = iphoneos;
@@ -610,7 +635,7 @@
610635
"$(PROJECT_DIR)/Flutter",
611636
);
612637
INFOPLIST_FILE = Runner/Info.plist;
613-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
638+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
614639
LD_RUNPATH_SEARCH_PATHS = (
615640
"$(inherited)",
616641
"@executable_path/Frameworks",
@@ -647,7 +672,7 @@
647672
"$(PROJECT_DIR)/Flutter",
648673
);
649674
INFOPLIST_FILE = Runner/Info.plist;
650-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
675+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
651676
LD_RUNPATH_SEARCH_PATHS = (
652677
"$(inherited)",
653678
"@executable_path/Frameworks",

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

‎packages/stream_chat_v1/lib/pages/channel_file_display_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class _ChannelFileDisplayScreenState extends State<ChannelFileDisplayScreen> {
123123
padding: const EdgeInsets.all(8.0),
124124
child: StreamFileAttachment(
125125
message: media.values.toList()[position],
126-
attachment: media.keys.toList()[position],
126+
file: media.keys.toList()[position],
127127
),
128128
),
129129
);

‎packages/stream_chat_v1/lib/pages/channel_media_display_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ class _ChannelMediaDisplayScreenState extends State<ChannelMediaDisplayScreen> {
176176
child: media[position].attachment.type == 'image'
177177
? IgnorePointer(
178178
child: StreamImageAttachment(
179-
attachment: media[position].attachment,
179+
image: media[position].attachment,
180180
message: media[position].message,
181-
showTitle: false,
182-
messageTheme: widget.messageTheme,
181+
// showTitle: false,
182+
// messageTheme: widget.messageTheme,
183183
),
184184
)
185185
: VideoPlayer(media[position].videoPlayer!),

‎packages/stream_chat_v1/lib/pages/channel_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class _ChannelPageState extends State<ChannelPage> {
8585
initialScrollIndex: widget.initialScrollIndex,
8686
initialAlignment: widget.initialAlignment,
8787
highlightInitialMessage: widget.highlightInitialMessage,
88-
onMessageSwiped: _reply,
88+
//onMessageSwiped: _reply,
8989
messageFilter: defaultFilter,
9090
messageBuilder: (context, details, messages, defaultMessage) {
9191
final router = GoRouter.of(context);

‎packages/stream_chat_v1/lib/pages/group_info_screen.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,10 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
10821082
if (user.online) {
10831083
return AppLocalizations.of(context).online;
10841084
} else {
1085+
if(user.lastActive == null) {
1086+
return "";
1087+
}
1088+
10851089
return '${AppLocalizations.of(context).lastSeen} ${Jiffy.parseFromDateTime(user.lastActive!).fromNow()}';
10861090
}
10871091
}

‎packages/stream_chat_v1/lib/pages/thread_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class _ThreadPageState extends State<ThreadPage> {
5656
parentMessage: widget.parent,
5757
initialScrollIndex: widget.initialScrollIndex,
5858
initialAlignment: widget.initialAlignment,
59-
onMessageSwiped: _reply,
59+
//onMessageSwiped: _reply,
6060
messageFilter: defaultFilter,
6161
showScrollToBottom: false,
6262
highlightInitialMessage: true,

‎packages/stream_chat_v1/pubspec.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ dependencies:
1111
flutter_app_badger: ^1.5.0
1212
flutter:
1313
sdk: flutter
14-
stream_chat_flutter: ^6.9.0
15-
stream_chat_persistence: ^6.8.0
16-
stream_chat_localizations: ^5.9.0
14+
stream_chat_flutter: ^8.0.0
15+
stream_chat_persistence: ^8.0.0
16+
stream_chat_localizations: ^8.0.0
1717
flutter_local_notifications: ^15.1.0+1
1818
flutter_svg: ^2.0.7
1919
flutter_secure_storage: ^8.0.0
2020
yaml: ^3.1.2
21-
uuid: ^3.0.7
21+
uuid: ^4.4.2
2222
streaming_shared_preferences: ^2.0.0
23-
lottie: ^2.6.0
23+
lottie: ^3.1.2
2424
collection: ^1.17.1
2525
sentry_flutter: ^7.9.0
26-
flutter_slidable: ^3.0.0
26+
flutter_slidable: ^3.1.1
2727
go_router: ^10.1.0
2828
provider: ^6.0.5
2929
video_player: ^2.7.0

‎packages/stream_chat_v1/pubspec_overrides.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ dependency_overrides:
22
stream_chat:
33
git:
44
url: https://github.com/GetStream/stream-chat-flutter.git
5-
ref: develop
5+
ref: master
66
path: packages/stream_chat
77
stream_chat_flutter_core:
88
git:
99
url: https://github.com/GetStream/stream-chat-flutter.git
10-
ref: develop
10+
ref: master
1111
path: packages/stream_chat_flutter_core
1212
stream_chat_flutter:
1313
git:
1414
url: https://github.com/GetStream/stream-chat-flutter.git
15-
ref: develop
15+
ref: master
1616
path: packages/stream_chat_flutter
1717
stream_chat_persistence:
1818
git:
1919
url: https://github.com/GetStream/stream-chat-flutter.git
20-
ref: develop
20+
ref: master
2121
path: packages/stream_chat_persistence
2222
stream_chat_localizations:
2323
git:
2424
url: https://github.com/GetStream/stream-chat-flutter.git
25-
ref: develop
25+
ref: master
2626
path: packages/stream_chat_localizations

0 commit comments

Comments
 (0)