diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-12-10 16:20:48 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-12-11 10:24:12 +0100 |
| commit | 5f74f103a81e4b825417cd76fe4e3a67e9feea99 (patch) | |
| tree | 4299a8383b0d6328e0ad58e8e2d0b07a7543209f /android/app/src/main | |
| parent | 8024c160c25e656ff5ec6e9f3f45eecd131bea01 (diff) | |
| download | mullvadvpn-5f74f103a81e4b825417cd76fe4e3a67e9feea99.tar.xz mullvadvpn-5f74f103a81e4b825417cd76fe4e3a67e9feea99.zip | |
Fix click action on headers in obfuscation sub-settings screens
Diffstat (limited to 'android/app/src/main')
3 files changed, 4 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt index 7eb6f48569..17c4d24460 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt @@ -61,7 +61,7 @@ internal fun BaseCell( headlineContent: @Composable RowScope.() -> Unit, bodyView: @Composable ColumnScope.() -> Unit = {}, isRowEnabled: Boolean = true, - onCellClicked: () -> Unit = {}, + onCellClicked: (() -> Unit)? = null, background: Color = MaterialTheme.colorScheme.primary, startPadding: Dp = Dimens.cellStartPadding, endPadding: Dp = Dimens.cellEndPadding, @@ -76,7 +76,7 @@ internal fun BaseCell( // This is to avoid a crash when a child view is focused and clickable is set to // false on the parent view .then( - if (isRowEnabled) { + if (isRowEnabled && onCellClicked != null) { Modifier.clickable(onClick = onCellClicked) } else { Modifier diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt index f4715ff949..594b4f1ccd 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt @@ -41,7 +41,7 @@ fun InformationComposeCell( title: String, isEnabled: Boolean = true, background: Color = MaterialTheme.colorScheme.primary, - onCellClicked: () -> Unit = {}, + onCellClicked: (() -> Unit)? = null, onInfoClicked: (() -> Unit)? = null, testTag: String = "", ) { diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/Udp2TcpSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/Udp2TcpSettingsScreen.kt index b77a8016bf..436d8c9020 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/Udp2TcpSettingsScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/Udp2TcpSettingsScreen.kt @@ -64,6 +64,7 @@ fun Udp2TcpSettingsScreen( InformationComposeCell( title = stringResource(R.string.port), onInfoClicked = navigateUdp2TcpInfo, + onCellClicked = navigateUdp2TcpInfo, ) } itemWithDivider { |