copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Revert "composed Modifier changes (#9631)"

Browse source 
This reverts commit 434b8d3ae8.

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt
#	presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt
#	presentation-core/src/main/java/tachiyomi/presentation/core/util/Modifier.kt
This commit is contained in:
Cuong M. Tran 2024-06-15 18:51:47 +07:00
parent 4909d0ce57
commit cd7bc8860e
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt
View file

@ -116,7 +116,7 @@ internal fun Modifier.highlightBackground(highlighted: Boolean): Modifier = comp
}, },
label = "highlight", label = "highlight",
) )
Modifier.background(color = highlight) this then Modifier.background(color = highlight)
} }
internal val TrailingWidgetBuffer = 16.dp internal val TrailingWidgetBuffer = 16.dp

10
presentation-core/src/main/java/tachiyomi/presentation/core/util/Modifier.kt
View file

@ -28,7 +28,7 @@ fun Modifier.selectedBackground(isSelected: Boolean): Modifier = if (isSelected)
composed { composed {
val alpha = if (isSystemInDarkTheme()) 0.16f else 0.22f val alpha = if (isSystemInDarkTheme()) 0.16f else 0.22f
val color = MaterialTheme.colorScheme.secondary.copy(alpha = alpha) val color = MaterialTheme.colorScheme.secondary.copy(alpha = alpha)
Modifier.drawBehind { this then Modifier.drawBehind {
drawRect(color) drawRect(color)
} }
} }
@ -79,7 +79,7 @@ fun Modifier.showSoftKeyboard(show: Boolean): Modifier = if (show) {
} }
} }
Modifier.focusRequester(focusRequester) this then Modifier.focusRequester(focusRequester)
} }
} else { } else {
this this
@ -102,12 +102,14 @@ fun Modifier.clearFocusOnSoftKeyboardHide(
keyboardShowedSinceFocused = true keyboardShowedSinceFocused = true
} else if (keyboardShowedSinceFocused) { } else if (keyboardShowedSinceFocused) {
focusManager.clearFocus() focusManager.clearFocus()
onFocusCleared?.invoke() if (onFocusCleared != null) {
onFocusCleared()
}
} }
} }
} }
Modifier.onFocusChanged { this then Modifier.onFocusChanged {
if (isFocused != it.isFocused) { if (isFocused != it.isFocused) {
if (isFocused) { if (isFocused) {
keyboardShowedSinceFocused = false keyboardShowedSinceFocused = false