anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-3225 Vault | Enhancement | Replace settings icon by user icon (#2022)

Browse source
This commit is contained in:
Evgenii Kozlov 2025-01-22 21:16:53 +01:00 • committed by Evgenii Kozlov
parent 4da849cae3
commit 497d8a5a09
8 changed files with 113 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/account/ProfileScreen.kt
View file

@ -59,6 +59,7 @@ import com.anytypeio.anytype.core_ui.views.BodyRegular
import com.anytypeio.anytype.core_ui.views.Caption1Regular
import com.anytypeio.anytype.core_ui.views.Title1
import com.anytypeio.anytype.core_models.membership.MembershipStatus
import com.anytypeio.anytype.presentation.profile.AccountProfile
import com.anytypeio.anytype.presentation.profile.ProfileIconView
import com.anytypeio.anytype.ui_settings.R
import kotlinx.coroutines.FlowPreview
@ -73,7 +74,7 @@ fun ProfileSettingsScreen(
isLogoutInProgress: Boolean,
onNameChange: (String) -> Unit,
onProfileIconClick: () -> Unit,
account: ProfileSettingsViewModel.AccountProfile,
account: AccountProfile,
onAppearanceClicked: () -> Unit,
onDataManagementClicked: () -> Unit,
onAboutClicked: () -> Unit,
@ -269,12 +270,12 @@ fun ActionWithProgressBar(
@Composable
private fun Header(
modifier: Modifier = Modifier,
account: ProfileSettingsViewModel.AccountProfile,
account: AccountProfile,
onProfileIconClick: () -> Unit,
onNameSet: (String) -> Unit
) {
when (account) {
is ProfileSettingsViewModel.AccountProfile.Data -> {
is AccountProfile.Data -> {
Box(modifier = modifier.padding(vertical = 6.dp)) {
Dragger()
}
@ -290,7 +291,7 @@ private fun Header(
}
ProfileNameBlock(name = account.name, onNameSet = onNameSet)
}
is ProfileSettingsViewModel.AccountProfile.Idle -> {}
is AccountProfile.Idle -> {}
}
}
@ -448,7 +449,7 @@ private fun ProfileSettingPreview() {
isLogoutInProgress = false,
onNameChange = {},
onProfileIconClick = {},
account = ProfileSettingsViewModel.AccountProfile.Data(
account = AccountProfile.Data(
"Walter",
icon = ProfileIconView.Placeholder("Walter")
),

9
feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/account/ProfileSettingsViewModel.kt
View file

@ -28,6 +28,7 @@ import com.anytypeio.anytype.presentation.extension.sendScreenSettingsDeleteEven
import com.anytypeio.anytype.core_models.membership.MembershipStatus
import com.anytypeio.anytype.domain.search.ProfileSubscriptionManager
import com.anytypeio.anytype.presentation.membership.provider.MembershipProvider
import com.anytypeio.anytype.presentation.profile.AccountProfile
import com.anytypeio.anytype.presentation.profile.ProfileIconView
import com.anytypeio.anytype.presentation.profile.profileIcon
import kotlinx.coroutines.Job
@ -149,14 +150,6 @@ class ProfileSettingsViewModel(
}
}
sealed class AccountProfile {
data object Idle: AccountProfile()
class Data(
val name: String,
val icon: ProfileIconView
): AccountProfile()
}
class Factory(
private val analytics: Analytics,
private val container: StorelessSubscriptionContainer,