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 WireSwitch #734

Merged
merged 5 commits into from
Jul 1, 2022
Merged

feat: add WireSwitch #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ce3e30
feat: wire switch
saleniuk Jul 1, 2022
2a57fd2
Merge remote-tracking branch 'origin/develop' into feat/wire_switch
saleniuk Jul 1, 2022
81e3743
add WireSwitch to DebugScreen, fix preview
saleniuk Jul 1, 2022
aaef2f5
add WireSwitch to DebugScreen
saleniuk Jul 1, 2022
f23e79c
Merge remote-tracking branch 'origin/develop' into feat/wire_switch
saleniuk Jul 1, 2022
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
87 changes: 87 additions & 0 deletions app/src/main/kotlin/com/wire/android/ui/common/WireSwitch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
package com.wire.android.ui.common

import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Switch
import androidx.compose.material3.SwitchColors
import androidx.compose.material3.SwitchDefaults
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.tooling.preview.Preview
import com.wire.android.ui.theme.wireColorScheme

@Composable
fun WireSwitch(
checked: Boolean,
onCheckedChange: ((Boolean) -> Unit)?,
modifier: Modifier = Modifier,
thumbContent: @Composable () -> Unit = { },
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
colors: SwitchColors = wireSwitchColors()
) {
Switch(checked, onCheckedChange, modifier, thumbContent, enabled, interactionSource, colors)
}

@Composable
fun wireSwitchColors(
checkedThumbColor: Color = MaterialTheme.wireColorScheme.switchEnabledThumb,
checkedTrackColor: Color = MaterialTheme.wireColorScheme.switchEnabledChecked,
checkedBorderColor: Color = Color.Transparent,
checkedIconColor: Color = MaterialTheme.wireColorScheme.switchEnabledChecked,
uncheckedThumbColor: Color = MaterialTheme.wireColorScheme.switchEnabledThumb,
uncheckedTrackColor: Color = MaterialTheme.wireColorScheme.switchEnabledUnchecked,
uncheckedBorderColor: Color = Color.Transparent,
uncheckedIconColor: Color = MaterialTheme.wireColorScheme.switchEnabledUnchecked,
disabledCheckedThumbColor: Color = MaterialTheme.wireColorScheme.switchDisabledThumb,
disabledCheckedTrackColor: Color = MaterialTheme.wireColorScheme.switchDisabledChecked,
disabledCheckedBorderColor: Color = Color.Transparent,
disabledCheckedIconColor: Color = MaterialTheme.wireColorScheme.switchDisabledChecked,
disabledUncheckedThumbColor: Color = MaterialTheme.wireColorScheme.switchDisabledThumb,
disabledUncheckedTrackColor: Color = MaterialTheme.wireColorScheme.switchDisabledUnchecked,
disabledUncheckedBorderColor: Color = Color.Transparent,
disabledUncheckedIconColor: Color = MaterialTheme.wireColorScheme.switchDisabledUnchecked,
): SwitchColors = SwitchDefaults.colors(
checkedThumbColor = checkedThumbColor,
checkedTrackColor = checkedTrackColor,
checkedBorderColor = checkedBorderColor,
checkedIconColor = checkedIconColor,
uncheckedThumbColor = uncheckedThumbColor,
uncheckedTrackColor = uncheckedTrackColor,
uncheckedBorderColor = uncheckedBorderColor,
uncheckedIconColor = uncheckedIconColor,
disabledCheckedThumbColor = disabledCheckedThumbColor,
disabledCheckedTrackColor = disabledCheckedTrackColor,
disabledCheckedBorderColor = disabledCheckedBorderColor,
disabledCheckedIconColor = disabledCheckedIconColor,
disabledUncheckedThumbColor = disabledUncheckedThumbColor,
disabledUncheckedTrackColor = disabledUncheckedTrackColor,
disabledUncheckedBorderColor = disabledUncheckedBorderColor,
disabledUncheckedIconColor = disabledUncheckedIconColor
)

@Preview("Wire switch on")
@Composable
fun WireSwitchOnPreview() {
WireSwitch(checked = true, onCheckedChange = {})
}

@Preview("Wire switch off")
@Composable
fun WireSwitchOffPreview() {
WireSwitch(checked = false, onCheckedChange = {})
}

@Preview("Wire switch disabled on")
@Composable
fun WireSwitchDisabledOnPreview() {
WireSwitch(checked = true, enabled = false, onCheckedChange = {})
}

@Preview("Wire switch disabled off")
@Composable
fun WireSwitchDisabledOffPreview() {
WireSwitch(checked = false, enabled = false, onCheckedChange = {})
}
66 changes: 48 additions & 18 deletions app/src/main/kotlin/com/wire/android/ui/debugscreen/DebugScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
Expand All @@ -24,6 +23,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.navigation.compose.hiltViewModel
import com.wire.android.ui.common.WireSwitch
import com.wire.android.ui.common.topappbar.WireTopAppBarTitle
import com.wire.android.ui.common.topappbar.wireTopAppBarColors
import com.wire.android.ui.home.conversationslist.common.FolderHeader
Expand All @@ -35,10 +35,31 @@ import com.wire.android.util.startMultipleFileSharingIntent
@Composable
fun DebugScreen() {
val debugScreenViewModel: DebugScreenViewModel = hiltViewModel()
DebugContent(
mlsData = debugScreenViewModel.mlsData,
isLoggingEnabled = debugScreenViewModel.isLoggingEnabled,
setLoggingEnabledState = debugScreenViewModel::setLoggingEnabledState,
logFilePath = debugScreenViewModel::logFilePath,
deleteAllLogs = debugScreenViewModel::deleteAllLogs
)
}

