Skip to content

Commit

Permalink
feat(sketch): draw sketchs epic (#2905)
Browse files Browse the repository at this point in the history
Signed-off-by: yamilmedina <yamilmedina@users.noreply.github.com>
  • Loading branch information
yamilmedina authored Apr 17, 2024
1 parent 9169847 commit 41f33b7
Show file tree
Hide file tree
Showing 39 changed files with 1,505 additions and 349 deletions.
17 changes: 0 additions & 17 deletions app/src/main/kotlin/com/wire/android/ui/common/AppExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

package com.wire.android.ui.common

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.shape.RoundedCornerShape
Expand All @@ -40,7 +38,6 @@ import androidx.lifecycle.flowWithLifecycle
import com.google.accompanist.placeholder.PlaceholderHighlight
import com.google.accompanist.placeholder.placeholder
import com.google.accompanist.placeholder.shimmer
import com.wire.android.model.Clickable
import com.wire.android.ui.home.conversations.model.messagetypes.asset.UIAssetMessage
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.ui.theme.wireDimensions
Expand Down Expand Up @@ -82,20 +79,6 @@ fun Modifier.shimmerPlaceholder(
shape = shape,
)

@OptIn(ExperimentalFoundationApi::class)
@Composable
fun Modifier.clickable(clickable: Clickable?) = clickable?.let {
val onClick = rememberClickBlockAction(clickable.clickBlockParams, clickable.onClick)
val onLongClick = clickable.onLongClick?.let { onLongClick ->
rememberClickBlockAction(clickable.clickBlockParams, onLongClick)
}
this.combinedClickable(
enabled = clickable.enabled,
onClick = onClick,
onLongClick = onLongClick
)
} ?: this

@Composable
fun <T> rememberFlow(
flow: Flow<T>,
Expand Down
174 changes: 174 additions & 0 deletions app/src/main/kotlin/com/wire/android/ui/common/PreviewWireDialog.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
/*
* Wire
* Copyright (C) 2024 Wire Swiss GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
package com.wire.android.ui.common

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview
import com.wire.android.ui.common.button.WireButtonState
import com.wire.android.ui.common.textfield.WirePasswordTextField
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireTypography

@Preview(showBackground = true)
@Composable
fun PreviewWireDialog() {
var password by remember { mutableStateOf(TextFieldValue("")) }
WireTheme {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier.fillMaxWidth()
) {
WireDialogContent(
optionButton1Properties = WireDialogButtonProperties(
text = "OK",
onClick = { },
type = WireDialogButtonType.Primary,
state = if (password.text.isEmpty()) WireButtonState.Disabled else WireButtonState.Error,
),
dismissButtonProperties = WireDialogButtonProperties(
text = "Cancel",
onClick = { }
),
title = "title",
text = buildAnnotatedString {
val style = SpanStyle(
color = colorsScheme().onBackground,
fontWeight = MaterialTheme.wireTypography.body01.fontWeight,
fontSize = MaterialTheme.wireTypography.body01.fontSize,
fontFamily = MaterialTheme.wireTypography.body01.fontFamily,
fontStyle = MaterialTheme.wireTypography.body01.fontStyle
)
withStyle(style) { append("text\nsecond line\nthirdLine\nfourth line\nfifth line\nsixth line\nseventh line") }
},
) {
WirePasswordTextField(
value = password,
onValueChange = { password = it },
autofill = false
)
}
}
}
}

@OptIn(ExperimentalComposeUiApi::class)
@Preview(showBackground = true)
@Composable
fun PreviewWireDialogWith2OptionButtons() {
var password by remember { mutableStateOf(TextFieldValue("")) }
WireTheme {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier.fillMaxWidth()
) {
WireDialogContent(
optionButton1Properties = WireDialogButtonProperties(
text = "OK",
onClick = { },
type = WireDialogButtonType.Primary,
state = if (password.text.isEmpty()) WireButtonState.Disabled else WireButtonState.Error,
),
optionButton2Properties = WireDialogButtonProperties(
text = "Later",
onClick = { },
type = WireDialogButtonType.Primary,
state = if (password.text.isEmpty()) WireButtonState.Disabled else WireButtonState.Error,
),
dismissButtonProperties = WireDialogButtonProperties(
text = "Cancel",
onClick = { }
),
title = "title",
text = buildAnnotatedString {
val style = SpanStyle(
color = colorsScheme().onBackground,
fontWeight = MaterialTheme.wireTypography.body01.fontWeight,
fontSize = MaterialTheme.wireTypography.body01.fontSize,
fontFamily = MaterialTheme.wireTypography.body01.fontFamily,
fontStyle = MaterialTheme.wireTypography.body01.fontStyle
)
withStyle(style) { append("text") }
},
buttonsHorizontalAlignment = false
) {
WirePasswordTextField(
value = password,
onValueChange = { password = it },
autofill = true
)
}
}
}
}

@Preview(showBackground = true)
@Composable
fun PreviewWireDialogCentered() {
var password by remember { mutableStateOf(TextFieldValue("")) }
WireTheme {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier.fillMaxWidth()
) {
WireDialogContent(
optionButton1Properties = WireDialogButtonProperties(
text = "OK",
onClick = { },
type = WireDialogButtonType.Primary,
state = if (password.text.isEmpty()) WireButtonState.Disabled else WireButtonState.Error,
),
dismissButtonProperties = WireDialogButtonProperties(
text = "Cancel",
onClick = { }
),
centerContent = true,
title = "title",
text = buildAnnotatedString {
val style = SpanStyle(
color = colorsScheme().onBackground,
fontWeight = MaterialTheme.wireTypography.body01.fontWeight,
fontSize = MaterialTheme.wireTypography.body01.fontSize,
fontFamily = MaterialTheme.wireTypography.body01.fontFamily,
fontStyle = MaterialTheme.wireTypography.body01.fontStyle
)
withStyle(style) { append("text\nsecond line\nthirdLine\nfourth line\nfifth line\nsixth line\nseventh line") }
},
) {
WirePasswordTextField(
value = password,
onValueChange = { password = it },
autofill = false
)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Wire
* Copyright (C) 2024 Wire Swiss GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
package com.wire.android.ui.common.bottomsheet

import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.size
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import com.wire.android.R
import com.wire.android.ui.common.ArrowRightIcon
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.theme.wireTypography

@Preview
@Composable
fun PreviewMenuBottomSheetItem() {
MenuBottomSheetItem(
title = "very long looooooong title",
icon = {
MenuItemIcon(
id = R.drawable.ic_erase,
contentDescription = "",
)
},
action = {
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = "very long looooooong action",
style = MaterialTheme.wireTypography.body01,
overflow = TextOverflow.Ellipsis,
maxLines = 1,
modifier = Modifier.weight(weight = 1f, fill = false)
)
Spacer(modifier = Modifier.size(dimensions().spacing16x))
ArrowRightIcon()
}
}
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Wire
* Copyright (C) 2024 Wire Swiss GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
package com.wire.android.ui.common.bottomsheet

import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.wire.android.ui.common.colorsScheme
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.edit.ReactionOption
import com.wire.android.ui.home.conversationslist.common.GroupConversationAvatar

@Preview
@Composable
fun PreviewMenuModalSheetContentWithoutHeader() {
MenuModalSheetContent(
MenuModalSheetHeader.Gone,
listOf { ReactionOption({}) }
)
}

@Preview
@Composable
fun PreviewMenuModalSheetContentWithHeader() {
MenuModalSheetContent(
MenuModalSheetHeader.Visible("Title", { GroupConversationAvatar(colorsScheme().primary) }, dimensions().spacing8x),
listOf { ReactionOption({}) }
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package com.wire.android.ui.home.conversations.info

import com.wire.android.model.ImageAsset
import com.wire.android.util.CurrentConversationDetailsCache
import com.wire.android.util.ui.UIText
import com.wire.kalium.logic.data.conversation.Conversation
import com.wire.kalium.logic.data.id.QualifiedID
Expand All @@ -37,7 +38,11 @@ data class ConversationInfoViewState(
val mlsVerificationStatus: Conversation.VerificationStatus? = null,
val proteusVerificationStatus: Conversation.VerificationStatus? = null,
val legalHoldStatus: Conversation.LegalHoldStatus = Conversation.LegalHoldStatus.UNKNOWN,
)
) {
init {
CurrentConversationDetailsCache.updateConversationName(conversationName)
}
}

sealed class ConversationDetailsData {
data object None : ConversationDetailsData()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import com.wire.android.ui.home.messagecomposer.state.AdditionalOptionSelectItem
import com.wire.android.ui.home.messagecomposer.state.AdditionalOptionSubMenuState
import com.wire.android.ui.home.messagecomposer.state.MessageComposerStateHolder
import com.wire.android.ui.home.messagecomposer.state.MessageCompositionType
import com.wire.android.util.CurrentConversationDetailsCache
import com.wire.android.util.permission.PermissionDenialType
import com.wire.kalium.logic.data.conversation.Conversation
import com.wire.kalium.logic.data.id.ConversationId
Expand Down Expand Up @@ -260,10 +261,7 @@ fun EnabledMessageComposer(
additionalOptionStateHolder.toRichTextEditing()
},
onCloseRichEditingButtonClicked = additionalOptionStateHolder::toAttachmentAndAdditionalOptionsMenu,
onDrawingModeClicked = {
inputStateHolder.collapseComposer()
additionalOptionStateHolder.toDrawingMode()
}
onDrawingModeClicked = additionalOptionStateHolder::toDrawingMode
)
}
Box(
Expand Down Expand Up @@ -302,7 +300,12 @@ fun EnabledMessageComposer(
onDismissSketch = {
inputStateHolder.collapseComposer(additionalOptionStateHolder.additionalOptionsSubMenuState)
},
onSendSketch = onSendButtonClicked
onSendSketch = {
onAttachmentPicked(UriAsset(it))
inputStateHolder.collapseComposer(additionalOptionStateHolder.additionalOptionsSubMenuState)
},
conversationTitle = CurrentConversationDetailsCache.conversationName.asString(),
tempWritableImageUri = tempWritableImageUri
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,15 @@

package com.wire.android.ui.server

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties
import com.wire.android.R
import com.wire.android.ui.common.WireDialog
import com.wire.android.ui.common.WireDialogButtonProperties
import com.wire.android.ui.common.WireDialogButtonType
import com.wire.android.ui.theme.WireTheme

@OptIn(ExperimentalComposeUiApi::class)
@Composable
private fun ApiVersioningDialog(
title: String,
Expand Down
Loading

0 comments on commit 41f33b7

Please sign in to comment.