diff --git a/apps/ios/Shared/Views/Onboarding/CreateProfile.swift b/apps/ios/Shared/Views/Onboarding/CreateProfile.swift index c81a3600f9..3c33546436 100644 --- a/apps/ios/Shared/Views/Onboarding/CreateProfile.swift +++ b/apps/ios/Shared/Views/Onboarding/CreateProfile.swift @@ -45,33 +45,37 @@ struct CreateProfile: View { var body: some View { List { Group { - ZStack(alignment: .center) { - ZStack(alignment: .topTrailing) { - ProfileImage(imageStr: profileImage, size: 128) - if profileImage != nil { - Button { - profileImage = nil - } label: { - Image(systemName: "multiply") - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: 12) + HStack(spacing: 0) { + Spacer(minLength: 0) + ZStack(alignment: .center) { + ZStack(alignment: .topTrailing) { + ProfileImage(imageStr: profileImage, size: 128) + if profileImage != nil { + Button { + profileImage = nil + } label: { + Image(systemName: "multiply") + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: 12) + } } } - } - editImageButton { showChooseSource = true } - .buttonStyle(BorderlessButtonStyle()) + editImageButton { showChooseSource = true } + .buttonStyle(BorderlessButtonStyle()) + } + .padding(.horizontal, 10) // Offsets transparent space built into 3D asset + Spacer(minLength: 0) + #if SIMPLEX_ASSETS + Image(colorScheme == .light ? "create-profile" : "create-profile-light") + .resizable() + .scaledToFit() + .frame(height: 140) + // No trailing spacer — asset image has empty space on the right + #endif } - // TODO: add 3D asset image next to profile image (fix asset first - trim transparent space) -// #if SIMPLEX_ASSETS -// Image(colorScheme == .light ? "your-profile" : "your-profile-light") -// .resizable() -// .scaledToFit() -// .frame(height: 140) -// #endif } - .frame(maxWidth: .infinity) .listRowBackground(Color.clear) .listRowSeparator(.hidden) .listRowInsets(EdgeInsets(top: 8, leading: 0, bottom: 0, trailing: 0)) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt index e9bb27a65a..3e4b8ce1db 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt @@ -97,6 +97,7 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) { verticalAlignment = Alignment.CenterVertically ) { Box( + modifier = if (BuildConfigCommon.SIMPLEX_ASSETS) Modifier.padding(horizontal = 3.dp) else Modifier, contentAlignment = Alignment.Center ) { Box(contentAlignment = Alignment.TopEnd) { @@ -109,15 +110,14 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) { } } } - // TODO: add 3D asset image next to profile image (fix asset first - trim transparent space) -// if (BuildConfigCommon.SIMPLEX_ASSETS) { -// Image( -// painterResource(if (isInDarkTheme()) MR.images.your_profile_light else MR.images.your_profile), -// contentDescription = null, -// contentScale = ContentScale.Fit, -// modifier = Modifier.height(140.dp) -// ) -// } + if (BuildConfigCommon.SIMPLEX_ASSETS) { + Image( + painterResource(if (isInDarkTheme()) MR.images.create_profile_light else MR.images.create_profile), + contentDescription = null, + contentScale = ContentScale.Fit, + modifier = Modifier.height(140.dp) + ) + } } Column(Modifier.padding(horizontal = DEFAULT_PADDING)) { Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/default/MR/images/create_profile.svg b/apps/multiplatform/common/src/commonMain/resources/assets/default/MR/images/create_profile.svg new file mode 100644 index 0000000000..2325330d90 --- /dev/null +++ b/apps/multiplatform/common/src/commonMain/resources/assets/default/MR/images/create_profile.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/default/MR/images/create_profile_light.svg b/apps/multiplatform/common/src/commonMain/resources/assets/default/MR/images/create_profile_light.svg new file mode 100644 index 0000000000..2325330d90 --- /dev/null +++ b/apps/multiplatform/common/src/commonMain/resources/assets/default/MR/images/create_profile_light.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/multiplatform/resources/MR/images/create_profile@2x.png b/assets/multiplatform/resources/MR/images/create_profile@2x.png new file mode 100644 index 0000000000..0639186b0b Binary files /dev/null and b/assets/multiplatform/resources/MR/images/create_profile@2x.png differ diff --git a/assets/multiplatform/resources/MR/images/create_profile@3x.png b/assets/multiplatform/resources/MR/images/create_profile@3x.png new file mode 100644 index 0000000000..1813fea83b Binary files /dev/null and b/assets/multiplatform/resources/MR/images/create_profile@3x.png differ diff --git a/assets/multiplatform/resources/MR/images/create_profile_light@2x.png b/assets/multiplatform/resources/MR/images/create_profile_light@2x.png new file mode 100644 index 0000000000..2a3f4931e9 Binary files /dev/null and b/assets/multiplatform/resources/MR/images/create_profile_light@2x.png differ diff --git a/assets/multiplatform/resources/MR/images/create_profile_light@3x.png b/assets/multiplatform/resources/MR/images/create_profile_light@3x.png new file mode 100644 index 0000000000..9a9fd22cfb Binary files /dev/null and b/assets/multiplatform/resources/MR/images/create_profile_light@3x.png differ