commit 7a4af3185966e56269b603c1e3de07a9b805e37c parent e106be1412e13282711f73f7eaa06a17df6426a2 Author: ericholguin <ericholguin@apache.org> Date: Tue, 7 Jan 2025 20:15:58 -0700 nwc: Coinos This PR adds a button to allow users to easily connect to Coinos Also cleans up and organizes assets. Changelog-Added: Coinos connection button in Wallet view Signed-off-by: ericholguin <ericholguin@apache.org> Diffstat:
79 files changed, 93 insertions(+), 122 deletions(-)
diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj @@ -406,9 +406,10 @@ 5C6E1DAD2A193EC2008FC15A /* GradientButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6E1DAC2A193EC2008FC15A /* GradientButtonStyle.swift */; }; 5C6E1DAF2A194075008FC15A /* PinkGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6E1DAE2A194075008FC15A /* PinkGradient.swift */; }; 5C7389B12B6EFA7100781E0A /* ProxyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B02B6EFA7100781E0A /* ProxyView.swift */; }; - 5C7389B72B9E692E00781E0A /* MutinyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B62B9E692E00781E0A /* MutinyButton.swift */; }; - 5C7389B92B9E69ED00781E0A /* MutinyGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */; }; 5C8711DE2C460C06007879C2 /* PostingTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C8711DD2C460C06007879C2 /* PostingTimelineView.swift */; }; + 5CB017212D2D985E00A9ED05 /* CoinosButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB017202D2D985800A9ED05 /* CoinosButton.swift */; }; + 5CB017222D2D985E00A9ED05 /* CoinosButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB017202D2D985800A9ED05 /* CoinosButton.swift */; }; + 5CB017232D2D985E00A9ED05 /* CoinosButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB017202D2D985800A9ED05 /* CoinosButton.swift */; }; 5CC8529D2BD741CD0039FFC5 /* HighlightEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC8529C2BD741CD0039FFC5 /* HighlightEvent.swift */; }; 5CC8529F2BD744F60039FFC5 /* HighlightView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC8529E2BD744F60039FFC5 /* HighlightView.swift */; }; 5CC852A22BDED9B90039FFC5 /* HighlightDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC852A12BDED9B90039FFC5 /* HighlightDescription.swift */; }; @@ -535,7 +536,6 @@ 82D6FB0F2CD99F7900C925F4 /* DamusLogoGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */; }; 82D6FB102CD99F7900C925F4 /* DamusBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C687C202A5F7ED00092C550 /* DamusBackground.swift */; }; 82D6FB112CD99F7900C925F4 /* DamusLightGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF2DCCD2AABE1A500984B8D /* DamusLightGradient.swift */; }; - 82D6FB122CD99F7900C925F4 /* MutinyGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */; }; 82D6FB132CD99F7900C925F4 /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D2E846295218AF006D67F8 /* Shimmer.swift */; }; 82D6FB142CD99F7900C925F4 /* EndBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7641A28A1641400B6928F /* EndBlock.swift */; }; 82D6FB152CD99F7900C925F4 /* ImageCarousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670528FCB08600038D2A /* ImageCarousel.swift */; }; @@ -733,7 +733,6 @@ 82D6FBD82CD99F7900C925F4 /* FriendsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D1A6E29F31E5000ACDF75 /* FriendsButton.swift */; }; 82D6FBD92CD99F7900C925F4 /* GradientFollowButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F71694F32A6732B7001F4053 /* GradientFollowButton.swift */; }; 82D6FBDA2CD99F7900C925F4 /* AlbyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7D09652A0AE62100943473 /* AlbyButton.swift */; }; - 82D6FBDB2CD99F7900C925F4 /* MutinyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B62B9E692E00781E0A /* MutinyButton.swift */; }; 82D6FBDC2CD99F7900C925F4 /* DamusVideoPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A2929DDF54400516EAC /* DamusVideoPlayerView.swift */; }; 82D6FBDD2CD99F7900C925F4 /* DamusVideoPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A16FFC2AA7525700DFEC1F /* DamusVideoPlayer.swift */; }; 82D6FBDE2CD99F7900C925F4 /* DamusVideoCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A16FFE2AA76A0900DFEC1F /* DamusVideoCoordinator.swift */; }; @@ -1127,7 +1126,6 @@ D73E5E442C6A97F4007EB227 /* DamusLogoGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */; }; D73E5E452C6A97F4007EB227 /* DamusBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C687C202A5F7ED00092C550 /* DamusBackground.swift */; }; D73E5E462C6A97F4007EB227 /* DamusLightGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF2DCCD2AABE1A500984B8D /* DamusLightGradient.swift */; }; - D73E5E472C6A97F4007EB227 /* MutinyGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */; }; D73E5E482C6A97F4007EB227 /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D2E846295218AF006D67F8 /* Shimmer.swift */; }; D73E5E492C6A97F4007EB227 /* EndBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7641A28A1641400B6928F /* EndBlock.swift */; }; D73E5E4D2C6A97F4007EB227 /* NIP05Badge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */; }; @@ -1255,7 +1253,6 @@ D73E5ED42C6A97F4007EB227 /* FriendsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D1A6E29F31E5000ACDF75 /* FriendsButton.swift */; }; D73E5ED52C6A97F4007EB227 /* GradientFollowButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F71694F32A6732B7001F4053 /* GradientFollowButton.swift */; }; D73E5ED62C6A97F4007EB227 /* AlbyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7D09652A0AE62100943473 /* AlbyButton.swift */; }; - D73E5ED72C6A97F4007EB227 /* MutinyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B62B9E692E00781E0A /* MutinyButton.swift */; }; D73E5ED82C6A97F4007EB227 /* DamusVideoPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A2929DDF54400516EAC /* DamusVideoPlayerView.swift */; }; D73E5ED92C6A97F4007EB227 /* DamusVideoPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A16FFC2AA7525700DFEC1F /* DamusVideoPlayer.swift */; }; D73E5EDA2C6A97F4007EB227 /* DamusVideoCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A16FFE2AA76A0900DFEC1F /* DamusVideoCoordinator.swift */; }; @@ -2339,9 +2336,8 @@ 5C6E1DAC2A193EC2008FC15A /* GradientButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientButtonStyle.swift; sourceTree = "<group>"; }; 5C6E1DAE2A194075008FC15A /* PinkGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinkGradient.swift; sourceTree = "<group>"; }; 5C7389B02B6EFA7100781E0A /* ProxyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyView.swift; sourceTree = "<group>"; }; - 5C7389B62B9E692E00781E0A /* MutinyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutinyButton.swift; sourceTree = "<group>"; }; - 5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutinyGradient.swift; sourceTree = "<group>"; }; 5C8711DD2C460C06007879C2 /* PostingTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostingTimelineView.swift; sourceTree = "<group>"; }; + 5CB017202D2D985800A9ED05 /* CoinosButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoinosButton.swift; sourceTree = "<group>"; }; 5CC8529C2BD741CD0039FFC5 /* HighlightEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightEvent.swift; sourceTree = "<group>"; }; 5CC8529E2BD744F60039FFC5 /* HighlightView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightView.swift; sourceTree = "<group>"; }; 5CC852A12BDED9B90039FFC5 /* HighlightDescription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightDescription.swift; sourceTree = "<group>"; }; @@ -3192,7 +3188,6 @@ 5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */, 4C687C202A5F7ED00092C550 /* DamusBackground.swift */, 5CF2DCCD2AABE1A500984B8D /* DamusLightGradient.swift */, - 5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */, ); path = Gradients; sourceTree = "<group>"; @@ -3261,10 +3256,10 @@ 4C8D1A6D29F31E4100ACDF75 /* Buttons */ = { isa = PBXGroup; children = ( + 5CB017202D2D985800A9ED05 /* CoinosButton.swift */, 4C8D1A6E29F31E5000ACDF75 /* FriendsButton.swift */, F71694F32A6732B7001F4053 /* GradientFollowButton.swift */, 4C7D09652A0AE62100943473 /* AlbyButton.swift */, - 5C7389B62B9E692E00781E0A /* MutinyButton.swift */, ); path = Buttons; sourceTree = "<group>"; @@ -4312,7 +4307,6 @@ 4C30AC7829A577AB00E2BD5A /* EventCache.swift in Sources */, 4C285C8428385690008A31F1 /* CreateAccountView.swift in Sources */, 4CDD1AE22A6B3074001CD4DF /* NdbTagsIterator.swift in Sources */, - 5C7389B72B9E692E00781E0A /* MutinyButton.swift in Sources */, 4C216F34286F5ACD00040376 /* DMView.swift in Sources */, D7CB5D512B1174D100AD4105 /* FriendFilter.swift in Sources */, D7CBD1D42B8D21DC00BFD889 /* DamusPurpleNotificationManagement.swift in Sources */, @@ -4617,7 +4611,6 @@ 4CF0ABD82981980C00D66079 /* Lists.swift in Sources */, F71694EA2A662232001F4053 /* OnboardingSuggestionsView.swift in Sources */, 4C12536A2A76D3850004F4B8 /* RelaysChangedNotify.swift in Sources */, - 5C7389B92B9E69ED00781E0A /* MutinyGradient.swift in Sources */, 4C30AC8029A6A53F00E2BD5A /* ProfilePicturesView.swift in Sources */, D7373BAA2B68A65A00F7783D /* PurpleAccountUpdateNotify.swift in Sources */, 5C6E1DAD2A193EC2008FC15A /* GradientButtonStyle.swift in Sources */, @@ -4715,6 +4708,7 @@ 5C513FBA297F72980072348F /* CustomPicker.swift in Sources */, 4C1253622A76D00B0004F4B8 /* PostNotify.swift in Sources */, 4CACA9D5280C31E100D9BBE8 /* ReplyView.swift in Sources */, + 5CB017232D2D985E00A9ED05 /* CoinosButton.swift in Sources */, F7908E92298B0F0700AB113A /* RelayDetailView.swift in Sources */, 4C9147002A2A891E00DDEA40 /* error.c in Sources */, 4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */, @@ -4940,7 +4934,6 @@ 82D6FB0F2CD99F7900C925F4 /* DamusLogoGradient.swift in Sources */, 82D6FB102CD99F7900C925F4 /* DamusBackground.swift in Sources */, 82D6FB112CD99F7900C925F4 /* DamusLightGradient.swift in Sources */, - 82D6FB122CD99F7900C925F4 /* MutinyGradient.swift in Sources */, 82D6FB132CD99F7900C925F4 /* Shimmer.swift in Sources */, 82D6FB142CD99F7900C925F4 /* EndBlock.swift in Sources */, 82D6FB152CD99F7900C925F4 /* ImageCarousel.swift in Sources */, @@ -5138,7 +5131,6 @@ 82D6FBD82CD99F7900C925F4 /* FriendsButton.swift in Sources */, 82D6FBD92CD99F7900C925F4 /* GradientFollowButton.swift in Sources */, 82D6FBDA2CD99F7900C925F4 /* AlbyButton.swift in Sources */, - 82D6FBDB2CD99F7900C925F4 /* MutinyButton.swift in Sources */, 82D6FBDC2CD99F7900C925F4 /* DamusVideoPlayerView.swift in Sources */, 82D6FBDD2CD99F7900C925F4 /* DamusVideoPlayer.swift in Sources */, 82D6FBDE2CD99F7900C925F4 /* DamusVideoCoordinator.swift in Sources */, @@ -5193,6 +5185,7 @@ 82D6FC0E2CD99F7900C925F4 /* ProfilePicView.swift in Sources */, 82D6FC0F2CD99F7900C925F4 /* ProfileView.swift in Sources */, 82D6FC102CD99F7900C925F4 /* ProfileNameView.swift in Sources */, + 5CB017212D2D985E00A9ED05 /* CoinosButton.swift in Sources */, 82D6FC112CD99F7900C925F4 /* MaybeAnonPfpView.swift in Sources */, 82D6FC122CD99F7900C925F4 /* EventProfileName.swift in Sources */, 82D6FC132CD99F7900C925F4 /* FriendIcon.swift in Sources */, @@ -5351,7 +5344,6 @@ D73E5E442C6A97F4007EB227 /* DamusLogoGradient.swift in Sources */, D73E5E452C6A97F4007EB227 /* DamusBackground.swift in Sources */, D73E5E462C6A97F4007EB227 /* DamusLightGradient.swift in Sources */, - D73E5E472C6A97F4007EB227 /* MutinyGradient.swift in Sources */, D73E5E482C6A97F4007EB227 /* Shimmer.swift in Sources */, D73E5E492C6A97F4007EB227 /* EndBlock.swift in Sources */, D73E5E4D2C6A97F4007EB227 /* NIP05Badge.swift in Sources */, @@ -5471,6 +5463,7 @@ D73E5EBB2C6A97F4007EB227 /* Nip98HTTPAuth.swift in Sources */, D73E5EBC2C6A97F4007EB227 /* Relay.swift in Sources */, D73E5EBD2C6A97F4007EB227 /* NostrRequest.swift in Sources */, + 5CB017222D2D985E00A9ED05 /* CoinosButton.swift in Sources */, D73E5EBE2C6A97F4007EB227 /* NostrLink.swift in Sources */, D73E5EBF2C6A97F4007EB227 /* WebSocket.swift in Sources */, D73E5F812C6AA07A007EB227 /* HighlighterExtensionAliases.swift in Sources */, @@ -5490,7 +5483,6 @@ D73E5ED42C6A97F4007EB227 /* FriendsButton.swift in Sources */, D73E5ED52C6A97F4007EB227 /* GradientFollowButton.swift in Sources */, D73E5ED62C6A97F4007EB227 /* AlbyButton.swift in Sources */, - D73E5ED72C6A97F4007EB227 /* MutinyButton.swift in Sources */, D73E5ED82C6A97F4007EB227 /* DamusVideoPlayerView.swift in Sources */, D73E5ED92C6A97F4007EB227 /* DamusVideoPlayer.swift in Sources */, D73E5EDA2C6A97F4007EB227 /* DamusVideoCoordinator.swift in Sources */, diff --git a/damus/Assets.xcassets/Profile/Contents.json b/damus/Assets.xcassets/Backgrounds/Contents.json diff --git a/damus/Assets.xcassets/eula-bg.imageset/Contents.json b/damus/Assets.xcassets/Backgrounds/eula-bg.imageset/Contents.json diff --git a/damus/Assets.xcassets/eula-bg.imageset/eula-bg.svg b/damus/Assets.xcassets/Backgrounds/eula-bg.imageset/eula-bg.svg diff --git a/damus/Assets.xcassets/gradient.imageset/Contents.json b/damus/Assets.xcassets/Backgrounds/gradient.imageset/Contents.json diff --git a/damus/Assets.xcassets/gradient.imageset/gradient.jpg b/damus/Assets.xcassets/Backgrounds/gradient.imageset/gradient.jpg Binary files differ. diff --git a/damus/Assets.xcassets/login-header.imageset/Contents.json b/damus/Assets.xcassets/Backgrounds/login-header.imageset/Contents.json diff --git a/damus/Assets.xcassets/login-header.imageset/header.svg b/damus/Assets.xcassets/Backgrounds/login-header.imageset/header.svg diff --git a/damus/Assets.xcassets/gradient-backgrounds/purple-blue-gradient-1.imageset/Contents.json b/damus/Assets.xcassets/Backgrounds/purple-blue-gradient-1.imageset/Contents.json diff --git a/damus/Assets.xcassets/gradient-backgrounds/purple-blue-gradient-1.imageset/shadow-2.png b/damus/Assets.xcassets/Backgrounds/purple-blue-gradient-1.imageset/shadow-2.png Binary files differ. diff --git a/damus/Assets.xcassets/gradient-backgrounds/purple-gradient-1.imageset/Contents.json b/damus/Assets.xcassets/Backgrounds/purple-gradient-1.imageset/Contents.json diff --git a/damus/Assets.xcassets/gradient-backgrounds/purple-gradient-1.imageset/shadow.png b/damus/Assets.xcassets/Backgrounds/purple-gradient-1.imageset/shadow.png Binary files differ. diff --git a/damus/Assets.xcassets/gradient-backgrounds/Contents.json b/damus/Assets.xcassets/Illustrations/Contents.json diff --git a/damus/Assets.xcassets/bitcoin-p2p.imageset/Contents.json b/damus/Assets.xcassets/Illustrations/bitcoin-p2p.imageset/Contents.json diff --git a/damus/Assets.xcassets/bitcoin-p2p.imageset/bitcoin-p2p.png b/damus/Assets.xcassets/Illustrations/bitcoin-p2p.imageset/bitcoin-p2p.png Binary files differ. diff --git a/damus/Assets.xcassets/damoose.imageset/Contents.json b/damus/Assets.xcassets/Illustrations/damoose.imageset/Contents.json diff --git a/damus/Assets.xcassets/damoose.imageset/damoose.jpeg b/damus/Assets.xcassets/Illustrations/damoose.imageset/damoose.jpeg Binary files differ. diff --git a/damus/Assets.xcassets/digital-nomad.imageset/Contents.json b/damus/Assets.xcassets/Illustrations/digital-nomad.imageset/Contents.json diff --git a/damus/Assets.xcassets/digital-nomad.imageset/digital-nomad.png b/damus/Assets.xcassets/Illustrations/digital-nomad.imageset/digital-nomad.png Binary files differ. diff --git a/damus/Assets.xcassets/encrypted-message.imageset/Contents.json b/damus/Assets.xcassets/Illustrations/encrypted-message.imageset/Contents.json diff --git a/damus/Assets.xcassets/encrypted-message.imageset/encrypted-message.png b/damus/Assets.xcassets/Illustrations/encrypted-message.imageset/encrypted-message.png Binary files differ. diff --git a/damus/Assets.xcassets/lightbulb.imageset/Contents.json b/damus/Assets.xcassets/Illustrations/lightbulb.imageset/Contents.json diff --git a/damus/Assets.xcassets/lightbulb.imageset/lightbulb.svg b/damus/Assets.xcassets/Illustrations/lightbulb.imageset/lightbulb.svg diff --git a/damus/Assets.xcassets/lnlink.imageset/Contents.json b/damus/Assets.xcassets/Illustrations/lnlink.imageset/Contents.json diff --git a/damus/Assets.xcassets/lnlink.imageset/lnlink.png b/damus/Assets.xcassets/Illustrations/lnlink.imageset/lnlink.png Binary files differ. diff --git a/damus/Assets.xcassets/undercover.imageset/Contents.json b/damus/Assets.xcassets/Illustrations/undercover.imageset/Contents.json diff --git a/damus/Assets.xcassets/undercover.imageset/undercover.png b/damus/Assets.xcassets/Illustrations/undercover.imageset/undercover.png Binary files differ. diff --git a/damus/Assets.xcassets/Profile/Contents.json b/damus/Assets.xcassets/Logos/Contents.json diff --git a/damus/Assets.xcassets/activityPub.imageset/ActivityPub-logo.svg b/damus/Assets.xcassets/Logos/activityPub.imageset/ActivityPub-logo.svg diff --git a/damus/Assets.xcassets/activityPub.imageset/Contents.json b/damus/Assets.xcassets/Logos/activityPub.imageset/Contents.json diff --git a/damus/Assets.xcassets/Logos/alby.imageset/Contents.json b/damus/Assets.xcassets/Logos/alby.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "alby.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "alby.svg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "alby.svg", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/alby.imageset/alby.svg b/damus/Assets.xcassets/Logos/alby.imageset/alby.svg diff --git a/damus/Assets.xcassets/atproto.imageset/Contents.json b/damus/Assets.xcassets/Logos/atproto.imageset/Contents.json diff --git a/damus/Assets.xcassets/atproto.imageset/atproto.png b/damus/Assets.xcassets/Logos/atproto.imageset/atproto.png Binary files differ. diff --git a/damus/Assets.xcassets/bbw.imageset/Contents.json b/damus/Assets.xcassets/Logos/bbw.imageset/Contents.json diff --git a/damus/Assets.xcassets/bbw.imageset/bbw.jpg b/damus/Assets.xcassets/Logos/bbw.imageset/bbw.jpg Binary files differ. diff --git a/damus/Assets.xcassets/bitcoin-logo.imageset/Contents.json b/damus/Assets.xcassets/Logos/bitcoin-logo.imageset/Contents.json diff --git a/damus/Assets.xcassets/bitcoin-logo.imageset/bitcoin-logo.svg b/damus/Assets.xcassets/Logos/bitcoin-logo.imageset/bitcoin-logo.svg diff --git a/damus/Assets.xcassets/blixt-wallet.imageset/Contents.json b/damus/Assets.xcassets/Logos/blixt-wallet.imageset/Contents.json diff --git a/damus/Assets.xcassets/blixt-wallet.imageset/blixt-wallet.png b/damus/Assets.xcassets/Logos/blixt-wallet.imageset/blixt-wallet.png Binary files differ. diff --git a/damus/Assets.xcassets/bluewallet.imageset/Contents.json b/damus/Assets.xcassets/Logos/bluewallet.imageset/Contents.json diff --git a/damus/Assets.xcassets/bluewallet.imageset/bluewallet.png b/damus/Assets.xcassets/Logos/bluewallet.imageset/bluewallet.png Binary files differ. diff --git a/damus/Assets.xcassets/breez.imageset/Contents.json b/damus/Assets.xcassets/Logos/breez.imageset/Contents.json diff --git a/damus/Assets.xcassets/breez.imageset/breez.jpg b/damus/Assets.xcassets/Logos/breez.imageset/breez.jpg Binary files differ. diff --git a/damus/Assets.xcassets/cashapp.imageset/Contents.json b/damus/Assets.xcassets/Logos/cashapp.imageset/Contents.json diff --git a/damus/Assets.xcassets/cashapp.imageset/cashapp.png b/damus/Assets.xcassets/Logos/cashapp.imageset/cashapp.png Binary files differ. diff --git a/damus/Assets.xcassets/Logos/coinos.imageset/Contents.json b/damus/Assets.xcassets/Logos/coinos.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "coinos.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/damus/Assets.xcassets/Logos/coinos.imageset/coinos.png b/damus/Assets.xcassets/Logos/coinos.imageset/coinos.png Binary files differ. diff --git a/damus/Assets.xcassets/logo-nobg.imageset/Contents.json b/damus/Assets.xcassets/Logos/logo-nobg.imageset/Contents.json diff --git a/damus/Assets.xcassets/logo-nobg.imageset/damus-nobg.png b/damus/Assets.xcassets/Logos/logo-nobg.imageset/damus-nobg.png Binary files differ. diff --git a/damus/Assets.xcassets/mutiny.imageset/Contents.json b/damus/Assets.xcassets/Logos/mutiny.imageset/Contents.json diff --git a/damus/Assets.xcassets/mutiny.imageset/mutiny.png b/damus/Assets.xcassets/Logos/mutiny.imageset/mutiny.png Binary files differ. diff --git a/damus/Assets.xcassets/muun.imageset/Contents.json b/damus/Assets.xcassets/Logos/muun.imageset/Contents.json diff --git a/damus/Assets.xcassets/muun.imageset/muun.png b/damus/Assets.xcassets/Logos/muun.imageset/muun.png Binary files differ. diff --git a/damus/Assets.xcassets/nostr-logo.imageset/Contents.json b/damus/Assets.xcassets/Logos/nostr-logo.imageset/Contents.json diff --git a/damus/Assets.xcassets/nostr-logo.imageset/nostr-logo.svg b/damus/Assets.xcassets/Logos/nostr-logo.imageset/nostr-logo.svg diff --git a/damus/Assets.xcassets/phoenix.imageset/Contents.json b/damus/Assets.xcassets/Logos/phoenix.imageset/Contents.json diff --git a/damus/Assets.xcassets/phoenix.imageset/phoenix.png b/damus/Assets.xcassets/Logos/phoenix.imageset/phoenix.png Binary files differ. diff --git a/damus/Assets.xcassets/river.imageset/Contents.json b/damus/Assets.xcassets/Logos/river.imageset/Contents.json diff --git a/damus/Assets.xcassets/river.imageset/river.png b/damus/Assets.xcassets/Logos/river.imageset/river.png Binary files differ. diff --git a/damus/Assets.xcassets/rss.imageset/Contents.json b/damus/Assets.xcassets/Logos/rss.imageset/Contents.json diff --git a/damus/Assets.xcassets/rss.imageset/rss.png b/damus/Assets.xcassets/Logos/rss.imageset/rss.png Binary files differ. diff --git a/damus/Assets.xcassets/strike.imageset/Contents.json b/damus/Assets.xcassets/Logos/strike.imageset/Contents.json diff --git a/damus/Assets.xcassets/strike.imageset/strike.png b/damus/Assets.xcassets/Logos/strike.imageset/strike.png Binary files differ. diff --git a/damus/Assets.xcassets/tor.imageset/Contents.json b/damus/Assets.xcassets/Logos/tor.imageset/Contents.json diff --git a/damus/Assets.xcassets/tor.imageset/tor.svg.png b/damus/Assets.xcassets/Logos/tor.imageset/tor.svg.png Binary files differ. diff --git a/damus/Assets.xcassets/walletofsatoshi.imageset/Contents.json b/damus/Assets.xcassets/Logos/walletofsatoshi.imageset/Contents.json diff --git a/damus/Assets.xcassets/walletofsatoshi.imageset/walletofsatoshi.png b/damus/Assets.xcassets/Logos/walletofsatoshi.imageset/walletofsatoshi.png Binary files differ. diff --git a/damus/Assets.xcassets/zebedee.imageset/Contents.json b/damus/Assets.xcassets/Logos/zebedee.imageset/Contents.json diff --git a/damus/Assets.xcassets/zebedee.imageset/zebedee.png b/damus/Assets.xcassets/Logos/zebedee.imageset/zebedee.png Binary files differ. diff --git a/damus/Assets.xcassets/zeusln.imageset/Contents.json b/damus/Assets.xcassets/Logos/zeusln.imageset/Contents.json diff --git a/damus/Assets.xcassets/zeusln.imageset/zeus.png b/damus/Assets.xcassets/Logos/zeusln.imageset/zeus.png Binary files differ. diff --git a/damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json b/damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "profile-banner.jpeg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/damus/Assets.xcassets/Profile/profile-banner.imageset/profile-banner.jpeg b/damus/Assets.xcassets/Profile/profile-banner.imageset/profile-banner.jpeg Binary files differ. diff --git a/damus/Assets.xcassets/alby.imageset/Contents.json b/damus/Assets.xcassets/alby.imageset/Contents.json @@ -1,23 +0,0 @@ -{ - "images": [ - { - "filename": "alby.svg", - "idiom": "universal", - "scale": "1x" - }, - { - "idiom": "universal", - "scale": "2x", - "filename": "alby.svg" - }, - { - "idiom": "universal", - "scale": "3x", - "filename": "alby.svg" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/damus/Components/Gradients/MutinyGradient.swift b/damus/Components/Gradients/MutinyGradient.swift @@ -1,15 +0,0 @@ -// -// MutinyGradient.swift -// damus -// -// Created by eric on 3/9/24. -// - -import SwiftUI - -fileprivate let mutiny_grad_c1 = hex_col(r: 39, g: 95, b: 161) -fileprivate let mutiny_grad_c2 = hex_col(r: 13, g: 33, b: 56) -fileprivate let mutiny_grad = [mutiny_grad_c2, mutiny_grad_c1] - -let MutinyGradient: LinearGradient = - LinearGradient(colors: mutiny_grad, startPoint: .top, endPoint: .bottom) diff --git a/damus/Views/Buttons/CoinosButton.swift b/damus/Views/Buttons/CoinosButton.swift @@ -0,0 +1,48 @@ +// +// CoinosButton.swift +// damus +// +// Created by eric on 1/7/25. +// + +import SwiftUI + +struct CoinosButton: View { + let action: () -> () + + @Environment(\.colorScheme) var colorScheme + + init(action: @escaping () -> ()) { + self.action = action + } + + var body: some View { + Button(action: { + action() + }) { + HStack { + Image("coinos") + .resizable() + .frame(width: 35, height: 35) + + Text("Connect to Coinos", comment: "Button to attach a Coinos Wallet, a service that provides a Lightning wallet for zapping sats. Coinos is the name of the service and should not be translated.") + .padding() + .bold() + } + .frame(minWidth: 300, maxWidth: .infinity, alignment: .center) + .foregroundColor(DamusColors.black) + .background { + RoundedRectangle(cornerRadius: 12) + .fill(GrayGradient, strokeBorder: colorScheme == .light ? DamusColors.black.opacity(0.2) : DamusColors.white.opacity(0.2), lineWidth: 1) + } + } + } +} + +struct CoinosButton_Previews: PreviewProvider { + static var previews: some View { + CoinosButton(action: { + print("mutiny button") + }) + } +} diff --git a/damus/Views/Buttons/MutinyButton.swift b/damus/Views/Buttons/MutinyButton.swift @@ -1,47 +0,0 @@ -// -// MutinyButton.swift -// damus -// -// Created by eric on 3/9/24. -// - -import SwiftUI - -struct MutinyButton: View { - let action: () -> () - - @Environment(\.colorScheme) var colorScheme - - init(action: @escaping () -> ()) { - self.action = action - } - - var body: some View { - Button(action: { - action() - }) { - HStack { - Image("mutiny") - .resizable() - .frame(width: 45, height: 45) - - Text("Connect to Mutiny Wallet", comment: "Button to attach an Mutiny Wallet, a service that provides a Lightning wallet for zapping sats. Mutiny is the name of the service and should not be translated.") - .padding() - } - .frame(minWidth: 300, maxWidth: .infinity, alignment: .center) - .foregroundColor(DamusColors.white) - .background { - RoundedRectangle(cornerRadius: 12) - .fill(MutinyGradient, strokeBorder: colorScheme == .light ? DamusColors.black.opacity(0.2) : DamusColors.white.opacity(0.2), lineWidth: 1) - } - } - } -} - -struct MutinyButton_Previews: PreviewProvider { - static var previews: some View { - MutinyButton(action: { - print("mutiny button") - }) - } -} diff --git a/damus/Views/Wallet/ConnectWalletView.swift b/damus/Views/Wallet/ConnectWalletView.swift @@ -96,16 +96,9 @@ struct ConnectWalletView: View { openURL(URL(string:"https://nwc.getalby.com/apps/new?c=Damus")!) } - // - // Mutiny Wallet NWC is way too advanced to recommend for normal - // users until they have a way to do async receive. - // - - /* - MutinyButton() { - openURL(URL(string:"https://app.mutinywallet.com/settings/connections?callbackUri=nostr%2bwalletconnect&name=Damus")!) + CoinosButton() { + openURL(URL(string:"https://coinos.io/settings/nostr")!) } - */ Button(action: { if let pasted_nwc = UIPasteboard.general.string {