@Composable
fun DebugContent(
mlsData: List<String>,
isLoggingEnabled: Boolean,
setLoggingEnabledState: (Boolean, String) -> Unit,
logFilePath: (String) -> String,
deleteAllLogs: (String) -> Unit
) {
Column {
TopBar(title = "Debug")
ListWithHeader("MLS Data") { debugScreenViewModel.mlsData.map { TextRowItem(it) } }
ListWithHeader("Logs") { LoggingSection(debugScreenViewModel) }
ListWithHeader("MLS Data") {
mlsData.map { TextRowItem(it) }
}
ListWithHeader("Logs") {
LoggingSection(isLoggingEnabled, setLoggingEnabledState, logFilePath, deleteAllLogs)
}
}
}

Expand Down Expand Up @@ -68,9 +89,11 @@ fun ListWithHeader(

@Composable
fun TextRowItem(text: String, @DrawableRes trailingIcon: Int? = null, onIconClick: () -> Unit = {}) {
Row(modifier = Modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.surface)) {
Row(
modifier = Modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.surface)
) {
Text(
text = text,
fontWeight = FontWeight.Normal,
Expand All @@ -96,33 +119,40 @@ fun TextRowItem(text: String, @DrawableRes trailingIcon: Int? = null, onIconClic
}

@Composable
fun LoggingSection(debugScreenViewModel: DebugScreenViewModel) {
fun LoggingSection(
isLoggingEnabled: Boolean,
setLoggingEnabledState: (Boolean, String) -> Unit,
logFilePath: (String) -> String,
deleteAllLogs: (String) -> Unit
) {
val context = LocalContext.current
val absolutePath = context.cacheDir.absolutePath
val absolutePath = context.cacheDir?.absolutePath ?: ""
SwitchRowItem(
text = "Enable Logging", checked = debugScreenViewModel.isLoggingEnabled
text = "Enable Logging", checked = isLoggingEnabled
) { state: Boolean ->
debugScreenViewModel.setLoggingEnabledState(state, absolutePath)
setLoggingEnabledState(state, absolutePath)
}
TextRowItem(
"Share Logs",
trailingIcon = android.R.drawable.ic_menu_share
) { context.startMultipleFileSharingIntent(debugScreenViewModel.logFilePath(absolutePath)) }
) { context.startMultipleFileSharingIntent(logFilePath(absolutePath)) }

TextRowItem(
"Delete All Logs",
trailingIcon = android.R.drawable.ic_delete
) { debugScreenViewModel.deleteAllLogs(absolutePath) }
) { deleteAllLogs(absolutePath) }

}

@Composable
fun SwitchRowItem(
text: String, checked: Boolean = false, onCheckedChange: ((Boolean) -> Unit)?
) {
Row(modifier = Modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.surface)) {
Row(
modifier = Modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.surface)
) {
Text(
text = text,
fontWeight = FontWeight.Normal,
Expand All @@ -133,8 +163,8 @@ fun SwitchRowItem(
textAlign = TextAlign.Left,
fontSize = 14.sp
)
Switch(
modifier = Modifier.defaultMinSize(80.dp),
WireSwitch(
modifier = Modifier.padding(end = 20.dp),
checked = checked,
onCheckedChange = onCheckedChange
)
Expand All @@ -144,5 +174,5 @@ fun SwitchRowItem(
@Preview(showBackground = false)
@Composable
fun debugScreenPreview() {
DebugScreen()
DebugContent(listOf(), true, { _: Boolean, _: String -> }, { "" }, {})
}
28 changes: 23 additions & 5 deletions ...in/com/wire/android/ui/home/conversations/details/options/GroupConversationOptionsItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.ui.unit.dp
import com.wire.android.R
import com.wire.android.model.Clickable
import com.wire.android.ui.common.ArrowRightIcon
import com.wire.android.ui.common.WireSwitch
import com.wire.android.ui.common.button.WireSecondaryButton
import com.wire.android.ui.common.clickable
import com.wire.android.ui.theme.wireColorScheme
Expand All @@ -35,7 +36,7 @@ fun GroupConversationOptionsItem(
label: String? = null,
titleTrailingItem: (@Composable () -> Unit)? = null,
footer: (@Composable () -> Unit)? = null,
enabled: Boolean? = null,
switchState: SwitchState = SwitchState.None,
titleStyle: TextStyle = MaterialTheme.wireTypography.body02,
arrowType: ArrowType = ArrowType.CENTER_ALIGNED,
clickable: Clickable = Clickable(enabled = false, onClick = { /* not handled */ }, onLongClick = { /* not handled */ })
Expand Down Expand Up @@ -64,13 +65,19 @@ fun GroupConversationOptionsItem(
)
if (titleTrailingItem != null)
Box(modifier = Modifier.padding(horizontal = MaterialTheme.wireDimensions.spacing8x)) { titleTrailingItem() }
if (enabled != null)
if (switchState is SwitchState.Visible) {
Text(
text = stringResource(if (enabled) R.string.label_on else R.string.label_off),
text = stringResource(if (switchState.value) R.string.label_on else R.string.label_off),
style = MaterialTheme.wireTypography.body01,
color = MaterialTheme.wireColorScheme.onBackground,
modifier = Modifier.padding(horizontal = MaterialTheme.wireDimensions.spacing8x)
)
WireSwitch(
checked = switchState.value,
enabled = switchState is SwitchState.Enabled,
onCheckedChange = (switchState as? SwitchState.Enabled)?.onCheckedChange
)
}
if (arrowType == ArrowType.TITLE_ALIGNED) ArrowRight()
}
if (subtitle != null)
Expand All @@ -96,6 +103,13 @@ enum class ArrowType {
CENTER_ALIGNED, TITLE_ALIGNED, NONE
}

sealed class SwitchState {
object None : SwitchState()
sealed class Visible(open val value: Boolean = false) : SwitchState()
data class Enabled(override val value: Boolean = false, val onCheckedChange: (Boolean) -> Unit) : Visible(value)
data class Disabled(override val value: Boolean = false) : Visible(value)
}

@Composable
@Preview(name = "Item with label and title")
fun GroupConversationOptionsWithLabelAndTitlePreview() {
Expand All @@ -105,7 +119,11 @@ fun GroupConversationOptionsWithLabelAndTitlePreview() {
@Composable
@Preview(name = "Item with title and switch clickable")
fun GroupConversationOptionsWithTitleAndSwitchClickablePreview() {
GroupConversationOptionsItem(title = "Services", enabled = true, clickable = Clickable(onClick = {}, onLongClick = {}))
GroupConversationOptionsItem(
title = "Services",
switchState = SwitchState.Enabled(value = true, onCheckedChange = {}),
clickable = Clickable(onClick = {}, onLongClick = {})
)
}

@Composable
Expand All @@ -131,7 +149,7 @@ fun GroupConversationOptionsWithTitleAndSubtitleAndSwitchAndFooterButtonPreview(
GroupConversationOptionsItem(
title = "Guests",
subtitle = "Turn this option ON to open this conversation to people outside your team, even if they don't have Wire.",
enabled = false,
switchState = SwitchState.Disabled(false),
footer = { WireSecondaryButton(text = "Copy link", onClick = {}, modifier = Modifier.height(32.dp), fillMaxWidth = false) },
arrowType = ArrowType.TITLE_ALIGNED
)
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/kotlin/com/wire/android/ui/theme/WireColorScheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ data class WireColorScheme(
val tertiaryButtonSelected: Color, val onTertiaryButtonSelected: Color,
val tertiaryButtonSelectedOutline: Color,
val tertiaryButtonRipple: Color,
val switchEnabledThumb: Color, val switchDisabledThumb: Color,
val switchEnabledChecked: Color, val switchDisabledChecked: Color,
val switchEnabledUnchecked: Color, val switchDisabledUnchecked: Color,
val divider: Color,
val secondaryText: Color,
val labelText: Color,
Expand Down Expand Up @@ -105,6 +108,9 @@ private val LightWireColorScheme = WireColorScheme(
tertiaryButtonSelected = WireColorPalette.LightBlue50, onTertiaryButtonSelected = WireColorPalette.LightBlue500,
tertiaryButtonSelectedOutline = WireColorPalette.LightBlue300,
tertiaryButtonRipple = Color.Black,
switchEnabledThumb = Color.White, switchDisabledThumb = WireColorPalette.Gray20,
switchEnabledChecked = WireColorPalette.LightGreen500, switchDisabledChecked = WireColorPalette.LightGreen200,
switchEnabledUnchecked = WireColorPalette.Gray70, switchDisabledUnchecked = WireColorPalette.Gray50,
divider = WireColorPalette.Gray40,
secondaryText = WireColorPalette.Gray70,
labelText = WireColorPalette.Gray80,
Expand Down Expand Up @@ -189,6 +195,9 @@ private val DarkWireColorScheme = WireColorScheme(
tertiaryButtonSelected = WireColorPalette.DarkBlue50, onTertiaryButtonSelected = WireColorPalette.DarkBlue500,
tertiaryButtonSelectedOutline = WireColorPalette.DarkBlue300,
tertiaryButtonRipple = Color.White,
switchEnabledThumb = Color.Black, switchDisabledThumb = WireColorPalette.Gray90,
switchEnabledChecked = WireColorPalette.DarkGreen500, switchDisabledChecked = WireColorPalette.DarkGreen200,
switchEnabledUnchecked = WireColorPalette.Gray40, switchDisabledUnchecked = WireColorPalette.Gray60,
divider = WireColorPalette.Gray70,
secondaryText = WireColorPalette.Gray40,
labelText = WireColorPalette.Gray30,
Expand Down