Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add haptic feedback #1457

Open
wants to merge 6 commits into
base: compose-dev
Choose a base branch
from
Open

feat: add haptic feedback #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4707086
feat: add haptic feedback
BenjaminHalko Nov 2, 2023
2e27eda
Merge branch 'compose-dev' into feat/haptic-compose
BenjaminHalko Nov 22, 2023
ce2fa16
Update OptionFields.kt
BenjaminHalko Nov 22, 2023
60ea658
Merge branch 'compose-dev' into feat/haptic-compose
BenjaminHalko Dec 16, 2023
3bdd4dd
Updated Haptics
BenjaminHalko Dec 16, 2023
59bc515
Update app/src/main/java/app/revanced/manager/ui/screen/PatchesSelect…
BenjaminHalko Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/app/revanced/manager/ui/component/AutoUpdatesDialog.kt
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Source
import androidx.compose.material.icons.outlined.Update
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Checkbox
import androidx.compose.material3.Divider
import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem
Expand All @@ -28,6 +27,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import app.revanced.manager.R
import app.revanced.manager.ui.component.haptics.HapticCheckbox

@Composable
fun AutoUpdatesDialog(onSubmit: (Boolean, Boolean) -> Unit) {
Expand Down Expand Up @@ -105,7 +105,7 @@ private fun AutoUpdatesItem(
)
},
trailingContent = {
Checkbox(
HapticCheckbox(
checked = checked,
onCheckedChange = onCheckedChange
)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
View file
Open in desktop
Expand Up @@ -14,7 +14,6 @@ import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand All @@ -27,6 +26,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import app.revanced.manager.R
import app.revanced.manager.ui.component.TextInputDialog
import app.revanced.manager.ui.component.haptics.HapticSwitch
import app.revanced.manager.util.isDebuggable

@Composable
Expand Down Expand Up @@ -119,7 +119,7 @@ fun BaseBundleDialog(
headlineText = stringResource(R.string.automatically_update),
supportingText = stringResource(R.string.automatically_update_description),
trailingContent = {
Switch(
HapticSwitch(
checked = autoUpdate,
onCheckedChange = onAutoUpdateChange
)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.ErrorOutline
import androidx.compose.material.icons.outlined.Warning
import androidx.compose.material3.Checkbox
import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme
Expand All @@ -28,6 +27,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import app.revanced.manager.R
import app.revanced.manager.domain.bundles.PatchBundleSource
import app.revanced.manager.domain.bundles.PatchBundleSource.Companion.propsOrNullFlow
import app.revanced.manager.ui.component.haptics.HapticCheckbox
import kotlinx.coroutines.flow.map

@OptIn(ExperimentalFoundationApi::class)
Expand Down Expand Up @@ -72,7 +72,7 @@ fun BundleItem(
),
leadingContent = {
if(selectable) {
Checkbox(
HapticCheckbox(
checked = isBundleSelected,
onCheckedChange = toggleSelection,
)
Expand Down
41 changes: 41 additions & 0 deletions app/src/main/java/app/revanced/manager/ui/component/haptics/HapticCheckbox.kt
View file
Open in desktop
@@ -0,0 +1,41 @@
package app.revanced.manager.ui.component.haptics

import android.os.Build
import android.view.HapticFeedbackConstants
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.runtime.Composable
import androidx.compose.material3.Checkbox
import androidx.compose.material3.CheckboxColors
import androidx.compose.material3.CheckboxDefaults
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalView

@Composable
fun HapticCheckbox (
checked: Boolean,
onCheckedChange: ((Boolean) -> Unit)?,
modifier: Modifier = Modifier,
enabled: Boolean = true,
colors: CheckboxColors = CheckboxDefaults.colors(),
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
) {
val checkedState = remember { mutableStateOf(checked) }

// Perform haptic feedback
if (checkedState.value != checked) {
val view = LocalView.current
view.performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)
checkedState.value = checked
}

Checkbox(
checked = checked,
onCheckedChange = onCheckedChange,
modifier = modifier,
enabled = enabled,
colors = colors,
interactionSource = interactionSource
)
}
49 changes: 49 additions & 0 deletions ...main/java/app/revanced/manager/ui/component/haptics/HapticExtendedFloatingActionButton.kt
View file
Open in desktop
@@ -0,0 +1,49 @@
package app.revanced.manager.ui.component.haptics

import android.view.HapticFeedbackConstants
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.RowScope
import androidx.compose.material3.ExtendedFloatingActionButton
import androidx.compose.material3.FloatingActionButtonDefaults
import androidx.compose.material3.FloatingActionButtonElevation
import androidx.compose.material3.contentColorFor
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.platform.LocalView

@Composable
fun HapticExtendedFloatingActionButton (
text: @Composable () -> Unit,
icon: @Composable () -> Unit,
onClick: () -> Unit,
modifier: Modifier = Modifier,
expanded: Boolean = true,
shape: Shape = FloatingActionButtonDefaults.extendedFabShape,
containerColor: Color = FloatingActionButtonDefaults.containerColor,
contentColor: Color = contentColorFor(containerColor),
elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(),
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
) {
val view = LocalView.current

ExtendedFloatingActionButton(
text = text,
icon = icon,
onClick = {
// Perform haptic feedback
view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)

onClick()
},
modifier = modifier,
expanded = expanded,
shape = shape,
containerColor = containerColor,
contentColor = contentColor,
elevation = elevation,
interactionSource = interactionSource
)
}
44 changes: 44 additions & 0 deletions app/src/main/java/app/revanced/manager/ui/component/haptics/HapticFloatingActionButton.kt
View file
Open in desktop
@@ -0,0 +1,44 @@
package app.revanced.manager.ui.component.haptics

import android.view.HapticFeedbackConstants
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.FloatingActionButtonDefaults
import androidx.compose.material3.FloatingActionButtonElevation
import androidx.compose.material3.contentColorFor
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.platform.LocalView

@Composable
fun HapticFloatingActionButton (
onClick: () -> Unit,
modifier: Modifier = Modifier,
shape: Shape = FloatingActionButtonDefaults.shape,
containerColor: Color = FloatingActionButtonDefaults.containerColor,
contentColor: Color = contentColorFor(containerColor),
elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(),
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
content: @Composable () -> Unit,
) {
val view = LocalView.current

FloatingActionButton(
onClick = {
// Perform haptic feedback
view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)

onClick()
},
modifier = modifier,
shape = shape,
containerColor = containerColor,
contentColor = contentColor,
elevation = elevation,
interactionSource = interactionSource,
content = content
)
}
47 changes: 47 additions & 0 deletions app/src/main/java/app/revanced/manager/ui/component/haptics/HapticRadioButton.kt
View file
Open in desktop
@@ -0,0 +1,47 @@
package app.revanced.manager.ui.component.haptics

import android.view.HapticFeedbackConstants
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.RowScope
import androidx.compose.material3.RadioButton
import androidx.compose.material3.RadioButtonColors
import androidx.compose.material3.RadioButtonDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalView

@Composable
fun HapticRadioButton (
selected: Boolean,
onClick: (() -> Unit)?,
modifier: Modifier = Modifier,
enabled: Boolean = true,
colors: RadioButtonColors = RadioButtonDefaults.colors(),
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
) {
val selectedState = remember { mutableStateOf(selected) }

// Perform haptic feedback
if (selectedState.value != selected) {
if (selected) {
val view = LocalView.current
view.performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)
}
selectedState.value = selected
}

RadioButton(
selected = selected,
onClick = onClick,
modifier = modifier,
enabled = enabled,
colors = colors,
interactionSource = interactionSource
)
}
46 changes: 46 additions & 0 deletions app/src/main/java/app/revanced/manager/ui/component/haptics/HapticSwitch.kt
View file
Open in desktop
@@ -0,0 +1,46 @@
package app.revanced.manager.ui.component.haptics
import android.os.Build
import android.view.HapticFeedbackConstants
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.material3.Switch
import androidx.compose.material3.SwitchColors
import androidx.compose.material3.SwitchDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalView

@Composable
fun HapticSwitch(
checked: Boolean,
onCheckedChange: ((Boolean) -> Unit),
modifier: Modifier = Modifier,
thumbContent: (@Composable () -> Unit)? = null,
enabled: Boolean = true,
colors: SwitchColors = SwitchDefaults.colors(),
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
) {
val checkedState = remember { mutableStateOf(checked) }

// Perform haptic feedback
if (checkedState.value != checked) {
val view = LocalView.current
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
view.performHapticFeedback(if (checked) HapticFeedbackConstants.TOGGLE_ON else HapticFeedbackConstants.TOGGLE_OFF)
} else {
view.performHapticFeedback(if (checked) HapticFeedbackConstants.VIRTUAL_KEY else HapticFeedbackConstants.CLOCK_TICK)
}
checkedState.value = checked
}

Switch(
checked = checked,
onCheckedChange = onCheckedChange,
modifier = modifier,
thumbContent = thumbContent,
enabled = enabled,
colors = colors,
interactionSource = interactionSource,
)
}
43 changes: 43 additions & 0 deletions app/src/main/java/app/revanced/manager/ui/component/haptics/HapticTab.kt
View file
Open in desktop
@@ -0,0 +1,43 @@
package app.revanced.manager.ui.component.haptics

import android.view.HapticFeedbackConstants
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.Tab
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalView

@Composable
fun HapticTab (
selected: Boolean,
onClick: () -> Unit,
modifier: Modifier = Modifier,
enabled: Boolean = true,
text: @Composable (() -> Unit)? = null,
icon: @Composable (() -> Unit)? = null,
selectedContentColor: Color = LocalContentColor.current,
unselectedContentColor: Color = selectedContentColor,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
) {
val view = LocalView.current

Tab(
selected = selected,
onClick = {
// Perform haptic feedback
view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)

onClick()
},
modifier = modifier,
enabled = enabled,
text = text,
icon = icon,
selectedContentColor = selectedContentColor,
unselectedContentColor = unselectedContentColor,
interactionSource = interactionSource
)
}
6 changes: 3 additions & 3 deletions app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
View file
Open in desktop
Expand Up @@ -11,7 +11,6 @@ import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.material3.ListItem
import androidx.compose.material3.OutlinedTextField
Expand All @@ -28,6 +27,7 @@ import androidx.compose.ui.res.stringResource
import app.revanced.manager.R
import app.revanced.manager.data.platform.Filesystem
import app.revanced.manager.patcher.patch.Option
import app.revanced.manager.ui.component.haptics.HapticSwitch
import app.revanced.manager.util.toast
import org.koin.compose.rememberKoinInject

Expand Down Expand Up @@ -152,7 +152,7 @@ private val optionImplementations = mapOf<String, OptionImpl>(
option = option,
onClick = { setValue(!current) }
) {
Switch(checked = current, onCheckedChange = setValue)
HapticSwitch(checked = current, onCheckedChange = setValue)
}
},
"String" to { option, value, setValue ->
Expand All @@ -179,7 +179,7 @@ private val optionImplementations = mapOf<String, OptionImpl>(

OptionListItem(
option = option,
onClick = ::showInputDialog
onClick = ::showInputDialog,
) {
IconButton(onClick = ::showInputDialog) {
Icon(
Expand Down