mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-23 13:02:33 +01:00
Code Issues Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Syer10
2022-11-01 18:18:59 -04:00
parent 6f307a7a47
commit fa7742a44a
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt
View File

@@ -35,7 +35,7 @@ interface ChapterRepository {
/* TODO add once ktorfit supports nullable paremters /* TODO add once ktorfit supports nullable paremters
@FormUrlEncoded @FormUrlEncoded
@PATCH("/api/v1/manga/{mangaId}/chapter/{chapterIndex}") @PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}")
fun updateChapter( fun updateChapter(
@Path("mangaId") mangaId: Long, @Path("mangaId") mangaId: Long,
@Path("chapterIndex") chapterIndex: Int, @Path("chapterIndex") chapterIndex: Int,

4
presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/AndroidViewModelComponent.kt
View File

@@ -29,7 +29,9 @@ actual inline fun <reified VM : ViewModel> Screen.stateViewModel(
val viewModelFactory = LocalViewModels.current val viewModelFactory = LocalViewModels.current
val lifecycle = LocalLifecycleOwner.current as AndroidScreenLifecycleOwner val lifecycle = LocalLifecycleOwner.current as AndroidScreenLifecycleOwner
val handle = remember { val handle = remember {
lifecycle.defaultViewModelCreationExtras.addScreenModelKey<VM>(this, tag).createSavedStateHandle() lifecycle.defaultViewModelCreationExtras
.addScreenModelKey<VM>(this, tag)
.createSavedStateHandle()
} }
return rememberScreenModel(tag) { viewModelFactory.factory(handle) } return rememberScreenModel(tag) { viewModelFactory.factory(handle) }
} }

17
presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/state/SavedStateHandleSupport.kt
View File

@@ -25,11 +25,10 @@ import java.lang.reflect.Method
private const val SAVED_STATE_KEY = "androidx.lifecycle.internal.SavedStateHandlesProvider" private const val SAVED_STATE_KEY = "androidx.lifecycle.internal.SavedStateHandlesProvider"
val SavedStateHandleSupportClass: Class<*> by lazy {
Class.forName("androidx.lifecycle.SavedStateHandleSupport")
}
val getSavedStateHandlesVM: Method by lazy { val getSavedStateHandlesVM: Method by lazy {
SavedStateHandleSupportClass.methods.first { it.name == "getSavedStateHandlesVM" } Class.forName("androidx.lifecycle.SavedStateHandleSupport")
.methods
.first { it.name == "getSavedStateHandlesVM" }
} }
private fun createSavedStateHandle( private fun createSavedStateHandle(
@@ -43,7 +42,12 @@ private fun createSavedStateHandle(
// for a given key stored in our ViewModel, use that. Otherwise, create // for a given key stored in our ViewModel, use that. Otherwise, create
// a new SavedStateHandle, providing it any restored state we might have saved // a new SavedStateHandle, providing it any restored state we might have saved
val vm = getSavedStateHandlesVM.invoke(null, viewModelStoreOwner)!! val vm = getSavedStateHandlesVM.invoke(null, viewModelStoreOwner)!!
val handles = vm::class.java.methods.first { it.name == "getHandles" }.invoke(vm) as MutableMap<String, SavedStateHandle> @Suppress("UNCHECKED_CAST")
val handles = vm::class.java
.methods
.first { it.name == "getHandles" }
.invoke(vm) as MutableMap<String, SavedStateHandle>
return handles[key] ?: SavedStateHandle.createHandle( return handles[key] ?: SavedStateHandle.createHandle(
provider.consumeRestoredStateForKey(key), provider.consumeRestoredStateForKey(key),
defaultArgs defaultArgs
@@ -103,7 +107,8 @@ internal class SavedStateHandlesProvider(
* Restore the state associated with a particular SavedStateHandle, identified by its [key] * Restore the state associated with a particular SavedStateHandle, identified by its [key]
*/ */
fun consumeRestoredStateForKey(key: String): Bundle? { fun consumeRestoredStateForKey(key: String): Bundle? {
return savedStateRegistry::class.java.methods return savedStateRegistry::class.java
.methods
.find { it.name == "consumeRestoredStateForKey" } .find { it.name == "consumeRestoredStateForKey" }
?.invoke(savedStateRegistry, key) as? Bundle ?.invoke(savedStateRegistry, key) as? Bundle
} }