From a5c9f161fb92c062a99d11895ba885e74a8405bc Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Mon, 5 Sep 2022 11:22:30 +0200
Subject: [PATCH] Update buttons appearance
---
.../Sources/RegisterFeature/RegisterView.swift | 8 +++-----
.../Sources/WelcomeFeature/WelcomeView.swift | 9 +++------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/Examples/xx-messenger/Sources/RegisterFeature/RegisterView.swift b/Examples/xx-messenger/Sources/RegisterFeature/RegisterView.swift
index 27bc0962..195b655b 100644
--- a/Examples/xx-messenger/Sources/RegisterFeature/RegisterView.swift
+++ b/Examples/xx-messenger/Sources/RegisterFeature/RegisterView.swift
@@ -46,14 +46,12 @@ public struct RegisterView: View {
viewStore.send(.registerTapped)
} label: {
HStack {
+ Text("Register")
+ Spacer()
if viewStore.isRegistering {
- ProgressView().padding(.trailing)
- Text("Registering...")
- } else {
- Text("Register")
+ ProgressView()
}
}
- .frame(maxWidth: .infinity)
}
}
diff --git a/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift b/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift
index d3686c5a..1205c67e 100644
--- a/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift
+++ b/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift
@@ -29,21 +29,18 @@ public struct WelcomeView: View {
viewStore.send(.newAccountTapped)
} label: {
HStack {
+ Text("New Account")
+ Spacer()
if viewStore.isCreatingAccount {
- ProgressView().padding(.trailing)
- Text("Creating Account...")
- } else {
- Text("New Account")
+ ProgressView()
}
}
- .frame(maxWidth: .infinity)
}
Button {
viewStore.send(.restoreTapped)
} label: {
Text("Restore from Backup")
- .frame(maxWidth: .infinity)
}
}
}
--
GitLab