Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Capitalise strings in blocking view #741

Merged
merged 3 commits into from
Sep 11, 2023
Merged

Capitalise strings in blocking view #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e38e6e8
fix
kugel3 Sep 8, 2023
9773168
Improve decommissioned view in
kugel3 Sep 8, 2023
2cd0053
Simplification
kugel3 Sep 8, 2023
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
6 changes: 4 additions & 2 deletions Sources/Core/DesignSystem/Components/DeveloperDisclaimerBanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import SwiftUI
extension View {
@ViewBuilder
public func showDeveloperDisclaimerBanner(_ show: Bool) -> some View {
VStack(spacing: 0) {
if show {
if show {
VStack(spacing: 0) {
DeveloperDisclaimerBanner()
self
}
} else {
self
}
}
Expand Down
47 changes: 23 additions & 24 deletions Sources/Features/AppFeature/Decommissioned/Decommissioned+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,30 @@ extension Decommissioned {
}

public var body: some SwiftUI.View {
WithViewStore(store, observe: { $0 }, send: { .view($0) }) { viewStore in
// TODO: implement
VStack(alignment: .center) {
VStack(alignment: .center, spacing: .small1) {
Text("Preview of wallet has ended") // FIXME: Strings
.textStyle(.sectionHeader)
Text("Uninstall this app and download the Radix Wallet app from App Store.") // FIXME: Strings
.textStyle(.body1HighImportance)
}
.foregroundColor(.white)

// So that the square root in background image is visible
Spacer(minLength: .huge2)

Button("Open AppStore") { // FIXME: Strings
viewStore.send(.openAppStore)
}
.buttonStyle(.primaryRectangular)
VStack(alignment: .center) {
VStack(alignment: .center, spacing: .small1) {
Text("Preview of Wallet Has Ended") // FIXME: Strings
.textStyle(.sectionHeader)
Text("Uninstall this app and download the Radix Wallet app from App Store.") // FIXME: Strings
.textStyle(.body1HighImportance)
.multilineTextAlignment(.center)
}
.padding(.large1)
.background(
Image(asset: AssetResource.splash)
.resizable()
.scaledToFill()
)
.foregroundColor(.white)

Spacer(minLength: .huge2)

Button("Open AppStore") { // FIXME: Strings
store.send(.view(.openAppStore))
}
.buttonStyle(.primaryRectangular)
}
.padding(.large1)
.background {
Image(asset: AssetResource.splash)
.resizable()
.scaledToFill()
.padding(-1) // Workaround for a weird SwiftUI bug
.edgesIgnoringSafeArea(.all)
}
}
}
Expand Down
Loading