Create PrivateContactInfo to contain all the info

hamorillo · hamorillo · commit 4b78b232b0f9 · 2025-07-23T12:57:14.000+02:00
diff --git a/homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/ShareScreen.kt b/homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/ShareScreen.kt
@@ -50,13 +50,10 @@ internal fun ShareScreen(uiState: ShareUiState, onEvent: (ShareEvent) -> Unit) {
         )
 
         SharePrivateContactInfo(
-            emailValue = uiState.emailValue,
+            privateContactInfo = uiState.privateContactInfo,
             onEmailValueChange = { onEvent(ShareEvent.OnEmailValueChanged(it)) },
-            emailSwitchChecked = uiState.isEmailShared,
             onEmailSwitchCheckedChange = { onEvent(ShareEvent.OnEmailSharingChanged(it)) },
-            phoneValue = uiState.phoneValue,
             onPhoneValueChange = { onEvent(ShareEvent.OnPhoneValueChanged(it)) },
-            phoneSwitchChecked = uiState.isPhoneShared,
             onPhoneSwitchCheckedChange = { onEvent(ShareEvent.OnPhoneSharingChanged(it)) },
             modifier = Modifier.padding(16.dp),
         )
diff --git a/homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/ShareUiState.kt b/homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/ShareUiState.kt
@@ -5,6 +5,10 @@ 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 = "",
diff --git a/homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/ShareViewModel.kt b/homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/ShareViewModel.kt
@@ -27,16 +27,40 @@ internal class ShareViewModel(
     fun onEvent(shareEvent: ShareEvent) {
         when (shareEvent) {
             is ShareEvent.OnEmailValueChanged -> {
-                _uiState.update { it.copy(emailValue = shareEvent.value) }
+                _uiState.update {
+                    it.copy(
+                        privateContactInfo = it.privateContactInfo.copy(
+                            emailValue = shareEvent.value
+                        )
+                    )
+                }
             }
             is ShareEvent.OnEmailSharingChanged -> {
-                _uiState.update { it.copy(isEmailShared = shareEvent.isShared) }
+                _uiState.update {
+                    it.copy(
+                        privateContactInfo = it.privateContactInfo.copy(
+                            isEmailShared = shareEvent.isShared
+                        )
+                    )
+                }
             }
             is ShareEvent.OnPhoneValueChanged -> {
-                _uiState.update { it.copy(phoneValue = shareEvent.value) }
+                _uiState.update {
+                    it.copy(
+                        privateContactInfo = it.privateContactInfo.copy(
+                            phoneValue = shareEvent.value
+                        )
+                    )
+                }
             }
             is ShareEvent.OnPhoneSharingChanged -> {
-                _uiState.update { it.copy(isPhoneShared = shareEvent.isShared) }
+                _uiState.update {
+                    it.copy(
+                        privateContactInfo = it.privateContactInfo.copy(
+                            isPhoneShared = shareEvent.isShared
+                        )
+                    )
+                }
             }
         }
     }
diff --git a/homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/components/SharePrivateContactInfo.kt b/homeUi/src/main/kotlin/com/gravatar/app/homeUi/presentation/home/share/components/SharePrivateContactInfo.kt
@@ -8,18 +8,14 @@ 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(
-    // Email state and callbacks
-    emailValue: String,
+    privateContactInfo: PrivateContactInfo,
     onEmailValueChange: (String) -> Unit,
-    emailSwitchChecked: Boolean,
     onEmailSwitchCheckedChange: (Boolean) -> Unit,
-    // Phone number state and callbacks
-    phoneValue: String,
     onPhoneValueChange: (String) -> Unit,
-    phoneSwitchChecked: Boolean,
     onPhoneSwitchCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -32,16 +28,16 @@ internal fun SharePrivateContactInfo(
         )
         ShareEditableField(
             placeholder = R.string.share_tab_private_contact_email_placeholder,
-            value = emailValue,
+            value = privateContactInfo.emailValue,
             onValueChange = onEmailValueChange,
-            switchChecked = emailSwitchChecked,
+            switchChecked = privateContactInfo.isEmailShared,
             onSwitchCheckedChange = onEmailSwitchCheckedChange,
         )
         ShareEditableField(
             placeholder = R.string.share_tab_private_contact_phone_number_placeholder,
-            value = phoneValue,
+            value = privateContactInfo.phoneValue,
             onValueChange = onPhoneValueChange,
-            switchChecked = phoneSwitchChecked,
+            switchChecked = privateContactInfo.isPhoneShared,
             onSwitchCheckedChange = onPhoneSwitchCheckedChange,
         )
     }
@@ -51,13 +47,15 @@ internal fun SharePrivateContactInfo(
 @Composable
 private fun SharePrivateContactInfoPreview() {
     SharePrivateContactInfo(
-        emailValue = "example@email.com",
+        privateContactInfo = PrivateContactInfo(
+            emailValue = "example@email.com",
+            isEmailShared = true,
+            phoneValue = "123-456-7890",
+            isPhoneShared = false
+        ),
         onEmailValueChange = {},
-        emailSwitchChecked = true,
         onEmailSwitchCheckedChange = {},
-        phoneValue = "123-456-7890",
         onPhoneValueChange = {},
-        phoneSwitchChecked = false,
         onPhoneSwitchCheckedChange = {}
     )
 }
diff --git a/homeUi/src/test/kotlin/com/gravatar/app/homeUi/presentation/home/share/ShareViewModelTest.kt b/homeUi/src/test/kotlin/com/gravatar/app/homeUi/presentation/home/share/ShareViewModelTest.kt
@@ -70,7 +70,7 @@ class ShareViewModelTest {
 
         // Then
         viewModel.uiState.test {
-            assertEquals(newEmailValue, awaitItem().emailValue)
+            assertEquals(newEmailValue, awaitItem().privateContactInfo.emailValue)
         }
     }
 
@@ -84,7 +84,7 @@ class ShareViewModelTest {
 
         // Then
         viewModel.uiState.test {
-            assertEquals(isShared, awaitItem().isEmailShared)
+            assertEquals(isShared, awaitItem().privateContactInfo.isEmailShared)
         }
     }
 
@@ -98,7 +98,7 @@ class ShareViewModelTest {
 
         // Then
         viewModel.uiState.test {
-            assertEquals(newPhoneValue, awaitItem().phoneValue)
+            assertEquals(newPhoneValue, awaitItem().privateContactInfo.phoneValue)
         }
     }
 
@@ -112,7 +112,7 @@ class ShareViewModelTest {
 
         // Then
         viewModel.uiState.test {
-            assertEquals(isShared, awaitItem().isPhoneShared)
+            assertEquals(isShared, awaitItem().privateContactInfo.isPhoneShared)
         }
     }
 
diff --git a/homeUi/src/test/kotlin/com/gravatar/app/homeUi/presentation/home/share/components/SharePrivateContactInfoTest.kt b/homeUi/src/test/kotlin/com/gravatar/app/homeUi/presentation/home/share/components/SharePrivateContactInfoTest.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.gravatar.app.design.theme.GravatarAppTheme
+import com.gravatar.app.homeUi.presentation.home.share.PrivateContactInfo
 import com.gravatar.app.testUtils.roborazzi.RoborazziTest
 import org.junit.Test
 
@@ -14,13 +15,15 @@ class SharePrivateContactInfoTest : RoborazziTest() {
     fun sharePrivateContactInfo_bothSwitchesOn() = screenshotTest {
         GravatarAppTheme {
             SharePrivateContactInfo(
-                emailValue = "example@email.com",
+                privateContactInfo = PrivateContactInfo(
+                    emailValue = "example@email.com",
+                    isEmailShared = true,
+                    phoneValue = "123-456-7890",
+                    isPhoneShared = true
+                ),
                 onEmailValueChange = {},
-                emailSwitchChecked = true,
                 onEmailSwitchCheckedChange = {},
-                phoneValue = "123-456-7890",
                 onPhoneValueChange = {},
-                phoneSwitchChecked = true,
                 onPhoneSwitchCheckedChange = {},
                 modifier = Modifier
                     .fillMaxWidth()
@@ -33,13 +36,15 @@ class SharePrivateContactInfoTest : RoborazziTest() {
     fun sharePrivateContactInfo_bothSwitchesOff() = screenshotTest {
         GravatarAppTheme {
             SharePrivateContactInfo(
-                emailValue = "example@email.com",
+                privateContactInfo = PrivateContactInfo(
+                    emailValue = "example@email.com",
+                    isEmailShared = false,
+                    phoneValue = "123-456-7890",
+                    isPhoneShared = false
+                ),
                 onEmailValueChange = {},
-                emailSwitchChecked = false,
                 onEmailSwitchCheckedChange = {},
-                phoneValue = "123-456-7890",
                 onPhoneValueChange = {},
-                phoneSwitchChecked = false,
                 onPhoneSwitchCheckedChange = {},
                 modifier = Modifier
                     .fillMaxWidth()
@@ -52,13 +57,15 @@ class SharePrivateContactInfoTest : RoborazziTest() {
     fun sharePrivateContactInfo_emptyValues() = screenshotTest {
         GravatarAppTheme {
             SharePrivateContactInfo(
-                emailValue = "",
+                privateContactInfo = PrivateContactInfo(
+                    emailValue = "",
+                    isEmailShared = true,
+                    phoneValue = "",
+                    isPhoneShared = true
+                ),
                 onEmailValueChange = {},
-                emailSwitchChecked = true,
                 onEmailSwitchCheckedChange = {},
-                phoneValue = "",
                 onPhoneValueChange = {},
-                phoneSwitchChecked = true,
                 onPhoneSwitchCheckedChange = {},
                 modifier = Modifier
                     .fillMaxWidth()

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,10 @@ internal fun ShareScreen(uiState: ShareUiState, onEvent: (ShareEvent) -> Unit) {`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`SharePrivateContactInfo(`
`53`		`- emailValue = uiState.emailValue,`
	`53`	`+ privateContactInfo = uiState.privateContactInfo,`
`54`	`54`	`onEmailValueChange = { onEvent(ShareEvent.OnEmailValueChanged(it)) },`
`55`		`- emailSwitchChecked = uiState.isEmailShared,`
`56`	`55`	`onEmailSwitchCheckedChange = { onEvent(ShareEvent.OnEmailSharingChanged(it)) },`
`57`		`- phoneValue = uiState.phoneValue,`
`58`	`56`	`onPhoneValueChange = { onEvent(ShareEvent.OnPhoneValueChanged(it)) },`
`59`		`- phoneSwitchChecked = uiState.isPhoneShared,`
`60`	`57`	`onPhoneSwitchCheckedChange = { onEvent(ShareEvent.OnPhoneSharingChanged(it)) },`
`61`	`58`	`modifier = Modifier.padding(16.dp),`
`62`	`59`	`)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class ShareViewModelTest {`
`70`	`70`
`71`	`71`	`// Then`
`72`	`72`	`viewModel.uiState.test {`
`73`		`- assertEquals(newEmailValue, awaitItem().emailValue)`
	`73`	`+ assertEquals(newEmailValue, awaitItem().privateContactInfo.emailValue)`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`@@ -84,7 +84,7 @@ class ShareViewModelTest {`
`84`	`84`
`85`	`85`	`// Then`
`86`	`86`	`viewModel.uiState.test {`
`87`		`- assertEquals(isShared, awaitItem().isEmailShared)`
	`87`	`+ assertEquals(isShared, awaitItem().privateContactInfo.isEmailShared)`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -98,7 +98,7 @@ class ShareViewModelTest {`
`98`	`98`
`99`	`99`	`// Then`
`100`	`100`	`viewModel.uiState.test {`
`101`		`- assertEquals(newPhoneValue, awaitItem().phoneValue)`
	`101`	`+ assertEquals(newPhoneValue, awaitItem().privateContactInfo.phoneValue)`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`@@ -112,7 +112,7 @@ class ShareViewModelTest {`
`112`	`112`
`113`	`113`	`// Then`
`114`	`114`	`viewModel.uiState.test {`
`115`		`- assertEquals(isShared, awaitItem().isPhoneShared)`
	`115`	`+ assertEquals(isShared, awaitItem().privateContactInfo.isPhoneShared)`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`