Skip to content

Commit

Permalink
Remove logging
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisbanes committed May 23, 2024
1 parent a7882a1 commit ff394c3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ import androidx.compose.animation.slideOutHorizontally
import androidx.compose.animation.togetherWith
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.currentCompositeKeyHash
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -104,12 +102,8 @@ public fun <R : Record> NavigableCircuitContent(
val outerKey = "_navigable_registry_${currentCompositeKeyHash.toString(MaxSupportedRadix)}"
val outerRegistry = rememberRetained(key = outerKey) { RetainedStateRegistry() }

println("Composing NavigableCircuitContent for ${backStack.toList()}")

CompositionLocalProvider(LocalRetainedStateRegistry provides outerRegistry) {
decoration.DecoratedContent(activeContentProviders, backStack.size, modifier) { provider ->
println("--> NavigableCircuitContent content called for ${provider.record}")

val record = provider.record

// Remember the `providedValues` lookup because this composition can live longer than
Expand All @@ -120,14 +114,6 @@ public fun <R : Record> NavigableCircuitContent(
CompositionLocalProvider(LocalBackStack provides backStack, *providedLocals) {
provider.content(record)
}

DisposableEffect(Unit) {
println("NavigableCircuitContent for ${provider.record} added")

onDispose { println("NavigableCircuitContent for ${provider.record} removed") }
}

SideEffect { println("--> NavigableCircuitContent content finished for ${provider.record}") }
}
}
}
Expand Down Expand Up @@ -178,15 +164,10 @@ private fun <R : Record> buildCircuitContentProviders(
val recordInBackStackRetainChecker =
remember(lastBackStack, record) {
CanRetainChecker { lastBackStack.containsRecord(record, includeSaved = true) }
.also { println("Creating CanRetainChecker for $record") }
}

val lifecycle =
remember { LifecycleImpl().also { println("Created LifecycleImpl $it for $record") } }
.apply {
_isPaused = lastBackStack.topRecord != record
println("Set LifecycleImpl.isPaused to $_isPaused for $record. $this")
}
remember { LifecycleImpl() }.apply { _isPaused = lastBackStack.topRecord != record }

CompositionLocalProvider(LocalCanRetainChecker provides recordInBackStackRetainChecker) {
// Now provide a new registry to the content for it to store any retained state in,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ public abstract class PauseablePresenter<UiState : CircuitUiState>() : Presenter
val isPaused = LocalLifecycle.current.isPaused

if (!isPaused || uiState == null) {
val retainedStateRegistry = rememberRetained(key = "pauseable") { RetainedStateRegistry() }
val retainedStateRegistry = rememberRetained { RetainedStateRegistry() }
CompositionLocalProvider(LocalRetainedStateRegistry provides retainedStateRegistry) {
saveableStateHolder.SaveableStateProvider("pauseable_presenter") { uiState = _present() }
}
}

println("PauseablePresenter. isPaused: $isPaused. state: $uiState")

return uiState!!
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableStateOf
Expand Down

0 comments on commit ff394c3

Please sign in to comment.