Skip to content

Streamlined fromComposable and fromScreen. Removed casting. #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EranBoudjnah merged 1 commit into from
Apr 7, 2025
Merged

Streamlined fromComposable and fromScreen. Removed casting. #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions app/src/androidTest/java/com/mitteloupe/whoami/launcher/FromScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.mitteloupe.whoami.launcher

import androidx.activity.ComponentActivity
import androidx.activity.compose.LocalActivity
import androidx.appcompat.app.AppCompatActivity
import com.mitteloupe.whoami.di.testAppDependenciesEntryPoint
import com.mitteloupe.whoami.test.launcher.AppLauncher
Expand All @@ -10,13 +8,12 @@ import com.mitteloupe.whoami.test.test.TypedAndroidComposeTestRule
import com.mitteloupe.whoami.ui.main.AppNavHost
import com.mitteloupe.whoami.ui.theme.WhoAmITheme

fun <ACTIVITY : ComponentActivity> fromScreen(
fun <ACTIVITY : AppCompatActivity> fromScreen(
composeContentTestRule: TypedAndroidComposeTestRule<ACTIVITY>,
startDestination: Any
) = AppLauncher {
fromComposable(composeContentTestRule) {
fromComposable(composeContentTestRule) { activity ->
WhoAmITheme {
val activity = LocalActivity.current as AppCompatActivity
with(testAppDependenciesEntryPoint(activity).appNavHostDependencies) {
AppNavHost(
supportFragmentManager = activity.supportFragmentManager,
Expand Down
7 changes: 3 additions & 4 deletions .../instrumentation-test/src/main/java/com/mitteloupe/whoami/test/launcher/FromComposable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ import kotlinx.coroutines.runBlocking

fun <ACTIVITY : ComponentActivity> fromComposable(
composeContentTestRule: TypedAndroidComposeTestRule<ACTIVITY>,
composable: @Composable () -> Unit
composable: @Composable (ACTIVITY) -> Unit
) = AppLauncher {
val activity = composeContentTestRule.activity
val root = activity.findViewById<ViewGroup>(android.R.id.content)
if (root != null) {
activity.findViewById<ViewGroup>(android.R.id.content)?.let { root ->
runBlocking(Dispatchers.Main) {
root.removeAllViews()
}
}
composeContentTestRule.setContent(composable)
composeContentTestRule.setContent { composable(activity) }
}