Skip to content

Commit 15db978

Browse files
Merge origin/develop-v2 into chore/sync-develop-into-develop-v2
Take the stream-android-core 5.1.0 token move and keep the demo E2EE share imports (collectAsStateWithLifecycle plus StreamTokens from core-ui). Co-authored-by: Cursor <cursoragent@cursor.com>
2 parents b107d20 + 65d8d05 commit 15db978

97 files changed

Lines changed: 122 additions & 1578 deletions

File tree

Some content is hidden

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

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/AvailableDeviceMenu.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import androidx.compose.ui.unit.IntOffset
3737
import androidx.compose.ui.unit.dp
3838
import androidx.compose.ui.window.Popup
3939
import androidx.lifecycle.compose.collectAsStateWithLifecycle
40+
import io.getstream.android.core.ui.design.StreamTokens
4041
import io.getstream.video.android.compose.theme.VideoTheme
41-
import io.getstream.video.android.compose.theme.design.StreamTokens
4242
import io.getstream.video.android.core.Call
4343
import kotlinx.coroutines.delay
4444

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/CallScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ import androidx.compose.ui.unit.IntSize
7575
import androidx.compose.ui.unit.dp
7676
import androidx.compose.ui.window.Popup
7777
import androidx.lifecycle.compose.collectAsStateWithLifecycle
78+
import io.getstream.android.core.ui.design.StreamTokens
7879
import io.getstream.android.video.generated.models.TranscriptionSettingsResponse
7980
import io.getstream.chat.android.ui.common.state.messages.list.MessageItemState
8081
import io.getstream.video.android.BuildConfig
8182
import io.getstream.video.android.R
8283
import io.getstream.video.android.compose.pip.rememberIsInPipMode
8384
import io.getstream.video.android.compose.theme.VideoTheme
84-
import io.getstream.video.android.compose.theme.design.StreamTokens
8585
import io.getstream.video.android.compose.ui.components.base.StreamBadgeBox
8686
import io.getstream.video.android.compose.ui.components.base.StreamButtonSize
8787
import io.getstream.video.android.compose.ui.components.base.StreamButtonStyleDefaults

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/CallStats.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ import androidx.compose.ui.unit.dp
6464
import androidx.compose.ui.window.Dialog
6565
import androidx.compose.ui.window.DialogProperties
6666
import androidx.lifecycle.compose.collectAsStateWithLifecycle
67+
import io.getstream.android.core.ui.design.StreamTokens
6768
import io.getstream.video.android.compose.theme.VideoTheme
68-
import io.getstream.video.android.compose.theme.design.StreamTokens
6969
import io.getstream.video.android.compose.ui.components.avatar.UserAvatar
7070
import io.getstream.video.android.compose.ui.components.base.StreamButtonStyleDefaults
7171
import io.getstream.video.android.compose.ui.components.base.StreamIconButton

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/ChatDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ import androidx.compose.ui.platform.testTag
4040
import androidx.compose.ui.res.painterResource
4141
import androidx.compose.ui.unit.dp
4242
import androidx.lifecycle.viewmodel.compose.viewModel
43+
import io.getstream.android.core.ui.design.StreamTokens
4344
import io.getstream.chat.android.compose.ui.messages.MessagesScreen
4445
import io.getstream.chat.android.compose.ui.theme.ChatTheme
4546
import io.getstream.chat.android.compose.viewmodel.messages.MessageListViewModel
4647
import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory
4748
import io.getstream.chat.android.ui.common.state.messages.list.MessageItemState
4849
import io.getstream.video.android.compose.theme.VideoTheme
49-
import io.getstream.video.android.compose.theme.design.StreamTokens
5050
import io.getstream.video.android.core.Call
5151
import java.time.Instant
5252
import java.util.Date

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/ChatOverly.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ import androidx.compose.ui.draw.alpha
3232
import androidx.compose.ui.draw.clip
3333
import androidx.compose.ui.platform.LocalConfiguration
3434
import androidx.compose.ui.unit.dp
35+
import io.getstream.android.core.ui.design.StreamTokens
3536
import io.getstream.chat.android.ui.common.state.messages.list.MessageItemState
3637
import io.getstream.video.android.compose.theme.VideoTheme
37-
import io.getstream.video.android.compose.theme.design.StreamTokens
3838

