mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-10 06:42:05 +01:00
Code Issues Projects Releases Wiki Activity

Automatic Lint

Browse Source
This commit is contained in:
Syer10
2024-03-29 00:16:52 +00:00
parent 253095fab1
commit b93c96a85b
48 changed files with 204 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/components/AndroidScrollbar.kt
View File

@@ -82,12 +82,15 @@ internal actual fun RealVerticalScrollbar(
is ScrollStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.scrollState, Orientation.Vertical, reverseLayout)
}
is LazyListStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.lazyListState, Orientation.Vertical, reverseLayout)
}
is LazyGridStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.lazyGridState, adapter.gridCells, adapter.spacing, Orientation.Vertical, reverseLayout)
}
else -> Modifier
}
Box(modifier then Modifier.fillMaxSize() then scrollbarModifier)
@@ -105,49 +108,47 @@ internal actual fun RealHorizontalScrollbar(
is ScrollStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.scrollState, Orientation.Horizontal, reverseLayout)
}
is LazyListStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.lazyListState, Orientation.Horizontal, reverseLayout)
}
else -> Modifier
}
Box(modifier then Modifier.fillMaxSize() then scrollbarModifier)
}
@Composable
actual fun rememberScrollbarAdapter(scrollState: ScrollState): ScrollbarAdapter {
return remember(scrollState) {
actual fun rememberScrollbarAdapter(scrollState: ScrollState): ScrollbarAdapter =
remember(scrollState) {
ScrollStateScrollbarAdapter(scrollState)
}
}
@Composable
actual fun rememberScrollbarAdapter(scrollState: LazyListState): ScrollbarAdapter {
return remember(scrollState) {
actual fun rememberScrollbarAdapter(scrollState: LazyListState): ScrollbarAdapter =
remember(scrollState) {
LazyListStateScrollbarAdapter(scrollState)
}
}
@Composable
internal actual fun realRememberVerticalScrollbarAdapter(
scrollState: LazyGridState,
gridCells: GridCells,
arrangement: Arrangement.Vertical?,
): ScrollbarAdapter {
return remember(scrollState, gridCells) {
): ScrollbarAdapter =
remember(scrollState, gridCells) {
LazyGridStateScrollbarAdapter(scrollState, gridCells, arrangement?.spacing ?: Dp.Hairline)
}
}
@Composable
internal actual fun realRememberHorizontalScrollbarAdapter(
scrollState: LazyGridState,
gridCells: GridCells,
arrangement: Arrangement.Horizontal?,
): ScrollbarAdapter {
return remember(scrollState, gridCells) {
): ScrollbarAdapter =
remember(scrollState, gridCells) {
LazyGridStateScrollbarAdapter(scrollState, gridCells, arrangement?.spacing ?: Dp.Hairline)
}
}
actual fun Modifier.scrollbarPadding() = this

5
ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/image/ImageLoaderImage.kt
View File

@@ -98,14 +98,17 @@ fun ImageLoaderImage(
error.value = action.error
ImageLoaderImageState.Failure
}
is ImageAction.Loading -> {
progress.value = 0.0F
ImageLoaderImageState.Loading
}
is ImageAction.Success -> {
progress.value = 1.0F
ImageLoaderImageState.Success
}
else -> {
ImageLoaderImageState.Loading
}
@@ -117,6 +120,7 @@ fun ImageLoaderImage(
ImageLoaderImageState.Loading -> if (onLoading != null) {
onLoading(progress.value)
}
ImageLoaderImageState.Success -> Image(
painter = rememberImageActionPainter(
imageAction,
@@ -129,6 +133,7 @@ fun ImageLoaderImage(
alpha = alpha,
colorFilter = colorFilter,
)
ImageLoaderImageState.Failure -> {
if (onFailure != null) {
onFailure(error.value ?: return@Crossfade)

6
ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/pager/Pager.kt
View File

@@ -300,9 +300,7 @@ private fun lazyListSnapLayoutInfoProvider(
lowerBound: Float,
upperBound: Float,
): Float {
fun Float.isValidDistance(): Boolean {
return this != Float.POSITIVE_INFINITY && this != Float.NEGATIVE_INFINITY
}
fun Float.isValidDistance(): Boolean = this != Float.POSITIVE_INFINITY && this != Float.NEGATIVE_INFINITY
val finalDistance = when (sign(velocity)) {
0f -> {
@@ -314,7 +312,9 @@ private fun lazyListSnapLayoutInfoProvider(
}
1f -> upperBound
-1f -> lowerBound
else -> 0f
}

25
ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/components/IosScrollbar.kt
View File

@@ -81,12 +81,15 @@ internal actual fun RealVerticalScrollbar(
is ScrollStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.scrollState, Orientation.Vertical, reverseLayout)
}
is LazyListStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.lazyListState, Orientation.Vertical, reverseLayout)
}
is LazyGridStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.lazyGridState, adapter.gridCells, adapter.spacing, Orientation.Vertical, reverseLayout)
}
else -> Modifier
}
Box(modifier then Modifier.fillMaxSize() then scrollbarModifier)
@@ -104,49 +107,47 @@ internal actual fun RealHorizontalScrollbar(
is ScrollStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.scrollState, Orientation.Horizontal, reverseLayout)
}
is LazyListStateScrollbarAdapter -> {
Modifier.drawScrollbar(adapter.lazyListState, Orientation.Horizontal, reverseLayout)
}
else -> Modifier
}
Box(modifier then Modifier.fillMaxSize() then scrollbarModifier)
}
@Composable
actual fun rememberScrollbarAdapter(scrollState: ScrollState): ScrollbarAdapter {
return remember(scrollState) {
actual fun rememberScrollbarAdapter(scrollState: ScrollState): ScrollbarAdapter =
remember(scrollState) {
ScrollStateScrollbarAdapter(scrollState)
}
}
@Composable
actual fun rememberScrollbarAdapter(scrollState: LazyListState): ScrollbarAdapter {
return remember(scrollState) {
actual fun rememberScrollbarAdapter(scrollState: LazyListState): ScrollbarAdapter =
remember(scrollState) {
LazyListStateScrollbarAdapter(scrollState)
}
}
@Composable
internal actual fun realRememberVerticalScrollbarAdapter(
scrollState: LazyGridState,
gridCells: GridCells,
arrangement: Arrangement.Vertical?,
): ScrollbarAdapter {
return remember(scrollState, gridCells) {
): ScrollbarAdapter =
remember(scrollState, gridCells) {
LazyGridStateScrollbarAdapter(scrollState, gridCells, arrangement?.spacing ?: Dp.Hairline)
}
}
@Composable
internal actual fun realRememberHorizontalScrollbarAdapter(
scrollState: LazyGridState,
gridCells: GridCells,
arrangement: Arrangement.Horizontal?,
): ScrollbarAdapter {
return remember(scrollState, gridCells) {
): ScrollbarAdapter =
remember(scrollState, gridCells) {
LazyGridStateScrollbarAdapter(scrollState, gridCells, arrangement?.spacing ?: Dp.Hairline)
}
}
actual fun Modifier.scrollbarPadding() = this

8
ui-core/src/iosMain/kotlin/ca/gosyer/jui/uicore/resources/IosImageResource.kt
View File

@@ -36,10 +36,9 @@ import platform.CoreGraphics.CGImageGetWidth
import platform.UIKit.UIImage
@Composable
actual fun ImageResource.toPainter(): Painter {
return remember { toUIImage()?.toSkiaImage()?.toComposeImageBitmap()?.let(::BitmapPainter) }
actual fun ImageResource.toPainter(): Painter =
remember { toUIImage()?.toSkiaImage()?.toComposeImageBitmap()?.let(::BitmapPainter) }
?: rememberVectorPainter(Icons.Rounded.BrokenImage)
}
// Taken from https://github.com/touchlab/DroidconKotlin/blob/main/shared-ui/src/iosMain/kotlin/co/touchlab/droidcon/ui/util/ToSkiaImage.kt
// TODO: Add support for remaining color spaces when the Skia library supports them.
@@ -60,13 +59,16 @@ private fun UIImage.toSkiaImage(): Image? {
CGImageAlphaInfo.kCGImageAlphaPremultipliedFirst,
CGImageAlphaInfo.kCGImageAlphaPremultipliedLast,
-> ColorAlphaType.PREMUL
CGImageAlphaInfo.kCGImageAlphaFirst,
CGImageAlphaInfo.kCGImageAlphaLast,
-> ColorAlphaType.UNPREMUL
CGImageAlphaInfo.kCGImageAlphaNone,
CGImageAlphaInfo.kCGImageAlphaNoneSkipFirst,
CGImageAlphaInfo.kCGImageAlphaNoneSkipLast,
-> ColorAlphaType.OPAQUE
else -> ColorAlphaType.UNKNOWN
}