-
Notifications
You must be signed in to change notification settings - Fork 177
Try using molecule #754
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.
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
Open
takahirom
wants to merge
7
commits into
main
Choose a base branch
from
try-to-use-molecule
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Try using molecule #754
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
037b093
Try to use molecule
takahirom dd0d4c0
Remove unneeded contentsLoadState
takahirom 0891ac8
Apply spotless
takahirom 01a4574
Clean up overrideDefaultContext
takahirom 4c168ab
Fix compose:core version
takahirom bdb42dc
Fix lint
takahirom 606a89b
Utilize collectAsLoadState
takahirom File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
android/src/test/java/io/github/droidkaigi/feeder/CoroutineTestRule.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,57 @@ | ||
| package io.github.droidkaigi.feeder | ||
|
|
||
| import androidx.compose.runtime.BroadcastFrameClock | ||
| import androidx.compose.runtime.withFrameMillis | ||
| import androidx.lifecycle.overrideDefaultContext | ||
| import kotlinx.coroutines.CoroutineStart | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.ExperimentalCoroutinesApi | ||
| import kotlinx.coroutines.coroutineScope | ||
| import kotlinx.coroutines.launch | ||
| import kotlinx.coroutines.test.TestCoroutineDispatcher | ||
| import kotlinx.coroutines.test.resetMain | ||
| import kotlinx.coroutines.test.setMain | ||
| import kotlinx.coroutines.yield | ||
| import org.junit.rules.TestWatcher | ||
| import org.junit.runner.Description | ||
|
|
||
| @ExperimentalCoroutinesApi | ||
| class CoroutineTestRule(val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()) : | ||
| TestWatcher() { | ||
| private lateinit var clock: BroadcastFrameClock | ||
|
|
||
| suspend fun awaitFrame() { | ||
| yield() | ||
| clock.awaitFrame() | ||
| } | ||
|
|
||
| override fun starting(description: Description?) { | ||
| super.starting(description) | ||
| clock = BroadcastFrameClock() | ||
| overrideDefaultContext = clock + testDispatcher | ||
| Dispatchers.setMain(testDispatcher) | ||
| } | ||
|
|
||
| override fun finished(description: Description?) { | ||
| super.finished(description) | ||
| Dispatchers.resetMain() | ||
| testDispatcher.cleanupTestCoroutines() | ||
| overrideDefaultContext = null | ||
| } | ||
| } | ||
|
|
||
| // from: molecule | ||
| private suspend fun BroadcastFrameClock.awaitFrame() { | ||
| // TODO Remove the need for two frames to happen! | ||
| // I think this is because of the diff-sender is a hot loop that immediately reschedules | ||
| // itself on the clock. This schedules it ahead of the coroutine which applies changes and | ||
| // so we need to trigger an additional frame to actually emit the change's diffs. | ||
| repeat(2) { | ||
| coroutineScope { | ||
| launch(start = CoroutineStart.UNDISPATCHED) { | ||
| withFrameMillis { } | ||
| } | ||
| sendFrame(0L) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
uicomponent-compose/core/src/main/java/androidx/lifecycle/viewModelScopeWithClock.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package androidx.lifecycle | ||
|
|
||
| import app.cash.molecule.AndroidUiDispatcher | ||
| import java.io.Closeable | ||
| import kotlin.coroutines.CoroutineContext | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.SupervisorJob | ||
| import kotlinx.coroutines.cancel | ||
|
|
||
| private const val JOB_KEY = "io.github.droidkaigi.feeder.ViewModelCoroutineScope.JOB_KEY" | ||
|
|
||
| val defaultDispatcher by lazy { AndroidUiDispatcher.Main } | ||
| var overrideDefaultContext: CoroutineContext? = null | ||
|
|
||
| public val ViewModel.viewModelScopeWithClock: CoroutineScope | ||
| get() { | ||
| val scope: CoroutineScope? = this.getTag(JOB_KEY) | ||
| if (scope != null) { | ||
| return scope | ||
| } | ||
| return setTagIfAbsent( | ||
| JOB_KEY, | ||
| CloseableCoroutineScope( | ||
| SupervisorJob() + | ||
| (overrideDefaultContext ?: defaultDispatcher) | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| internal class CloseableCoroutineScope(context: CoroutineContext) : Closeable, CoroutineScope { | ||
| override val coroutineContext: CoroutineContext = context | ||
|
|
||
| override fun close() { | ||
| coroutineContext.cancel() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.