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

[ABW-3110] AssetTransfer - Missing placeholder for message #1066

Merged
merged 2 commits into from
Apr 4, 2024
Merged

[ABW-3110] AssetTransfer - Missing placeholder for message #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9576d8d
Create AppTextEditor to allow showing placeholders on TextEditor view
matiasbzurovski Apr 1, 2024
c5c63bb
Remove comment
matiasbzurovski Apr 1, 2024
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
4 changes: 4 additions & 0 deletions RadixWallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,7 @@
48FFFB082ADC6FD300B2B213 /* SwiftUINavigationCore in Frameworks */ = {isa = PBXBuildFile; productRef = 48FFFB072ADC6FD300B2B213 /* SwiftUINavigationCore */; };
48FFFB0A2ADC721800B2B213 /* Atomics in Frameworks */ = {isa = PBXBuildFile; productRef = 48FFFB092ADC721800B2B213 /* Atomics */; };
48FFFB0D2ADC744700B2B213 /* TextBuilder in Frameworks */ = {isa = PBXBuildFile; productRef = 48FFFB0C2ADC744700B2B213 /* TextBuilder */; };
5BBC43A92BBAC6B0005747B1 /* AppTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BBC43A82BBAC6B0005747B1 /* AppTextEditor.swift */; };
830818482B9F1621002D8351 /* HTTPClient+Live.swift in Sources */ = {isa = PBXBuildFile; fileRef = 830818472B9F1621002D8351 /* HTTPClient+Live.swift */; };
8308184A2B9F162B002D8351 /* HTTPClient+Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 830818492B9F162B002D8351 /* HTTPClient+Mock.swift */; };
8308184C2B9F169B002D8351 /* TokenPriceClient+Live.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8308184B2B9F169B002D8351 /* TokenPriceClient+Live.swift */; };
Expand Down Expand Up @@ -2380,6 +2381,7 @@
48F9CFE62B03A0A000657755 /* ProfileBuilderTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileBuilderTest.swift; sourceTree = "<group>"; };
48FF43142AE43C7C00C568B9 /* TimeLimit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeLimit.swift; sourceTree = "<group>"; };
48FFFAF12ADC23AC00B2B213 /* Exports.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Exports.swift; sourceTree = "<group>"; };
5BBC43A82BBAC6B0005747B1 /* AppTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTextEditor.swift; sourceTree = "<group>"; };
830818472B9F1621002D8351 /* HTTPClient+Live.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HTTPClient+Live.swift"; sourceTree = "<group>"; };
830818492B9F162B002D8351 /* HTTPClient+Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HTTPClient+Mock.swift"; sourceTree = "<group>"; };
8308184B2B9F169B002D8351 /* TokenPriceClient+Live.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TokenPriceClient+Live.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5868,6 +5870,7 @@
48CFC1182ADC10D900E77A5C /* LoadingView.swift */,
48CFC1192ADC10D900E77A5C /* ApprovalSlider.swift */,
48CFC11A2ADC10D900E77A5C /* FixedSpacer.swift */,
5BBC43A82BBAC6B0005747B1 /* AppTextEditor.swift */,
);
path = Components;
sourceTree = "<group>";
Expand Down Expand Up @@ -8897,6 +8900,7 @@
48CFC64D2ADC10DB00E77A5C /* PersonaData+PostalAddress.swift in Sources */,
48CFC5EE2ADC10DA00E77A5C /* SlideUpPanel+View.swift in Sources */,
48CFC3492ADC10D900E77A5C /* PersonaDataPermissionBox.swift in Sources */,
5BBC43A92BBAC6B0005747B1 /* AppTextEditor.swift in Sources */,
48CFC68E2ADC10DB00E77A5C /* AddressKind.swift in Sources */,
A41266F12B15579E00EA38E9 /* ManualAccountRecoverySeedPhrase+View.swift in Sources */,
48CFC4F32ADC10DA00E77A5C /* StateEntityDetailsResponsePackageDetails.swift in Sources */,
Expand Down
23 changes: 23 additions & 0 deletions RadixWallet/Core/DesignSystem/Components/AppTextEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import SwiftUI

/// A helper view that allows to show a placeholder on the `TextEditor` while the content is empty.
///
/// This is a workaround while Apple doesn't provide a way of setting the placeholder on the native view.
struct AppTextEditor: View {
let placeholder: String
@Binding var text: String

var body: some View {
ZStack(alignment: .topLeading) {
if text.isEmpty {
Text(placeholder)
.padding(.top, 10)
.padding(.leading, 6)
.disabled(true)
.foregroundColor(.app.gray2)
}

TextEditor(text: $text)
}
}
}
2 changes: 2 additions & 0 deletions RadixWallet/Core/Resources/Generated/L10n.generated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,8 @@ public enum L10n {
public static let sendTransferButton = L10n.tr("Localizable", "assetTransfer_sendTransferButton", fallback: "Continue")
/// Message
public static let transactionMessage = L10n.tr("Localizable", "assetTransfer_transactionMessage", fallback: "Message")
/// Add a message
public static let transactionMessagePlaceholder = L10n.tr("Localizable", "assetTransfer_transactionMessagePlaceholder", fallback: "Add a message")
public enum AccountList {
/// Add Transfer
public static let addAccountButton = L10n.tr("Localizable", "assetTransfer_accountList_addAccountButton", fallback: "Add Transfer")
Expand Down
3 changes: 2 additions & 1 deletion RadixWallet/Core/Resources/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,7 @@ Or you can clear this wallet from this phone and start fresh.";
"misc_remoteThumbnails_vectorImageFailure" = "Can\'t displays image of vector type";
"misc_remoteThumbnails_loadingFailure" = "Can\'t load image";
"assetTransfer_transactionMessage" = "Message";
"assetTransfer_transactionMessagePlaceholder" = "Add a message";
"assetTransfer_qrScanInstructions" = "Scan a QR code of a Radix Account address from another wallet or an exchange.";
"assetTransfer_sendTransferButton" = "Continue";
"assetTransfer_accountList_externalAccountName" = "Account";
Expand Down Expand Up @@ -1036,4 +1037,4 @@ If you have any “Legacy” Accounts (created on the Olympia network) to import
"survey_highestScoreLabel" = "10 - Very likely";
"survey_reason_heading" = "What’s the main reason for your score?";
"survey_reason_fieldHint" = "Let us know...";
"survey_submitButton" = "Submit Feedback - Thanks!";
"survey_submitButton" = "Submit Feedback - Thanks!";
5 changes: 3 additions & 2 deletions ...ures/AssetTransferFeature/Components/AssetTransferMessage/AssetTransferMessage+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ extension AssetTransferMessage.View {
.padding(.medium3)
.roundedCorners(.top, strokeColor: .borderColor)

TextEditor(text:
viewStore.binding(
AppTextEditor(
placeholder: L10n.AssetTransfer.transactionMessagePlaceholder,
text: viewStore.binding(
get: \.message,
send: { .messageChanged($0) }
)
Expand Down
Loading