commit 7046fe0d4f021f4e705e88c57a0aa68590e7ee7c
parent 201e9a427f9bc86c6841111bb7e6f4d1fcdcf95d
Author: William Casarin <jb55@jb55.com>
Date: Wed, 12 Jul 2023 18:19:13 -0700
ui: add DamusBackground helper
We will be using this in more places
Diffstat:
4 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj
@@ -143,6 +143,7 @@
4C64987C286D03E000EAE2B3 /* DirectMessagesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C64987B286D03E000EAE2B3 /* DirectMessagesView.swift */; };
4C64987E286D082C00EAE2B3 /* DirectMessagesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C64987D286D082C00EAE2B3 /* DirectMessagesModel.swift */; };
4C649881286E0EE300EAE2B3 /* secp256k1 in Frameworks */ = {isa = PBXBuildFile; productRef = 4C649880286E0EE300EAE2B3 /* secp256k1 */; };
+ 4C687C212A5F7ED00092C550 /* DamusBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C687C202A5F7ED00092C550 /* DamusBackground.swift */; };
4C73C5142A4437C10062CAC0 /* ZapUserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C73C5132A4437C10062CAC0 /* ZapUserView.swift */; };
4C75EFA427FA577B0006080F /* PostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C75EFA327FA577B0006080F /* PostView.swift */; };
4C75EFA627FF87A20006080F /* Nostr.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C75EFA527FF87A20006080F /* Nostr.swift */; };
@@ -616,6 +617,7 @@
4C633351283D419F00B1C9C3 /* SignalModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignalModel.swift; sourceTree = "<group>"; };
4C64987B286D03E000EAE2B3 /* DirectMessagesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectMessagesView.swift; sourceTree = "<group>"; };
4C64987D286D082C00EAE2B3 /* DirectMessagesModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectMessagesModel.swift; sourceTree = "<group>"; };
+ 4C687C202A5F7ED00092C550 /* DamusBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusBackground.swift; sourceTree = "<group>"; };
4C73C5132A4437C10062CAC0 /* ZapUserView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapUserView.swift; sourceTree = "<group>"; };
4C75EFA327FA577B0006080F /* PostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostView.swift; sourceTree = "<group>"; };
4C75EFA527FF87A20006080F /* Nostr.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Nostr.swift; sourceTree = "<group>"; };
@@ -1215,6 +1217,7 @@
4C2859612A12A7F0004746F7 /* GoldSupportGradient.swift */,
5C6E1DAE2A194075008FC15A /* PinkGradient.swift */,
5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */,
+ 4C687C202A5F7ED00092C550 /* DamusBackground.swift */,
);
path = Gradients;
sourceTree = "<group>";
@@ -2034,6 +2037,7 @@
4C8D00CF29E38B950036AF10 /* nostr_bech32.c in Sources */,
4C3BEFD42819DE8F00B3DE84 /* NostrKind.swift in Sources */,
4C3EA66028FF5E7700C48A62 /* node_id.c in Sources */,
+ 4C687C212A5F7ED00092C550 /* DamusBackground.swift in Sources */,
4CE6DEE727F7A08100C66700 /* damusApp.swift in Sources */,
4C363A962827096D006E126D /* PostBlock.swift in Sources */,
4CA9275F2A2902B20098A105 /* LongformPreview.swift in Sources */,
diff --git a/damus/Components/Gradients/DamusBackground.swift b/damus/Components/Gradients/DamusBackground.swift
@@ -0,0 +1,30 @@
+//
+// DamusBackground.swift
+// damus
+//
+// Created by William Casarin on 2023-07-12.
+//
+
+import Foundation
+import SwiftUI
+
+struct DamusBackground: View {
+ let maxHeight: CGFloat
+
+ init(maxHeight: CGFloat = 250.0) {
+ self.maxHeight = maxHeight
+ }
+
+ var body: some View {
+ Image("login-header")
+ .resizable()
+ .frame(maxWidth: .infinity, maxHeight: maxHeight, alignment: .center)
+ .ignoresSafeArea()
+ }
+}
+
+struct DamusBackground_Previews: PreviewProvider {
+ static var previews: some View {
+ DamusBackground()
+ }
+}
diff --git a/damus/Views/LoginView.swift b/damus/Views/LoginView.swift
@@ -106,13 +106,7 @@ struct LoginView: View {
}
.padding()
}
- .background(
- Image("login-header")
- .resizable()
- .frame(maxWidth: .infinity, maxHeight: 350, alignment: .center)
- .ignoresSafeArea(),
- alignment: .top
- )
+ .background(DamusBackground(maxHeight: 350), alignment: .top)
.onAppear {
credential_handler.check_credentials()
}
diff --git a/damus/Views/SetupView.swift b/damus/Views/SetupView.swift
@@ -61,13 +61,7 @@ struct SetupView: View {
.padding()
}
}
- .background(
- Image("login-header")
- .resizable()
- .frame(maxWidth: .infinity, maxHeight: 300, alignment: .center)
- .ignoresSafeArea(),
- alignment: .top
- )
+ .background(DamusBackground(maxHeight: 300), alignment: .top)
.navigationDestination(for: Route.self) { route in
route.view(navigationCordinator: navigationCoordinator, damusState: DamusState.empty)
}