diff --git a/apps/ios/Shared/Assets.xcassets/wefunder_logo.imageset/Contents.json b/apps/ios/Shared/Assets.xcassets/wefunder_logo.imageset/Contents.json deleted file mode 100644 index 182abac4a6..0000000000 --- a/apps/ios/Shared/Assets.xcassets/wefunder_logo.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "wefunder_logo.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/apps/ios/Shared/Assets.xcassets/wefunder_logo.imageset/wefunder_logo.png b/apps/ios/Shared/Assets.xcassets/wefunder_logo.imageset/wefunder_logo.png deleted file mode 100644 index ac90142f8d..0000000000 Binary files a/apps/ios/Shared/Assets.xcassets/wefunder_logo.imageset/wefunder_logo.png and /dev/null differ diff --git a/apps/ios/Shared/Views/ChatList/GetStakeBanner.swift b/apps/ios/Shared/Views/ChatList/GetStakeBanner.swift index 1ba9b4ab09..c9924223b5 100644 --- a/apps/ios/Shared/Views/ChatList/GetStakeBanner.swift +++ b/apps/ios/Shared/Views/ChatList/GetStakeBanner.swift @@ -12,6 +12,7 @@ import SimpleXChat // Spec: spec/client/chat-list.md#GetStakeBanner struct GetStakeBanner: View { @EnvironmentObject var theme: AppTheme + @Environment(\.colorScheme) var colorScheme: ColorScheme var showDismiss: Bool let onTap: () -> Void let onDismiss: () -> Void @@ -31,12 +32,11 @@ struct GetStakeBanner: View { .lineLimit(2) } Spacer(minLength: 6) - Image("wefunder_logo") + Image(colorScheme == .light ? "decentralized" : "decentralized-light") .resizable() .scaledToFit() - .frame(width: 48, height: 48) - // roughly where the phone of the badge banner's hero is: 40pt from the card edge, less its 8pt inset - .padding(.trailing, 32) + .frame(width: 37, height: 37) + .padding(.trailing, showDismiss ? 32 : 10) } .modifier(BannerCard()) } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/GetStakeBanner.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/GetStakeBanner.kt index 81ddf8ae53..d383366dd4 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/GetStakeBanner.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/GetStakeBanner.kt @@ -37,8 +37,7 @@ fun GetStakeBanner(showDismiss: Boolean, onTap: () -> Unit, onDismiss: () -> Uni Row( Modifier .bannerCard(onTap) - // the logo sits roughly where the phone of the badge banner's hero is, 40dp from the card edge - .padding(start = 16.dp, end = 40.dp, top = 12.dp, bottom = 12.dp), + .padding(start = 16.dp, end = if (showDismiss) 40.dp else 18.dp, top = 12.dp, bottom = 12.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp) ) { @@ -59,7 +58,11 @@ fun GetStakeBanner(showDismiss: Boolean, onTap: () -> Unit, onDismiss: () -> Uni overflow = TextOverflow.Ellipsis ) } - Image(painterResource(MR.images.wefunder_logo), contentDescription = null, modifier = Modifier.size(48.dp)) + Image( + painterResource(if (isInDarkTheme()) MR.images.decentralized_light else MR.images.decentralized), + contentDescription = null, + modifier = Modifier.size(37.dp) + ) } if (showDismiss) { diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/wefunder_logo@4x.png b/apps/multiplatform/common/src/commonMain/resources/MR/images/wefunder_logo@4x.png deleted file mode 100644 index ac90142f8d..0000000000 Binary files a/apps/multiplatform/common/src/commonMain/resources/MR/images/wefunder_logo@4x.png and /dev/null differ