Skip to content
This repository was archived by the owner on Aug 21, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
package com.gravatar.app.homeUi.presentation.home.share

internal sealed class ShareEvent
internal sealed class ShareEvent {
data class OnEmailValueChanged(val value: String) : ShareEvent()
data class OnEmailSharingChanged(val isShared: Boolean) : ShareEvent()
data class OnPhoneValueChanged(val value: String) : ShareEvent()
data class OnPhoneSharingChanged(val isShared: Boolean) : ShareEvent()
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.gravatar.app.homeUi.presentation.home.share
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.SnackbarHostState
Expand All @@ -11,9 +12,11 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.lifecycle.ViewModelStoreOwner
import com.gravatar.app.design.theme.GravatarAppTheme
import com.gravatar.app.homeUi.presentation.home.share.components.ShareHeader
import com.gravatar.app.homeUi.presentation.home.share.components.SharePrivateContactInfo
import org.koin.androidx.compose.koinViewModel

@Suppress("UnusedParameter")
Expand All @@ -33,7 +36,6 @@ internal fun ShareScreen(
)
}

@Suppress("UnusedParameter")
@Composable
internal fun ShareScreen(uiState: ShareUiState, onEvent: (ShareEvent) -> Unit) {
Column(
Expand All @@ -46,6 +48,15 @@ internal fun ShareScreen(uiState: ShareUiState, onEvent: (ShareEvent) -> Unit) {
modifier = Modifier
.fillMaxWidth()
)

SharePrivateContactInfo(
privateContactInfo = uiState.privateContactInfo,
onEmailValueChange = { onEvent(ShareEvent.OnEmailValueChanged(it)) },
onEmailSwitchCheckedChange = { onEvent(ShareEvent.OnEmailSharingChanged(it)) },
onPhoneValueChange = { onEvent(ShareEvent.OnPhoneValueChanged(it)) },
onPhoneSwitchCheckedChange = { onEvent(ShareEvent.OnPhoneSharingChanged(it)) },
modifier = Modifier.padding(16.dp),
)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,12 @@ import com.gravatar.restapi.models.Profile
internal data class ShareUiState(
val profile: Profile? = null,
val avatarUrl: String? = null,
val privateContactInfo: PrivateContactInfo = PrivateContactInfo()
)

internal data class PrivateContactInfo(
val emailValue: String = "",
val isEmailShared: Boolean = false,
val phoneValue: String = "",
val isPhoneShared: Boolean = false
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,46 @@ internal class ShareViewModel(
collectAvatarUrl()
}

@Suppress("UnusedParameter")
fun onEvent(shareEvent: ShareEvent) = Unit
fun onEvent(shareEvent: ShareEvent) {
when (shareEvent) {
is ShareEvent.OnEmailValueChanged -> {
_uiState.update {
it.copy(
privateContactInfo = it.privateContactInfo.copy(
emailValue = shareEvent.value
)
)
}
}
is ShareEvent.OnEmailSharingChanged -> {
_uiState.update {
it.copy(
privateContactInfo = it.privateContactInfo.copy(
isEmailShared = shareEvent.isShared
)
)
}
}
is ShareEvent.OnPhoneValueChanged -> {
_uiState.update {
it.copy(
privateContactInfo = it.privateContactInfo.copy(
phoneValue = shareEvent.value
)
)
}
}
is ShareEvent.OnPhoneSharingChanged -> {
_uiState.update {
it.copy(
privateContactInfo = it.privateContactInfo.copy(
isPhoneShared = shareEvent.isShared
)
)
}
}
}
}

private fun collectAvatarUrl() {
getAvatarUrl()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
package com.gravatar.app.homeUi.presentation.home.share.components

import androidx.annotation.StringRes
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.gravatar.app.homeUi.R

@Composable
internal fun ShareEditableField(
@StringRes placeholder: Int,
value: String,
onValueChange: (String) -> Unit,
switchChecked: Boolean,
onSwitchCheckedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier
) {
Row(
modifier = modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(16.dp),
) {
BasicTextField(
value = value,
onValueChange = onValueChange,
textStyle = MaterialTheme.typography.bodyLarge.copy(color = MaterialTheme.colorScheme.onSurface),
singleLine = true,
cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
modifier = Modifier.weight(1f),
decorationBox = { innerTextField ->
Box(
modifier = Modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.surfaceContainerHigh, RoundedCornerShape(8.dp))
.padding(horizontal = 12.dp, vertical = 12.dp)
) {
if (value.isEmpty()) {
Text(
text = stringResource(placeholder),
style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
innerTextField()
}
}
)
Switch(
checked = switchChecked,
onCheckedChange = onSwitchCheckedChange,
)
}
}

@Preview
@Composable
private fun ShareEditableInfoPreview() {
ShareEditableField(
placeholder = R.string.share_tab_private_contact_email_placeholder,
value = "gravatar@a8c.com",
onValueChange = {},
switchChecked = true,
onSwitchCheckedChange = {}
)
}

@Preview
@Composable
private fun ShareEditableInfoEmptyPreview() {
ShareEditableField(
placeholder = R.string.share_tab_private_contact_phone_number_placeholder,
value = "",
onValueChange = {},
switchChecked = false,
onSwitchCheckedChange = {}
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package com.gravatar.app.homeUi.presentation.home.share.components

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.gravatar.app.homeUi.R
import com.gravatar.app.homeUi.presentation.home.share.PrivateContactInfo

@Composable
internal fun SharePrivateContactInfo(
privateContactInfo: PrivateContactInfo,
onEmailValueChange: (String) -> Unit,
onEmailSwitchCheckedChange: (Boolean) -> Unit,
onPhoneValueChange: (String) -> Unit,
onPhoneSwitchCheckedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier
) {
Column(verticalArrangement = Arrangement.spacedBy(16.dp), modifier = modifier) {
ShareSectionTitle(
leftIcon = R.drawable.share_section_title_warning,
title = R.string.share_tab_private_contact_info_title,
rightIcon = R.drawable.share_section_title_lock,
modifier = Modifier.fillMaxWidth()
)
ShareEditableField(
placeholder = R.string.share_tab_private_contact_email_placeholder,
value = privateContactInfo.emailValue,
onValueChange = onEmailValueChange,
switchChecked = privateContactInfo.isEmailShared,
onSwitchCheckedChange = onEmailSwitchCheckedChange,
)
ShareEditableField(
placeholder = R.string.share_tab_private_contact_phone_number_placeholder,
value = privateContactInfo.phoneValue,
onValueChange = onPhoneValueChange,
switchChecked = privateContactInfo.isPhoneShared,
onSwitchCheckedChange = onPhoneSwitchCheckedChange,
)
}
}

@Preview(showBackground = true)
@Composable
private fun SharePrivateContactInfoPreview() {
SharePrivateContactInfo(
privateContactInfo = PrivateContactInfo(
emailValue = "example@email.com",
isEmailShared = true,
phoneValue = "123-456-7890",
isPhoneShared = false
),
onEmailValueChange = {},
onEmailSwitchCheckedChange = {},
onPhoneValueChange = {},
onPhoneSwitchCheckedChange = {}
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package com.gravatar.app.homeUi.presentation.home.share.components

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.BasicText
import androidx.compose.foundation.text.TextAutoSize
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.gravatar.app.design.theme.GravatarAppTheme
import com.gravatar.app.homeUi.R

@Composable
internal fun ShareSectionTitle(
@DrawableRes leftIcon: Int?,
@StringRes title: Int,
@DrawableRes rightIcon: Int?,
modifier: Modifier = Modifier
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier.fillMaxWidth()
) {
leftIcon?.let {
Icon(
painter = painterResource(id = it),
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
modifier = Modifier.padding(end = 6.dp)
)
}
BasicText(
text = stringResource(title),
style = MaterialTheme.typography.bodySmall.copy(
color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
),
overflow = TextOverflow.Ellipsis,
maxLines = 1,
autoSize = TextAutoSize.StepBased(
maxFontSize = 16.sp
),
modifier = Modifier.weight(1f),
)
rightIcon?.let {
Icon(
painter = painterResource(id = it),
contentDescription = null,
modifier = Modifier.padding(end = 12.dp),
)
}
}
}

@Preview(showBackground = true)
@Composable
private fun ShareSectionTitlePreview() {
GravatarAppTheme {
ShareSectionTitle(
leftIcon = R.drawable.share_section_title_warning,
title = R.string.share_tab_private_contact_info_title,
rightIcon = R.drawable.share_section_title_lock,
modifier = Modifier.fillMaxWidth()
)
}
}
13 changes: 13 additions & 0 deletions homeUi/src/main/res/drawable/share_section_title_lock.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path
android:pathData="M0,0h24v24h-24z"/>
<path
android:pathData="M17,10H15.8V7C15.8,4.9 14.1,3.2 12,3.2C9.9,3.2 8.2,4.9 8.2,7V10H7C6.4,10 6,10.4 6,11V19C6,19.6 6.4,20 7,20H17C17.6,20 18,19.6 18,19V11C18,10.4 17.6,10 17,10ZM14.2,10H9.8V7C9.8,5.8 10.8,4.8 12,4.8C13.2,4.8 14.2,5.8 14.2,7V10Z"
android:fillColor="#000000"/>
</group>
</vector>
9 changes: 9 additions & 0 deletions homeUi/src/main/res/drawable/share_section_title_warning.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:pathData="M480,680q17,0 28.5,-11.5T520,640q0,-17 -11.5,-28.5T480,600q-17,0 -28.5,11.5T440,640q0,17 11.5,28.5T480,680ZM440,520h80v-240h-80v240ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,800q134,0 227,-93t93,-227q0,-134 -93,-227t-227,-93q-134,0 -227,93t-93,227q0,134 93,227t227,93ZM480,480Z"
android:fillColor="#e8eaed"/>
</vector>
4 changes: 3 additions & 1 deletion homeUi/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,7 @@
<string name="gravatar_tab_no_avatar_selected_info">No avatar selected. Showing the default avatar.</string>
<string name="home_no_internet_available">No internet connection</string>
<string name="share_tab_scan_qr_code">Let others scan this QR code to share your contact information.</string>

<string name="share_tab_private_contact_info_title">Share Private Contact Info</string>
<string name="share_tab_private_contact_email_placeholder">Email</string>
<string name="share_tab_private_contact_phone_number_placeholder">Phone Number</string>
</resources>
Loading