3939
@Composable
4040
fun ChatOverly(

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/CustomReactionContent.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import androidx.compose.runtime.remember
2929
import androidx.compose.runtime.setValue
3030
import androidx.compose.ui.Modifier
3131
import androidx.lifecycle.compose.collectAsStateWithLifecycle
32+
import io.getstream.android.core.ui.design.StreamTokens
3233
import io.getstream.video.android.compose.theme.VideoTheme
33-
import io.getstream.video.android.compose.theme.design.StreamTokens
3434
import io.getstream.video.android.compose.ui.components.call.renderer.VideoRendererStyle
3535
import io.getstream.video.android.core.ParticipantState
3636
import io.getstream.video.android.core.model.Reaction

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/DemoComponentFactory.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import androidx.compose.runtime.Composable
2222
import androidx.compose.ui.Alignment
2323
import androidx.compose.ui.Modifier
2424
import androidx.compose.ui.platform.testTag
25+
import io.getstream.android.core.ui.design.StreamTokens
2526
import io.getstream.android.video.generated.models.OwnCapability
2627
import io.getstream.video.android.compose.theme.ParticipantVideoActionsContentParams
2728
import io.getstream.video.android.compose.theme.ParticipantVideoReactionContentParams
2829
import io.getstream.video.android.compose.theme.VideoComponentFactory
29-
import io.getstream.video.android.compose.theme.design.StreamTokens
3030
import io.getstream.video.android.compose.ui.components.call.pinning.ParticipantAction
3131
import io.getstream.video.android.compose.ui.components.call.pinning.ParticipantActions
3232
import io.getstream.video.android.compose.ui.components.call.renderer.copy

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/LandscapeControls.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import androidx.compose.ui.unit.IntOffset
3838
import androidx.compose.ui.unit.dp
3939
import androidx.compose.ui.window.Popup
4040
import androidx.lifecycle.compose.collectAsStateWithLifecycle
41+
import io.getstream.android.core.ui.design.StreamTokens
4142
import io.getstream.video.android.compose.theme.VideoTheme
42-
import io.getstream.video.android.compose.theme.design.StreamTokens
4343
import io.getstream.video.android.compose.ui.components.base.StreamButtonStyleDefaults
4444
import io.getstream.video.android.compose.ui.components.base.StreamIconButton
4545
import io.getstream.video.android.compose.ui.components.base.StreamTextButton

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/LayoutChooser.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import androidx.compose.ui.tooling.preview.Preview
2929
import androidx.compose.ui.unit.IntOffset
3030
import androidx.compose.ui.unit.dp
3131
import androidx.compose.ui.window.Popup
32+
import io.getstream.android.core.ui.design.StreamTokens
3233
import io.getstream.video.android.R
3334
import io.getstream.video.android.compose.theme.VideoTheme
34-
import io.getstream.video.android.compose.theme.design.StreamTokens
3535
import io.getstream.video.android.compose.ui.components.base.StreamButtonStyleDefaults
3636
import io.getstream.video.android.compose.ui.components.base.StreamTextButton
3737
import io.getstream.video.android.compose.ui.components.call.renderer.LayoutType

‎demo-app/src/main/kotlin/io/getstream/video/android/ui/call/ParticipantsDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import androidx.compose.ui.tooling.preview.Preview
4545
import androidx.compose.ui.window.Dialog
4646
import androidx.compose.ui.window.DialogProperties
4747
import androidx.lifecycle.compose.collectAsStateWithLifecycle
48+
import io.getstream.android.core.ui.design.StreamTokens
4849
import io.getstream.video.android.compose.theme.VideoTheme
49-
import io.getstream.video.android.compose.theme.design.StreamTokens
5050
import io.getstream.video.android.compose.ui.components.avatar.UserAvatar
5151
import io.getstream.video.android.compose.ui.components.base.StreamButtonStyleDefaults
5252
import io.getstream.video.android.compose.ui.components.base.StreamIconButton

0 commit comments

Comments
 (0)