Skip to content

Commit 9052b19

Browse files
xsahil03xxsahil03x
authored
Merge pull request #103 from GetStream/fix/update-sample-app
feat: update sample app
2 parents 72538f1 + 40371da commit 9052b19

File tree

10 files changed

+174
-79
lines changed

10 files changed

+174
-79
lines changed

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

+27-17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
1315

1416
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1517
if (flutterVersionCode == null) {
@@ -21,17 +23,15 @@ if (flutterVersionName == null) {
2123
flutterVersionName = '1.0'
2224
}
2325

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
2826
android {
27+
namespace "com.example.example"
28+
2929
compileSdkVersion 34
30-
ndkVersion '21.4.7075529'
3130

3231
sourceSets {
3332
main.java.srcDirs += 'src/main/kotlin'
3433
}
34+
3535
lintOptions {
3636
disable 'InvalidPackage'
3737
checkReleaseBuilds false
@@ -44,7 +44,23 @@ android {
4444
targetSdkVersion 34
4545
versionCode flutterVersionCode.toInteger()
4646
versionName flutterVersionName
47-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
47+
multiDexEnabled true
48+
}
49+
50+
compileOptions {
51+
// Flag to enable support for the new language APIs
52+
coreLibraryDesugaringEnabled true
53+
}
54+
55+
// Added this block:
56+
afterEvaluate { project ->
57+
if (project.hasProperty("kotlin")) {
58+
project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
59+
kotlinOptions {
60+
jvmTarget = "1.8"
61+
}
62+
}
63+
}
4864
}
4965

5066
signingConfigs {
@@ -70,11 +86,5 @@ flutter {
7086
}
7187

7288
dependencies {
73-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
74-
testImplementation 'junit:junit:4.12'
75-
androidTestImplementation 'androidx.test:runner:1.1.1'
76-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
77-
implementation 'com.google.firebase:firebase-messaging:20.1.2'
89+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
7890
}
79-
80-
apply plugin: 'com.google.gms.google-services'

‎packages/stream_chat_v1/android/build.gradle

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
buildscript {
2-
ext.kotlin_version = '1.9.22'
3-
repositories {
4-
google()
5-
jcenter()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.2.1'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
classpath 'com.google.gms:google-services:4.3.2'
12-
}
13-
}
14-
151
allprojects {
162
repositories {
173
google()
18-
jcenter()
4+
mavenCentral()
195
}
206
}
217

228
rootProject.buildDir = '../build'
239
subprojects {
2410
project.buildDir = "${rootProject.buildDir}/${project.name}"
11+
12+
afterEvaluate {
13+
// check if `android` block is available and namespace isn't set
14+
if(it.hasProperty('android') && it.android.namespace == null){
15+
def manifest = new XmlSlurper().parse(file(it.android.sourceSets.main.manifest.srcFile))
16+
def packageName = manifest.@package.text()
17+
android.namespace= packageName
18+
}
19+
}
20+
2521
}
2622
subprojects {
2723
project.evaluationDependsOn(':app')

‎packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip

‎packages/stream_chat_v1/android/settings.gradle

+20-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
411

5-
def plugins = new Properties()
6-
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
7-
if (pluginsFile.exists()) {
8-
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
917
}
1018

11-
plugins.each { name, path ->
12-
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
13-
include ":$name"
14-
project(":$name").projectDir = pluginDirectory
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version '8.3.2' apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.24" apply false
1523
}
24+
25+
include ":app"

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

+18-18
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
164164
0BC14C55242B5A7A0028DE94 /* Embed App Extensions */,
165165
5468FC796DAC9C565B3989B4 /* [CP] Embed Pods Frameworks */,
166-
98FF9499337F40CD1C913E4B /* [CP] Copy Pods Resources */,
166+
8519A78E4BDC9820D507B557 /* [CP] Copy Pods Resources */,
167167
);
168168
buildRules = (
169169
);
@@ -266,7 +266,8 @@
266266
"${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework",
267267
"${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",
268268
"${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework",
269-
"${BUILT_PRODUCTS_DIR}/image_gallery_saver/image_gallery_saver.framework",
269+
"${BUILT_PRODUCTS_DIR}/get_thumbnail_video/get_thumbnail_video.framework",
270+
"${BUILT_PRODUCTS_DIR}/image_gallery_saver_plus/image_gallery_saver_plus.framework",
270271
"${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
271272
"${BUILT_PRODUCTS_DIR}/just_audio/just_audio.framework",
272273
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
@@ -279,12 +280,11 @@
279280
"${BUILT_PRODUCTS_DIR}/sentry_flutter/sentry_flutter.framework",
280281
"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
281282
"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
282-
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
283+
"${BUILT_PRODUCTS_DIR}/sqflite_darwin/sqflite_darwin.framework",
283284
"${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework",
284285
"${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework",
285286
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
286287
"${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
287-
"${BUILT_PRODUCTS_DIR}/video_thumbnail/video_thumbnail.framework",
288288
"${BUILT_PRODUCTS_DIR}/volume_controller/volume_controller.framework",
289289
"${BUILT_PRODUCTS_DIR}/wakelock_plus/wakelock_plus.framework",
290290
);
@@ -309,7 +309,8 @@
309309
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework",
310310
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",
311311
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework",
312-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver.framework",
312+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/get_thumbnail_video.framework",
313+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver_plus.framework",
313314
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
314315
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/just_audio.framework",
315316
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
@@ -322,12 +323,11 @@
322323
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sentry_flutter.framework",
323324
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",
324325
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
325-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
326+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite_darwin.framework",
326327
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework",
327328
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework",
328329
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
329330
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
330-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_thumbnail.framework",
331331
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/volume_controller.framework",
332332
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock_plus.framework",
333333
);
@@ -336,38 +336,38 @@
336336
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
337337
showEnvVarsInLog = 0;
338338
};
339-
9740EEB61CF901F6004384FC /* Run Script */ = {
339+
8519A78E4BDC9820D507B557 /* [CP] Copy Pods Resources */ = {
340340
isa = PBXShellScriptBuildPhase;
341-
alwaysOutOfDate = 1;
342341
buildActionMask = 2147483647;
343342
files = (
344343
);
345344
inputPaths = (
345+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
346+
"${PODS_CONFIGURATION_BUILD_DIR}/firebase_messaging/firebase_messaging_Privacy.bundle",
346347
);
347-
name = "Run Script";
348+
name = "[CP] Copy Pods Resources";
348349
outputPaths = (
350+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/firebase_messaging_Privacy.bundle",
349351
);
350352
runOnlyForDeploymentPostprocessing = 0;
351353
shellPath = /bin/sh;
352-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
354+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
355+
showEnvVarsInLog = 0;
353356
};
354-
98FF9499337F40CD1C913E4B /* [CP] Copy Pods Resources */ = {
357+
9740EEB61CF901F6004384FC /* Run Script */ = {
355358
isa = PBXShellScriptBuildPhase;
359+
alwaysOutOfDate = 1;
356360
buildActionMask = 2147483647;
357361
files = (
358362
);
359363
inputPaths = (
360-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
361-
"${PODS_CONFIGURATION_BUILD_DIR}/firebase_messaging/firebase_messaging_Privacy.bundle",
362364
);
363-
name = "[CP] Copy Pods Resources";
365+
name = "Run Script";
364366
outputPaths = (
365-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/firebase_messaging_Privacy.bundle",
366367
);
367368
runOnlyForDeploymentPostprocessing = 0;
368369
shellPath = /bin/sh;
369-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
370-
showEnvVarsInLog = 0;
370+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
371371
};
372372
A83A30E8FF0298FDB3189FB1 /* [CP] Check Pods Manifest.lock */ = {
373373
isa = PBXShellScriptBuildPhase;

‎packages/stream_chat_v1/ios/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
let sharedDefaults = UserDefaults(suiteName: "group.io.getstream.flutter")
77

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

+21-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'dart:async';
22

33
import 'package:example/app.dart';
4+
import 'package:example/pages/thread_list_page.dart';
45
import 'package:example/pages/user_mentions_page.dart';
56
import 'package:example/routes/routes.dart';
67
import 'package:example/state/init_data.dart';
@@ -41,27 +42,40 @@ class _ChannelListPageState extends State<ChannelListPage> {
4142
? StreamChatTheme.of(context).colorTheme.textHighEmphasis
4243
: Colors.grey,
4344
),
44-
const Positioned(
45-
top: -3,
46-
right: -16,
45+
PositionedDirectional(
46+
top: -4,
47+
start: 12,
4748
child: StreamUnreadIndicator(),
4849
),
4950
],
5051
),
5152
label: AppLocalizations.of(context).chats,
5253
),
54+
BottomNavigationBarItem(
55+
icon: StreamSvgIcon.mentions(
56+
color: _isSelected(1)
57+
? StreamChatTheme.of(context).colorTheme.textHighEmphasis
58+
: Colors.grey,
59+
),
60+
label: AppLocalizations.of(context).mentions,
61+
),
5362
BottomNavigationBarItem(
5463
icon: Stack(
5564
clipBehavior: Clip.none,
5665
children: [
57-
StreamSvgIcon.mentions(
58-
color: _isSelected(1)
66+
Icon(Icons.message_outlined,
67+
color: _isSelected(2)
5968
? StreamChatTheme.of(context).colorTheme.textHighEmphasis
6069
: Colors.grey,
6170
),
71+
PositionedDirectional(
72+
top: -4,
73+
start: 12,
74+
child: StreamUnreadIndicator.threads(),
75+
),
6276
],
6377
),
64-
label: AppLocalizations.of(context).mentions,
78+
label: 'Threads',
6579
),
6680
];
6781
}
@@ -105,6 +119,7 @@ class _ChannelListPageState extends State<ChannelListPage> {
105119
children: const [
106120
ChannelList(),
107121
UserMentionsPage(),
122+
ThreadListPage(),
108123
],
109124
),
110125
);

0 commit comments

Comments
 (0)