Skip to content

Commit d7617b0

Browse files
committed
Merge branch 'jetchat_alpha08' into dev_jetchat_androidview
Change-Id: I23d1202ac5fcf8b611270886c6194aa56d1124a9
2 parents ce476e0 + 2161dbe commit d7617b0

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.compose.ui.test.performClick
3030
import androidx.compose.ui.test.performGesture
3131
import androidx.compose.ui.test.swipe
3232
import androidx.compose.ui.unit.milliseconds
33-
import com.example.compose.jetchat.conversation.BackPressedDispatcherAmbient
33+
import com.example.compose.jetchat.conversation.AmbientBackPressedDispatcher
3434
import com.example.compose.jetchat.conversation.ConversationContent
3535
import com.example.compose.jetchat.conversation.ConversationTestTag
3636
import com.example.compose.jetchat.data.exampleUiState
@@ -60,7 +60,7 @@ class ConversationTest {
6060
activity = newActivity
6161
// Launch the conversation screen
6262
composeTestRule.setContent {
63-
Providers(BackPressedDispatcherAmbient provides newActivity) {
63+
Providers(AmbientBackPressedDispatcher provides newActivity) {
6464
JetchatTheme(isDarkTheme = themeIsDark.collectAsState(false).value) {
6565
ConversationContent(
6666
uiState = exampleUiState,

Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.compose.ui.test.onNodeWithText
2525
import androidx.navigation.NavController
2626
import androidx.navigation.Navigation
2727
import androidx.test.espresso.Espresso
28-
import com.example.compose.jetchat.conversation.BackPressedDispatcherAmbient
28+
import com.example.compose.jetchat.conversation.AmbientBackPressedDispatcher
2929
import com.example.compose.jetchat.conversation.ConversationContent
3030
import com.example.compose.jetchat.data.exampleUiState
3131
import com.example.compose.jetchat.theme.JetchatTheme
@@ -59,7 +59,7 @@ class NavigationTest {
5959

6060
// Start the app
6161
composeTestRule.setContent {
62-
Providers(BackPressedDispatcherAmbient provides activity) {
62+
Providers(AmbientBackPressedDispatcher provides activity) {
6363
JetchatTheme {
6464
ConversationContent(
6565
uiState = exampleUiState,

Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import androidx.compose.ui.test.onNodeWithText
3232
import androidx.compose.ui.test.performClick
3333
import androidx.compose.ui.test.performTextInput
3434
import androidx.test.espresso.Espresso
35-
import com.example.compose.jetchat.conversation.BackPressedDispatcherAmbient
35+
import com.example.compose.jetchat.conversation.AmbientBackPressedDispatcher
3636
import com.example.compose.jetchat.conversation.ConversationContent
3737
import com.example.compose.jetchat.conversation.KeyboardShownKey
3838
import com.example.compose.jetchat.data.exampleUiState
@@ -59,7 +59,7 @@ class UserInputTest {
5959
activity = newActivity
6060
// Launch the conversation screen
6161
composeTestRule.setContent {
62-
Providers(BackPressedDispatcherAmbient provides activity) {
62+
Providers(AmbientBackPressedDispatcher provides activity) {
6363
JetchatTheme {
6464
ConversationContent(
6565
uiState = exampleUiState,

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/BackHandler.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.compose.runtime.remember
2525
import androidx.compose.runtime.staticAmbientOf
2626

2727
/**
28-
* This [Composable] can be used with a [BackPressedDispatcherAmbient] to intercept a back press (if
28+
* This [Composable] can be used with a [AmbientBackPressedDispatcher] to intercept a back press (if
2929
* [enabled]).
3030
*
3131
* @param onBackPressed (Event) What to do when back is intercepted
@@ -39,7 +39,7 @@ fun backPressHandler(
3939
enabled: Boolean = true,
4040
highPriority: Boolean = false
4141
) {
42-
val dispatcher = BackPressedDispatcherAmbient.current.onBackPressedDispatcher
42+
val dispatcher = AmbientBackPressedDispatcher.current.onBackPressedDispatcher
4343

4444
// This callback is going to be remembered only if onBackPressed is referentially equal.
4545
val backCallback = remember(onBackPressed) {
@@ -75,10 +75,10 @@ fun backPressHandler(
7575
* This [Ambient] is used to provide an [OnBackPressedDispatcherOwner]:
7676
*
7777
* ```
78-
* Providers(BackPressedDispatcherAmbient provides requireActivity()) { }
78+
* Providers(AmbientBackPressedDispatcher provides requireActivity()) { }
7979
* ```
8080
*
8181
* and setting up the callbacks with [backPressHandler].
8282
*/
83-
val BackPressedDispatcherAmbient =
83+
val AmbientBackPressedDispatcher =
8484
staticAmbientOf<OnBackPressedDispatcherOwner> { error("Ambient used without Provider") }

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ConversationFragment : Fragment() {
4242
): View {
4343
return ComposeView(context = requireContext()).apply {
4444
setContent {
45-
Providers(BackPressedDispatcherAmbient provides requireActivity()) {
45+
Providers(AmbientBackPressedDispatcher provides requireActivity()) {
4646
JetchatTheme {
4747
ConversationContent(
4848
uiState = exampleUiState,

0 commit comments

Comments
 (0)