commit 6704c9594c441212e6a6895b1da3510d7198e142
parent 67bd2569639e0e35f2372f984ea8f8569d007ea2
Author: Marc Stibane <marc@taler.net>
Date: Thu, 4 Jan 2024 18:01:28 +0100
remove
Diffstat:
2 files changed, 0 insertions(+), 102 deletions(-)
diff --git a/TalerWallet.xcodeproj/project.pbxproj b/TalerWallet.xcodeproj/project.pbxproj
@@ -10,8 +10,6 @@
4E16E12329F3BB99008B9C86 /* CurrencySpecification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E16E12229F3BB99008B9C86 /* CurrencySpecification.swift */; };
4E2254972A822B8100E41D29 /* payment_received.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 4E2254952A822B8100E41D29 /* payment_received.m4a */; };
4E2254982A822B8100E41D29 /* payment_sent.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 4E2254962A822B8100E41D29 /* payment_sent.m4a */; };
- 4E2E5F7F2AEE30DA0027FA8A /* AmountRowV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E2E5F7E2AEE30DA0027FA8A /* AmountRowV.swift */; };
- 4E2E5F802AEE30DA0027FA8A /* AmountRowV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E2E5F7E2AEE30DA0027FA8A /* AmountRowV.swift */; };
4E2D8DD32B3F513800234039 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4E2D8DD22B3F513800234039 /* MarkdownUI */; };
4E3327BA2AD1635100BF5AD6 /* AsyncSemaphore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E3327B92AD1635100BF5AD6 /* AsyncSemaphore.swift */; };
4E3327BB2AD1635100BF5AD6 /* AsyncSemaphore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E3327B92AD1635100BF5AD6 /* AsyncSemaphore.swift */; };
@@ -295,7 +293,6 @@
4E16E12229F3BB99008B9C86 /* CurrencySpecification.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrencySpecification.swift; sourceTree = "<group>"; };
4E2254952A822B8100E41D29 /* payment_received.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = payment_received.m4a; sourceTree = "<group>"; };
4E2254962A822B8100E41D29 /* payment_sent.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = payment_sent.m4a; sourceTree = "<group>"; };
- 4E2E5F7E2AEE30DA0027FA8A /* AmountRowV.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmountRowV.swift; sourceTree = "<group>"; };
4E3327B92AD1635100BF5AD6 /* AsyncSemaphore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncSemaphore.swift; sourceTree = "<group>"; };
4E363CBB2A237E0900D7E98C /* URL+id+iban.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL+id+iban.swift"; sourceTree = "<group>"; };
4E363CBD2A23CB2100D7E98C /* AnyTransition+backslide.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AnyTransition+backslide.swift"; sourceTree = "<group>"; };
@@ -731,7 +728,6 @@
isa = PBXGroup;
children = (
4E97968F2A3765ED006F73BC /* AgePicker.swift */,
- 4E2E5F7E2AEE30DA0027FA8A /* AmountRowV.swift */,
4E605DB92AB05FB6002FB9A7 /* BarGraph.swift */,
4EB095472989CBFE0043A8A1 /* Buttons.swift */,
4EF840A62A0B85F400EE0D47 /* CopyShare.swift */,
@@ -1106,7 +1102,6 @@
4E3EAE592A990778009F1BE8 /* Model+Settings.swift in Sources */,
4EC4008C2AE5664100DF72C7 /* CharacterSet+contains.swift in Sources */,
4E3EAE5A2A990778009F1BE8 /* ErrorView.swift in Sources */,
- 4E2E5F7F2AEE30DA0027FA8A /* AmountRowV.swift in Sources */,
4E3EAE5B2A990778009F1BE8 /* View+Notification.swift in Sources */,
4E3EAE5C2A990778009F1BE8 /* Model+Pending.swift in Sources */,
4E3EAE5D2A990778009F1BE8 /* ExchangeListView.swift in Sources */,
@@ -1213,7 +1208,6 @@
4EB095152989CBB00043A8A1 /* Model+Settings.swift in Sources */,
4EC4008D2AE5664100DF72C7 /* CharacterSet+contains.swift in Sources */,
4EB095692989CBFE0043A8A1 /* ErrorView.swift in Sources */,
- 4E2E5F802AEE30DA0027FA8A /* AmountRowV.swift in Sources */,
4E3B4BC72A429F2A00CC88B8 /* View+Notification.swift in Sources */,
4EB0956E2989CBFE0043A8A1 /* Model+Pending.swift in Sources */,
4EB095522989CBFE0043A8A1 /* ExchangeListView.swift in Sources */,
diff --git a/TalerWallet1/Views/HelperViews/AmountRowV.swift b/TalerWallet1/Views/HelperViews/AmountRowV.swift
@@ -1,96 +0,0 @@
-/*
- * This file is part of GNU Taler, ©2022-23 Taler Systems S.A.
- * See LICENSE.md
- */
-import SwiftUI
-import taler_swift
-
-// calculate the width of the amountStr (with Font)
-// calculate the width of 'content' in compact form
-// if it fits side by side, then render HStack(content(compact), Spacer(), amountStr)
-// else render VStack(content(wide), HStack(Spacer(), amountStr))
-
-struct AmountRowV<Content: View>: View {
- let amountStr: String
- let amountColor: Color
- let doneOrPending: Bool
- let largeAmountFont: Bool
- let fitsHorizontal: Bool
- let vertAlignment: VerticalAlignment
-
- var content: () -> Content
-
- var body: some View {
- let text = Text(amountStr)
-// .strikethrough(!doneOrPending)
- .foregroundColor(amountColor)
- .accessibilityFont(largeAmountFont ? .title : .title2)
- .monospacedDigit()
- if fitsHorizontal {
- HStack(alignment: vertAlignment, spacing: 0) {
- content()
- Spacer(minLength: 0)
- text
- }
- } else {
- VStack(alignment: .leading, spacing: 0) {
- content()
- HStack {
- Spacer(minLength: 0)
- text
- }
- }
- }
- }
-}
-// MARK: -
-#if DEBUG
-
-struct PreviewSectionWithAmountRow: View {
- @Environment(\.sizeCategory) var sizeCategory
- @Environment(\.colorSchemeContrast) private var colorSchemeContrast
-
- var body: some View {
- let testInfo = PreviewCurrencyInfo(TESTCURRENCY, digits: 0)
- let demoInfo = PreviewCurrencyInfo(DEMOCURRENCY, digits: 2)
- let test = Amount(currency: TESTCURRENCY, cent: 123)
- let demo = Amount(currency: DEMOCURRENCY, cent: 123456)
- let testStr = test.string(testInfo)
- let demoStr = demo.string(demoInfo)
- List {
- Section {
- AmountRowV(amountStr: demoStr, amountColor: .primary, doneOrPending: true, largeAmountFont: true,
- fitsHorizontal: true, vertAlignment: .lastTextBaseline) {
- Text(verbatim: "Balance")
- .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
- .accessibilityFont(.title2)
- }
- AmountRowV(amountStr: demoStr, amountColor: .primary, doneOrPending: true, largeAmountFont: true,
- fitsHorizontal: false, vertAlignment: .lastTextBaseline) {
- Text(verbatim: "Balance")
- .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
- .accessibilityFont(.title2)
- }
- }
- Section {
- AmountRowV(amountStr: testStr, amountColor: .primary, doneOrPending: false, largeAmountFont: false,
- fitsHorizontal: true, vertAlignment: .lastTextBaseline) {
- Text(verbatim: "Balance")
- .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
- .accessibilityFont(.title2)
- }
- AmountRowV(amountStr: testStr, amountColor: .secondary, doneOrPending: false, largeAmountFont: false,
- fitsHorizontal: false, vertAlignment: .lastTextBaseline) {
- Text(verbatim: "Balance")
- .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
- .accessibilityFont(.title2)
- }
- }
- }
- }
-}
-
-#Preview {
- PreviewSectionWithAmountRow()
-}
-#endif
