Skip to content

Commit 8d0ce23

Browse files
committed
Merge branch 'develop'
2 parents ae2ac24 + 65850a1 commit 8d0ce23

File tree

77 files changed

+1501
-2307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1501
-2307
lines changed

demo-app/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/build
1+
/build
2+
!/libs/**

demo-app/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ If you want to build and run the [dogfooding app](https://github.com/GetStream/s
4747

4848
```
4949
# Environment Variable for dogfooding app
50-
DOGFOODING_BUILD_CONFIG_API_KEY=YOUR_STREAM_API_KEY
51-
PRODUCTION_BUILD_CONFIG_API_KEY=YOUR_STREAM_API_KEY
52-
DOGFOODING_RES_CONFIG_DEEPLINKING_HOST=stream-calls-dogfood.vercel.app
50+
DOGFOODING_RES_CONFIG_DEEPLINKING_HOST=pronto.getstream.io
5351
PRODUCTION_RES_CONFIG_DEEPLINKING_HOST=getstream.io
5452
DOGFOODING_RES_CONFIG_DEEPLINKING_PATH_PREFIX=/
5553
PRODUCTION_RES_CONFIG_DEEPLINKING_PATH_PREFIX=/video/demos/

demo-app/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ android {
130130
baseline = file("lint-baseline.xml")
131131
}
132132

133+
packaging {
134+
jniLibs.pickFirsts.add("lib/*/librenderscript-toolkit.so")
135+
}
136+
133137
baselineProfile {
134138
mergeIntoMain = true
135139
}
@@ -260,6 +264,10 @@ dependencies {
260264
implementation(libs.play.auth)
261265
implementation(libs.play.app.update.ktx)
262266

267+
// Video Filters
268+
implementation(libs.google.mlkit.selfie.segmentation)
269+
implementation(files("libs/renderscript-toolkit.aar"))
270+
263271
// Memory detection
264272
debugImplementation(libs.leakCanary)
265273

508 KB
Binary file not shown.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (c) 2023 Stream.io Inc. All rights reserved.
4+
5+
Licensed under the Stream License;
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
https://github.com/GetStream/stream-video-android/blob/main/LICENSE
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
18+
xmlns:aapt="http://schemas.android.com/aapt"
19+
android:width="107dp"
20+
android:height="107dp"
21+
android:viewportWidth="107"
22+
android:viewportHeight="107">
23+
<path
24+
android:pathData="M0,0h107v107h-107z"
25+
android:fillColor="#008E30"/>
26+
<path
27+
android:pathData="M0,0h107v107h-107z">
28+
<aapt:attr name="android:fillColor">
29+
<gradient
30+
android:startX="107"
31+
android:startY="-0"
32+
android:endX="0"
33+
android:endY="107"
34+
android:type="linear">
35+
<item android:offset="0" android:color="#FF49DDED"/>
36+
<item android:offset="1" android:color="#0049DDED"/>
37+
</gradient>
38+
</aapt:attr>
39+
</path>
40+
</vector>
5.13 KB
Loading
2.98 KB
Loading
7.59 KB
Loading
14.1 KB
Loading
22.1 KB
Loading

0 commit comments

Comments
 (0)