luisgulo/Gitnuro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated Compose Multiplatform to 1.5.0-rc01

Browse source
This commit is contained in:
Abdelilah El Aissaoui 2023-08-19 10:43:11 +02:00
parent e2cf95712a
commit 2cc4ca18b5
11 changed files with 29 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -9,7 +9,7 @@ plugins {
kotlin("jvm") version "1.7.10"
kotlin("kapt") version "1.7.10"
kotlin("plugin.serialization") version "1.7.10"
id("org.jetbrains.compose") version "1.4.1"
id("org.jetbrains.compose") version "1.5.0-rc01"
}
// Remember to update Constants.APP_VERSION when changing this version

19
src/main/kotlin/com/jetpackduba/gitnuro/extensions/ModifierExtensions.kt
View file

@ -91,25 +91,6 @@ fun Modifier.onDoubleClick(
}
}
// TODO Try to restore hover that was shown with clickable modifier
@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun Modifier.fastClickable(key: Any = Unit, key2: Any = Unit, onClick: () -> Unit) =
this.handOnHover()
.hoverBackground()
.pointerInput(key, key2) {
while (true) {
val lastMouseEvent = awaitPointerEventScope { awaitFirstDownEvent() }
val mouseEvent = lastMouseEvent.awtEventOrNull
if (mouseEvent != null) {
if (lastMouseEvent.button.isPrimary) {
onClick()
}
}
}
}
@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun Modifier.onMiddleMouseButtonClick(key: Any = Unit, key2: Any = Unit, onClick: () -> Unit) =

3
src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt
View file

@ -4,6 +4,7 @@ package com.jetpackduba.gitnuro.ui
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.text.selection.DisableSelection
@ -96,7 +97,7 @@ fun Blame(
.width(200.dp)
.fillMaxHeight()
.background(MaterialTheme.colors.secondarySurface)
.fastClickable { if (commit != null) onSelectCommit(commit) },
.clickable { if (commit != null) onSelectCommit(commit) },
verticalArrangement = Arrangement.Center,
) {
Text(

9
src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/ContextMenu.kt
View file

@ -33,6 +33,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.*
import androidx.compose.ui.window.Popup
import androidx.compose.ui.window.PopupPositionProvider
import androidx.compose.ui.window.PopupProperties
import androidx.compose.ui.window.rememberPopupPositionProviderAtPosition
import com.jetpackduba.gitnuro.AppIcons
import com.jetpackduba.gitnuro.extensions.awaitFirstDownEvent
@ -135,7 +136,9 @@ private fun Modifier.dropdownMenu(items: () -> List<ContextMenuElement>): Modifi
@Composable
fun showPopup(x: Int, y: Int, contextMenuElements: List<ContextMenuElement>, onDismissRequest: () -> Unit) {
Popup(
focusable = true,
properties = PopupProperties(
focusable = true,
),
popupPositionProvider = object : PopupPositionProvider {
override fun calculatePosition(
anchorBounds: IntRect,
@ -331,7 +334,9 @@ class AppContextMenuRepresentation : ContextMenuRepresentation {
var inputModeManager: InputModeManager? by mutableStateOf(null)
Popup(
focusable = true,
properties = PopupProperties(
focusable = true,
),
onDismissRequest = { state.status = ContextMenuState.Status.Closed },
popupPositionProvider = rememberPopupPositionProviderAtPosition(
positionPx = status.rect.center

5
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/MaterialDialog.kt
View file

@ -26,6 +26,7 @@ import androidx.compose.ui.input.key.type
import androidx.compose.ui.unit.*
import androidx.compose.ui.window.Popup
import androidx.compose.ui.window.PopupPositionProvider
import androidx.compose.ui.window.PopupProperties
import com.jetpackduba.gitnuro.keybindings.KeybindingOption
import com.jetpackduba.gitnuro.keybindings.matchesBinding
import com.jetpackduba.gitnuro.theme.dialogOverlay
@ -40,7 +41,9 @@ fun MaterialDialog(
content: @Composable () -> Unit
) {
Popup(
focusable = true,
properties = PopupProperties(
focusable = true,
),
popupPositionProvider = object : PopupPositionProvider {
override fun calculatePosition(
anchorBounds: IntRect,

6
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt
View file

@ -111,9 +111,9 @@ fun NewBranchDialog(
)
}
}
}
LaunchedEffect(Unit) {
branchFieldFocusRequester.requestFocus()
LaunchedEffect(Unit) {
branchFieldFocusRequester.requestFocus()
}
}
}

6
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt
View file

@ -111,9 +111,9 @@ fun NewTagDialog(
)
}
}
}
LaunchedEffect(Unit) {
fieldFocusRequester.requestFocus()
LaunchedEffect(Unit) {
fieldFocusRequester.requestFocus()
}
}
}

6
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SignOffDialog.kt
View file

@ -168,9 +168,9 @@ fun SignOffDialog(
)
}
}
}
LaunchedEffect(state) {
signOffFieldFocusRequester.requestFocus()
LaunchedEffect(state) {
signOffFieldFocusRequester.requestFocus()
}
}
}

6
src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt
View file

@ -111,9 +111,9 @@ fun StashWithMessageDialog(
)
}
}
}
LaunchedEffect(Unit) {
textFieldFocusRequester.requestFocus()
LaunchedEffect(Unit) {
textFieldFocusRequester.requestFocus()
}
}
}

2
src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt
View file

@ -1149,7 +1149,7 @@ fun DiffLineText(line: Line, diffEntryType: DiffEntryType, onActionTriggered: ()
contentDescription = null,
tint = Color.White,
modifier = Modifier
.fastClickable(line) { onActionTriggered() }
.clickable { onActionTriggered() }
.size(16.dp)
.clip(RoundedCornerShape(2.dp))
.background(color),

4
src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
View file

@ -457,7 +457,7 @@ fun MessagesList(
modifier = Modifier.height(LINE_HEIGHT.dp)
.clipToBounds()
.fillMaxWidth()
.fastClickable { logViewModel.selectUncommitedChanges() }
.clickable { logViewModel.selectUncommitedChanges() }
) {
UncommitedChangesGraphNode(
hasPreviousCommits = commitList.isNotEmpty(),
@ -760,7 +760,7 @@ fun CommitLine(
) {
Box(
modifier = Modifier
.fastClickable(graphNode, logViewModel) { onRevCommitSelected() }
.clickable { onRevCommitSelected() }
) {
val nodeColor = colors[graphNode.lane.position % colors.size]