From 973e9fe7140388b5b0da4fb0802c5ea5a36c43af Mon Sep 17 00:00:00 2001 From: Ben Weeks Date: Sat, 27 May 2023 04:32:06 +0100 Subject: [PATCH] Custom iconography added for other areas of the app. Changelog-Added: Custom iconography added for other areas of the app. --- .../Contents.json | 0 .../bookmark.fill.fill.svg | 0 .../shaka-full.imageset/Contents.json | 15 - .../shaka-full.imageset/shaka-full.pdf | 88 ----- .../shaka-line.imageset/Contents.json | 15 - .../shaka-line.imageset/shaka-line.pdf | 323 ------------------ damus/Components/IconLabel.swift | 2 +- damus/Components/InvoiceView.swift | 6 +- damus/Components/NIP05Badge.swift | 4 +- damus/Components/Reposted.swift | 2 +- damus/Components/WebsiteLink.swift | 2 +- damus/Components/ZapButton.swift | 11 +- damus/ContentView.swift | 2 +- damus/Views/ActionBar/EventActionBar.swift | 22 +- damus/Views/ActionBar/RepostAction.swift | 2 +- damus/Views/ActionBar/ShareAction.swift | 4 +- damus/Views/ActionBar/ShareActionButton.swift | 4 +- damus/Views/AddRelayView.swift | 4 +- damus/Views/BookmarksView.swift | 2 +- damus/Views/Buttons/FriendsButton.swift | 8 +- damus/Views/ConfigView.swift | 23 +- damus/Views/CreateAccountView.swift | 3 +- damus/Views/DMChatView.swift | 2 +- .../Views/Empty Views/EmptyTimelineView.swift | 2 +- .../Empty Views/EmptyUserSearchView.swift | 2 +- damus/Views/EventView.swift | 2 +- damus/Views/Events/EventMenu.swift | 20 +- damus/Views/Events/ZapEvent.swift | 2 +- .../Images/ImageContextMenuModifier.swift | 8 +- damus/Views/Images/ProfilePicImageView.swift | 2 +- damus/Views/Muting/MutelistView.swift | 2 +- .../Views/Notifications/EventGroupView.swift | 10 +- damus/Views/ParticipantsView.swift | 2 +- damus/Views/PostButton.swift | 2 +- damus/Views/PostView.swift | 8 +- .../Profile/EditProfilePictureControl.swift | 2 +- damus/Views/Profile/MaybeAnonPfpView.swift | 3 +- damus/Views/Profile/ProfileView.swift | 29 +- damus/Views/QRCodeView.swift | 2 +- damus/Views/Relays/RecommendedRelayView.swift | 17 +- damus/Views/Relays/RelayStatus.swift | 15 +- damus/Views/Relays/RelayType.swift | 4 +- damus/Views/Relays/RelayView.swift | 21 +- damus/Views/SaveKeysView.swift | 2 +- damus/Views/SearchHomeView.swift | 2 +- damus/Views/SelectWalletView.swift | 2 +- damus/Views/Settings/KeySettingsView.swift | 2 +- damus/Views/Zaps/CustomizeZapView.swift | 8 +- damus/Views/Zaps/ZapTypePicker.swift | 17 +- 49 files changed, 167 insertions(+), 565 deletions(-) rename damus/Assets.xcassets/iconography/{bookmark.fill.fill.imageset => bookmark.fill.imageset}/Contents.json (100%) rename damus/Assets.xcassets/iconography/{bookmark.fill.fill.imageset => bookmark.fill.imageset}/bookmark.fill.fill.svg (100%) delete mode 100644 damus/Assets.xcassets/shaka-full.imageset/Contents.json delete mode 100644 damus/Assets.xcassets/shaka-full.imageset/shaka-full.pdf delete mode 100644 damus/Assets.xcassets/shaka-line.imageset/Contents.json delete mode 100644 damus/Assets.xcassets/shaka-line.imageset/shaka-line.pdf diff --git a/damus/Assets.xcassets/iconography/bookmark.fill.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/bookmark.fill.imageset/Contents.json similarity index 100% rename from damus/Assets.xcassets/iconography/bookmark.fill.fill.imageset/Contents.json rename to damus/Assets.xcassets/iconography/bookmark.fill.imageset/Contents.json diff --git a/damus/Assets.xcassets/iconography/bookmark.fill.fill.imageset/bookmark.fill.fill.svg b/damus/Assets.xcassets/iconography/bookmark.fill.imageset/bookmark.fill.fill.svg similarity index 100% rename from damus/Assets.xcassets/iconography/bookmark.fill.fill.imageset/bookmark.fill.fill.svg rename to damus/Assets.xcassets/iconography/bookmark.fill.imageset/bookmark.fill.fill.svg diff --git a/damus/Assets.xcassets/shaka-full.imageset/Contents.json b/damus/Assets.xcassets/shaka-full.imageset/Contents.json deleted file mode 100644 index 995663b8..00000000 --- a/damus/Assets.xcassets/shaka-full.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "shaka-full.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/damus/Assets.xcassets/shaka-full.imageset/shaka-full.pdf b/damus/Assets.xcassets/shaka-full.imageset/shaka-full.pdf deleted file mode 100644 index bd09e619..00000000 --- a/damus/Assets.xcassets/shaka-full.imageset/shaka-full.pdf +++ /dev/null @@ -1,88 +0,0 @@ -%PDF-1.7 - -1 0 obj - << >> -endobj - -2 0 obj - << /Length 3 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 -0.073975 cm -1.000000 1.000000 1.000000 scn -1.295334 8.661732 m -3.613694 8.367855 l -4.475733 8.733568 5.268113 9.771931 5.474915 10.327032 c -6.083156 11.959681 5.507567 14.604573 5.474915 15.061715 c -5.448792 15.427428 6.008246 15.693006 6.291239 15.780080 c -7.571236 15.858447 8.508359 14.876789 8.642253 13.984165 c -8.740212 13.331103 8.576948 11.752880 8.381030 10.849482 c -8.979668 10.936556 10.980525 10.901726 11.868687 10.849482 c -12.756847 10.797236 13.474895 10.196423 14.193260 9.412750 c -14.767952 8.237244 13.953805 7.725680 13.474895 7.616838 c -13.834077 7.257654 l -14.781013 5.918882 13.649043 5.178749 13.115711 5.004600 c -13.474895 4.743376 l -14.487136 3.763786 13.246323 2.751544 13.017752 2.882155 c -11.058574 3.176033 l -15.499378 1.673996 l -16.054478 0.400530 15.074889 0.073999 14.781013 0.073999 c -8.576947 1.673996 l -6.291239 1.673996 5.311650 1.869914 4.299407 2.163791 c -4.157911 2.131138 3.659409 1.987464 2.797370 1.673996 c -1.935332 1.360527 1.219143 2.087601 0.968804 2.490320 c --0.285071 4.083785 -0.467927 7.257655 1.295334 8.661732 c -h -f -n -Q - -endstream -endobj - -3 0 obj - 1149 -endobj - -4 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 15.666626 15.710510 ] - /Resources 1 0 R - /Contents 2 0 R - /Parent 5 0 R - >> -endobj - -5 0 obj - << /Kids [ 4 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -6 0 obj - << /Pages 5 0 R - /Type /Catalog - >> -endobj - -xref -0 7 -0000000000 65535 f -0000000010 00000 n -0000000034 00000 n -0000001239 00000 n -0000001262 00000 n -0000001435 00000 n -0000001509 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 6 0 R - /Size 7 ->> -startxref -1568 -%%EOF \ No newline at end of file diff --git a/damus/Assets.xcassets/shaka-line.imageset/Contents.json b/damus/Assets.xcassets/shaka-line.imageset/Contents.json deleted file mode 100644 index 34158f57..00000000 --- a/damus/Assets.xcassets/shaka-line.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "shaka-line.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/damus/Assets.xcassets/shaka-line.imageset/shaka-line.pdf b/damus/Assets.xcassets/shaka-line.imageset/shaka-line.pdf deleted file mode 100644 index a98c0c01..00000000 --- a/damus/Assets.xcassets/shaka-line.imageset/shaka-line.pdf +++ /dev/null @@ -1,323 +0,0 @@ -%PDF-1.7 - -1 0 obj - << >> -endobj - -2 0 obj - << /Length 3 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.474731 -0.563965 cm -1.000000 1.000000 1.000000 scn -3.613694 9.332577 m -3.553993 8.861599 l -3.637261 8.851044 3.721838 8.862753 3.799107 8.895533 c -3.613694 9.332577 l -h -1.295334 9.626453 m -1.355035 10.097433 l -1.227973 10.113539 1.099794 10.077623 0.999601 9.997839 c -1.295334 9.626453 l -h -0.968804 3.455042 m -1.372000 3.705677 l -1.362764 3.720535 1.352713 3.734872 1.341894 3.748621 c -0.968804 3.455042 l -h -4.299407 3.128512 m -4.431771 3.584435 l -4.353942 3.607030 4.271623 3.609325 4.192656 3.591103 c -4.299407 3.128512 l -h -8.576947 2.638718 m -8.695503 3.098424 l -8.656776 3.108411 8.616942 3.113465 8.576947 3.113465 c -8.576947 2.638718 l -h -14.781013 1.038721 m -14.662457 0.579016 l -14.701184 0.569027 14.741018 0.563974 14.781013 0.563974 c -14.781013 1.038721 l -h -15.499378 2.638718 m -15.934578 2.828420 l -15.881091 2.951125 15.778289 3.045548 15.651489 3.088437 c -15.499378 2.638718 l -h -11.058574 4.140755 m -11.128998 4.610250 l -10.885809 4.646729 10.655017 4.491467 10.597156 4.252461 c -10.539293 4.013455 10.673516 3.769826 10.906463 3.691035 c -11.058574 4.140755 l -h -13.017752 3.846877 m -13.253292 4.259073 l -13.202273 4.288227 13.146286 4.307655 13.088176 4.316372 c -13.017752 3.846877 l -h -13.474895 5.708097 m -13.805044 6.049252 l -13.789093 6.064689 13.772079 6.078987 13.754128 6.092043 c -13.474895 5.708097 l -h -13.115711 5.969321 m -12.968349 6.420619 l -12.798800 6.365256 12.674588 6.219535 12.646772 6.043359 c -12.618958 5.867183 12.692234 5.690281 12.836478 5.585376 c -13.115711 5.969321 l -h -13.834077 8.222376 m -14.221668 8.496526 l -14.206144 8.518474 14.188784 8.539063 14.169774 8.558073 c -13.834077 8.222376 l -h -13.474895 8.581559 m -13.369680 9.044500 l -13.201114 9.006190 13.066693 8.879284 13.018762 8.713197 c -12.970830 8.547110 13.016963 8.368095 13.139197 8.245862 c -13.474895 8.581559 l -h -14.193260 10.377472 m -14.619765 10.585986 l -14.599768 10.626891 14.573989 10.664707 14.543221 10.698271 c -14.193260 10.377472 l -h -8.381030 11.814203 m -7.917068 11.914822 l -7.884080 11.762714 7.927746 11.604099 8.033934 11.490305 c -8.140121 11.376513 8.295343 11.321997 8.449365 11.344399 c -8.381030 11.814203 l -h -8.642253 14.948887 m -9.111748 15.019311 l -8.642253 14.948887 l -h -6.291239 16.744801 m -6.262227 17.218662 l -6.224693 17.216364 6.187564 17.209614 6.151623 17.198555 c -6.291239 16.744801 l -h -5.474915 16.026436 m -5.948456 16.060261 l -5.474915 16.026436 l -h -5.474915 11.291754 m -5.030037 11.457493 l -5.474915 11.291754 l -h -3.673396 9.803555 m -1.355035 10.097433 l -1.235632 9.155476 l -3.553993 8.861599 l -3.673396 9.803555 l -h -0.999601 9.997839 m --0.029049 9.178730 -0.454726 7.875908 -0.474048 6.619066 c --0.493367 5.362488 -0.110331 4.058727 0.595713 3.161463 c -1.341894 3.748621 l -0.794064 4.444821 0.458734 5.524729 0.475334 6.604470 c -0.491930 7.683949 0.856455 8.670100 1.591066 9.255068 c -0.999601 9.997839 l -h -0.565608 3.204407 m -0.721970 2.952868 1.013515 2.611341 1.407507 2.372385 c -1.811404 2.127421 2.357187 1.973489 2.959612 2.192553 c -2.635129 3.084882 l -2.375515 2.990478 2.132184 3.043347 1.899893 3.184233 c -1.657696 3.331126 1.465977 3.554496 1.372000 3.705677 c -0.565608 3.204407 l -h -2.959612 2.192553 m -3.816493 2.504146 4.293336 2.639887 4.406158 2.665923 c -4.192656 3.591103 l -4.022485 3.551832 3.502325 3.400227 2.635129 3.084882 c -2.959612 2.192553 l -h -4.167043 2.672591 m -5.229115 2.364247 6.254152 2.163970 8.576947 2.163970 c -8.576947 3.113465 l -6.328326 3.113465 5.394184 3.305025 4.431771 3.584435 c -4.167043 2.672591 l -h -8.458392 2.179011 m -14.662457 0.579016 l -14.899569 1.498427 l -8.695503 3.098424 l -8.458392 2.179011 l -h -14.781013 0.563974 m -15.036198 0.563974 15.495326 0.684875 15.814721 1.047266 c -16.180891 1.462728 16.264221 2.072176 15.934578 2.828420 c -15.064179 2.449016 l -15.289635 1.931793 15.160722 1.741243 15.102402 1.675073 c -15.055794 1.622190 14.990156 1.579316 14.916806 1.549556 c -14.881134 1.535082 14.847747 1.525430 14.820526 1.519657 c -14.791491 1.513498 14.777695 1.513469 14.781013 1.513469 c -14.781013 0.563974 l -h -15.651489 3.088437 m -11.210685 4.590474 l -10.906463 3.691035 l -15.347267 2.188998 l -15.651489 3.088437 l -h -10.988150 3.671260 m -12.947328 3.377382 l -13.088176 4.316372 l -11.128998 4.610250 l -10.988150 3.671260 l -h -12.782211 3.434681 m -12.991495 3.315090 13.204453 3.370091 13.288217 3.396689 c -13.400116 3.432221 13.506123 3.490767 13.598186 3.554502 c -13.783985 3.683133 13.977411 3.877748 14.120350 4.119644 c -14.264680 4.363894 14.369576 4.678114 14.335162 5.031647 c -14.300108 5.391746 14.125634 5.739002 13.805044 6.049252 c -13.144745 5.366943 l -13.330275 5.187398 13.380290 5.040778 13.390134 4.939653 c -13.400617 4.831963 13.370820 4.717613 13.302905 4.602680 c -13.233600 4.485394 13.137231 4.390213 13.057724 4.335170 c -13.017135 4.307070 12.996612 4.300308 13.000857 4.301657 c -13.003194 4.302399 13.024761 4.309311 13.061064 4.310122 c -13.095938 4.310902 13.170414 4.306433 13.253292 4.259073 c -12.782211 3.434681 l -h -13.754128 6.092043 m -13.394944 6.353267 l -12.836478 5.585376 l -13.195662 5.324152 l -13.754128 6.092043 l -h -13.263074 5.518023 m -13.593105 5.625790 14.123367 5.907292 14.433812 6.409482 c -14.595931 6.671733 14.696482 6.993351 14.669847 7.364054 c -14.643518 7.730516 14.495621 8.109214 14.221668 8.496526 c -13.446486 7.948226 l -13.646002 7.666152 13.711709 7.450294 13.722795 7.296009 c -13.733575 7.145966 13.695351 7.020646 13.626177 6.908748 c -13.474038 6.662641 13.171650 6.487002 12.968349 6.420619 c -13.263074 5.518023 l -h -14.169774 8.558073 m -13.810592 8.917255 l -13.139197 8.245862 l -13.498380 7.886679 l -14.169774 8.558073 l -h -13.580109 8.118617 m -13.896242 8.190466 14.344993 8.395787 14.624650 8.816864 c -14.929440 9.275781 14.963785 9.882310 14.619765 10.585986 c -13.766754 10.168959 l -13.997427 9.697128 13.912044 9.460121 13.833706 9.342171 c -13.730235 9.186377 13.532457 9.081495 13.369680 9.044500 c -13.580109 8.118617 l -h -14.543221 10.698271 m -13.820906 11.486253 12.989320 12.223852 11.896564 12.288132 c -11.840808 11.340275 l -12.524374 11.300065 13.128883 10.836036 13.843298 10.056674 c -14.543221 10.698271 l -h -11.896564 12.288132 m -11.441970 12.314873 10.711069 12.336796 10.019300 12.341186 c -9.341933 12.345484 8.654247 12.333687 8.312695 12.284006 c -8.449365 11.344399 l -8.706450 11.381794 9.318512 11.396118 10.013274 11.391710 c -10.693633 11.387392 11.407242 11.365778 11.840808 11.340275 c -11.896564 12.288132 l -h -8.844993 11.713585 m -8.948084 12.188952 9.040332 12.829445 9.094679 13.432834 c -9.147870 14.023395 9.169946 14.631327 9.111748 15.019311 c -8.172758 14.878462 l -8.212520 14.613384 8.201942 14.105675 8.149012 13.518009 c -8.097237 12.943172 8.009893 12.342852 7.917068 11.914822 c -8.844993 11.713585 l -h -9.111748 15.019311 m -8.944062 16.137217 7.805658 17.313158 6.262227 17.218662 c -6.320251 16.270941 l -7.336813 16.333179 8.072657 15.545805 8.172758 14.878462 c -9.111748 15.019311 l -h -6.151623 17.198555 m -5.976391 17.144638 5.715709 17.036982 5.490986 16.876261 c -5.292936 16.734617 4.969444 16.439627 5.001374 15.992612 c -5.948456 16.060261 l -5.951383 16.019283 5.934667 15.999795 5.943361 16.012491 c -5.954769 16.029152 5.984430 16.061831 6.043331 16.103956 c -6.162553 16.189222 6.323094 16.257891 6.430855 16.291048 c -6.151623 17.198555 l -h -5.001374 15.992612 m -5.011176 15.855374 5.059216 15.566318 5.104405 15.255149 c -5.152757 14.922197 5.207128 14.509316 5.241940 14.062993 c -5.312967 13.152368 5.295928 12.171200 5.030037 11.457493 c -5.919792 11.126015 l -6.262142 12.044956 6.261431 13.202559 6.188560 14.136827 c -6.151423 14.612950 6.093790 15.049047 6.044043 15.391605 c -5.991133 15.755945 5.954979 15.968927 5.948456 16.060261 c -5.001374 15.992612 l -h -5.030037 11.457493 m -4.953650 11.252455 4.742510 10.903708 4.434547 10.555828 c -4.127778 10.209298 3.769400 9.914337 3.428282 9.769621 c -3.799107 8.895533 l -4.320028 9.116529 4.788858 9.523607 5.145489 9.926461 c -5.500926 10.327968 5.789377 10.775953 5.919792 11.126015 c -5.030037 11.457493 l -h -f -n -Q - -endstream -endobj - -3 0 obj - 7995 -endobj - -4 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 16.615845 16.660034 ] - /Resources 1 0 R - /Contents 2 0 R - /Parent 5 0 R - >> -endobj - -5 0 obj - << /Kids [ 4 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -6 0 obj - << /Pages 5 0 R - /Type /Catalog - >> -endobj - -xref -0 7 -0000000000 65535 f -0000000010 00000 n -0000000034 00000 n -0000008085 00000 n -0000008108 00000 n -0000008281 00000 n -0000008355 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 6 0 R - /Size 7 ->> -startxref -8414 -%%EOF \ No newline at end of file diff --git a/damus/Components/IconLabel.swift b/damus/Components/IconLabel.swift index 40b96629..bac9f4a6 100644 --- a/damus/Components/IconLabel.swift +++ b/damus/Components/IconLabel.swift @@ -21,7 +21,7 @@ struct IconLabel: View { var body: some View { HStack(spacing: 0) { - Image(systemName: img_name) + Image(img_name) .foregroundColor(img_color) .frame(width: 20) .padding([.trailing], 20) diff --git a/damus/Components/InvoiceView.swift b/damus/Components/InvoiceView.swift index 420b2766..f20a7a0c 100644 --- a/damus/Components/InvoiceView.swift +++ b/damus/Components/InvoiceView.swift @@ -25,10 +25,10 @@ struct InvoiceView: View { UIPasteboard.general.string = invoice.string } label: { if !copied { - Image(systemName: "doc.on.clipboard") + Image("copy2") .foregroundColor(.gray) } else { - Image(systemName: "checkmark.circle") + Image("check-circle") .foregroundColor(DamusColors.green) } } @@ -63,7 +63,7 @@ struct InvoiceView: View { VStack(alignment: .leading, spacing: 12) { HStack { - Label("", systemImage: "bolt.fill") + Label("", image: "zap.fill") .foregroundColor(.orange) Text("Lightning Invoice", comment: "Indicates that the view is for paying a Lightning invoice.") Spacer() diff --git a/damus/Components/NIP05Badge.swift b/damus/Components/NIP05Badge.swift index 7756f42e..afd6a645 100644 --- a/damus/Components/NIP05Badge.swift +++ b/damus/Components/NIP05Badge.swift @@ -32,11 +32,11 @@ struct NIP05Badge: View { Group { if nip05_color { LINEAR_GRADIENT - .mask(Image(systemName: "checkmark.seal.fill") + .mask(Image("check-circle.fill") .resizable() ).frame(width: 14, height: 14) } else if show_domain { - Image(systemName: "checkmark.seal.fill") + Image("check-circle.fill") .font(.footnote) .nip05_colorized(gradient: nip05_color) } diff --git a/damus/Components/Reposted.swift b/damus/Components/Reposted.swift index 51b0d108..1475527c 100644 --- a/damus/Components/Reposted.swift +++ b/damus/Components/Reposted.swift @@ -14,7 +14,7 @@ struct Reposted: View { var body: some View { HStack(alignment: .center) { - Image(systemName: "arrow.2.squarepath") + Image("repost") .foregroundColor(Color.gray) ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_nip5_domain: false) .foregroundColor(Color.gray) diff --git a/damus/Components/WebsiteLink.swift b/damus/Components/WebsiteLink.swift index 992fa269..53e72bfc 100644 --- a/damus/Components/WebsiteLink.swift +++ b/damus/Components/WebsiteLink.swift @@ -13,7 +13,7 @@ struct WebsiteLink: View { var body: some View { HStack { - Image(systemName: "link") + Image("link") .foregroundColor(.gray) .font(.footnote) diff --git a/damus/Components/ZapButton.swift b/damus/Components/ZapButton.swift index 31cc50f3..4d3ecc72 100644 --- a/damus/Components/ZapButton.swift +++ b/damus/Components/ZapButton.swift @@ -45,11 +45,11 @@ struct ZapButton: View { var zap_img: String { switch our_zap { case .none: - return "bolt" + return "zap" case .zap: - return "bolt.fill" + return "zap.fill" case .pending: - return "bolt.fill" + return "zap.fill" } } @@ -120,9 +120,12 @@ struct ZapButton: View { HStack(spacing: 4) { Button(action: { }, label: { - Image(systemName: zap_img) + Image(zap_img) + .resizable() .foregroundColor(zap_color) .font(.footnote.weight(.medium)) + .aspectRatio(contentMode: .fit) + .frame(width:15, height: 15) }) if zaps.zap_total > 0 { diff --git a/damus/ContentView.swift b/damus/ContentView.swift index 526cfaa2..71f808a0 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -291,7 +291,7 @@ struct ContentView: View { self.active_sheet = .filter }) { // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease..., line.3.horizontail.decrease - Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), systemImage: "line.3.horizontal.decrease") + Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), image: "filter") .foregroundColor(.gray) //.contentShape(Rectangle()) } diff --git a/damus/Views/ActionBar/EventActionBar.swift b/damus/Views/ActionBar/EventActionBar.swift index c0317d72..2ea94211 100644 --- a/damus/Views/ActionBar/EventActionBar.swift +++ b/damus/Views/ActionBar/EventActionBar.swift @@ -43,7 +43,7 @@ struct EventActionBar: View { HStack { if damus_state.keypair.privkey != nil { HStack(spacing: 4) { - EventActionButton(img: "bubble.left", col: bar.replied ? DamusColors.purple : Color.gray) { + EventActionButton(img: "bubble2", col: bar.replied ? DamusColors.purple : Color.gray) { notify(.compose, PostAction.replying_to(event)) } .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button")) @@ -55,7 +55,7 @@ struct EventActionBar: View { Spacer() HStack(spacing: 4) { - EventActionButton(img: "arrow.2.squarepath", col: bar.boosted ? Color.green : nil) { + EventActionButton(img: "repost", col: bar.boosted ? Color.green : nil) { if bar.boosted { notify(.delete, bar.our_boost) } else { @@ -92,7 +92,7 @@ struct EventActionBar: View { } Spacer() - EventActionButton(img: "square.and.arrow.up", col: Color.gray) { + EventActionButton(img: "upload", col: Color.gray) { show_share_action = true } .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a post")) @@ -161,9 +161,12 @@ struct EventActionBar: View { func EventActionButton(img: String, col: Color?, action: @escaping () -> ()) -> some View { Button(action: action) { - Image(systemName: img) + Image(img) + .resizable() .foregroundColor(col == nil ? Color.gray : col!) .font(.footnote.weight(.medium)) + .aspectRatio(contentMode: .fit) + .frame(width: 15, height: 15) } } @@ -188,11 +191,16 @@ struct LikeButton: View { }) { if liked { LINEAR_GRADIENT - .mask(Image("shaka-full") + .mask(Image("shaka.fill") .resizable() - ).frame(width: 14, height: 14) + .aspectRatio(contentMode: .fit) + ) + .frame(width: 15, height: 15) } else { - Image("shaka-line") + Image("shaka") + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: 15, height: 15) .foregroundColor(.gray) } } diff --git a/damus/Views/ActionBar/RepostAction.swift b/damus/Views/ActionBar/RepostAction.swift index 189ba2a3..d54fbed6 100644 --- a/damus/Views/ActionBar/RepostAction.swift +++ b/damus/Views/ActionBar/RepostAction.swift @@ -28,7 +28,7 @@ struct RepostAction: View { damus_state.postbox.send(boost) } label: { - Label(NSLocalizedString("Repost", comment: "Button to repost a note"), systemImage: "arrow.2.squarepath") + Label(NSLocalizedString("Repost", comment: "Button to repost a note"), image: "repost") .frame(maxWidth: .infinity, minHeight: 50, maxHeight: 50, alignment: .leading) } diff --git a/damus/Views/ActionBar/ShareAction.swift b/damus/Views/ActionBar/ShareAction.swift index ac30f5db..41571956 100644 --- a/damus/Views/ActionBar/ShareAction.swift +++ b/damus/Views/ActionBar/ShareAction.swift @@ -41,7 +41,7 @@ struct ShareAction: View { UIPasteboard.general.string = "https://damus.io/" + (bech32_note_id(event.id) ?? event.id) } - let bookmarkImg = isBookmarked ? "bookmark.slash" : "bookmark" + let bookmarkImg = isBookmarked ? "bookmark.fill" : "bookmark" let bookmarkTxt = isBookmarked ? NSLocalizedString("Remove Bookmark", comment: "Button text to remove bookmark from a note.") : NSLocalizedString("Add Bookmark", comment: "Button text to add bookmark to a note.") ShareActionButton(img: bookmarkImg, text: bookmarkTxt) { dismiss() @@ -54,7 +54,7 @@ struct ShareAction: View { NotificationCenter.default.post(name: .broadcast_event, object: event) } - ShareActionButton(img: "square.and.arrow.up", text: NSLocalizedString("Share Via...", comment: "Button to present iOS share sheet")) { + ShareActionButton(img: "upload", text: NSLocalizedString("Share Via...", comment: "Button to present iOS share sheet")) { show_share = true dismiss() } diff --git a/damus/Views/ActionBar/ShareActionButton.swift b/damus/Views/ActionBar/ShareActionButton.swift index f9a96212..11e1188d 100644 --- a/damus/Views/ActionBar/ShareActionButton.swift +++ b/damus/Views/ActionBar/ShareActionButton.swift @@ -27,7 +27,7 @@ struct ShareActionButton: View { var body: some View { Button(action: action) { VStack() { - Image(systemName: img) + Image(img) .foregroundColor(col) .font(.system(size: 23, weight: .bold)) .overlay { @@ -48,6 +48,6 @@ struct ShareActionButton: View { struct ShareActionButton_Previews: PreviewProvider { static var previews: some View { - ShareActionButton(img: "figure.flexibility", text: "Stretch", action: {}) + ShareActionButton(img: "link", text: "Stretch", action: {}) } } diff --git a/damus/Views/AddRelayView.swift b/damus/Views/AddRelayView.swift index 832018b4..89974378 100644 --- a/damus/Views/AddRelayView.swift +++ b/damus/Views/AddRelayView.swift @@ -19,7 +19,7 @@ struct AddRelayView: View { .autocorrectionDisabled(true) .textInputAutocapitalization(.never) - Label("", systemImage: "xmark.circle.fill") + Label("", image: "close-circle") .foregroundColor(.accentColor) .padding(.trailing, -25.0) .opacity((relay == "") ? 0.0 : 1.0) @@ -28,7 +28,7 @@ struct AddRelayView: View { } } - Label("", systemImage: "doc.on.clipboard") + Label("", image: "copy2") .padding(.leading, -10) .onTapGesture { if let pastedrelay = UIPasteboard.general.string { diff --git a/damus/Views/BookmarksView.swift b/damus/Views/BookmarksView.swift index dc9433f9..5af09b0d 100644 --- a/damus/Views/BookmarksView.swift +++ b/damus/Views/BookmarksView.swift @@ -29,7 +29,7 @@ struct BookmarksView: View { Group { if bookmarks.isEmpty { VStack { - Image(systemName: "bookmark") + Image("bookmark") .resizable() .scaledToFit() .frame(width: 32.0, height: 32.0) diff --git a/damus/Views/Buttons/FriendsButton.swift b/damus/Views/Buttons/FriendsButton.swift index 00823453..b69a313d 100644 --- a/damus/Views/Buttons/FriendsButton.swift +++ b/damus/Views/Buttons/FriendsButton.swift @@ -21,13 +21,13 @@ struct FriendsButton: View { }) { if filter == .friends { LINEAR_GRADIENT - .mask(Image(systemName: "person.2.fill") + .mask(Image("user-added") .resizable() - ).frame(width: 30, height: 20) + ).frame(width: 28, height: 28) } else { - Image(systemName: "person.2.fill") + Image("user-added") .resizable() - .frame(width: 30, height: 20) + .frame(width: 28, height: 28) .foregroundColor(DamusColors.adaptableGrey) } } diff --git a/damus/Views/ConfigView.swift b/damus/Views/ConfigView.swift index a513e773..90422698 100644 --- a/damus/Views/ConfigView.swift +++ b/damus/Views/ConfigView.swift @@ -37,23 +37,23 @@ struct ConfigView: View { Form { Section { NavigationLink(destination: KeySettingsView(keypair: state.keypair)) { - IconLabel(NSLocalizedString("Keys", comment: "Settings section for managing keys"), img_name: "key.fill", color: .purple) + IconLabel(NSLocalizedString("Keys", comment: "Settings section for managing keys"), img_name: "key", color: .purple) } NavigationLink(destination: AppearanceSettingsView(settings: settings)) { - IconLabel(NSLocalizedString("Appearance", comment: "Section header for text and appearance settings"), img_name: "textformat", color: .red) + IconLabel(NSLocalizedString("Appearance", comment: "Section header for text and appearance settings"), img_name: "eye", color: .red) } NavigationLink(destination: NotificationSettingsView(settings: settings)) { - IconLabel(NSLocalizedString("Notifications", comment: "Section header for Damus notifications"), img_name: "bell.fill", color: .blue) + IconLabel(NSLocalizedString("Notifications", comment: "Section header for Damus notifications"), img_name: "notification-bell-on", color: .blue) } NavigationLink(destination: ZapSettingsView(settings: settings)) { - IconLabel(NSLocalizedString("Zaps", comment: "Section header for zap settings"), img_name: "bolt.fill", color: .orange) + IconLabel(NSLocalizedString("Zaps", comment: "Section header for zap settings"), img_name: "zap.fill", color: .orange) } NavigationLink(destination: TranslationSettingsView(settings: settings)) { - IconLabel(NSLocalizedString("Translation", comment: "Section header for text and appearance settings"), img_name: "globe.americas.fill", color: .green) + IconLabel(NSLocalizedString("Translation", comment: "Section header for text and appearance settings"), img_name: "globe", color: .green) } } @@ -66,20 +66,25 @@ struct ConfigView: View { confirm_logout = true } }, label: { - Label(NSLocalizedString("Sign out", comment: "Sidebar menu label to sign out of the account."), systemImage: "pip.exit") + Label(NSLocalizedString("Sign out", comment: "Sidebar menu label to sign out of the account."), image: "logout") .foregroundColor(textColor()) .frame(maxWidth: .infinity, alignment: .leading) }) } if state.is_privkey_user { - Section(NSLocalizedString("Permanently Delete Account", comment: "Section title for deleting the user")) { - Button(NSLocalizedString("Delete Account", comment: "Button to delete the user's account."), role: .destructive) { + Section(header: Text(NSLocalizedString("Permanently Delete Account", comment: "Section title for deleting the user"))) { + Button(action: { delete_account_warning = true - } + }, label: { + Label(NSLocalizedString("Delete Account", comment: "Button to delete the user's account."), image: "delete") + .frame(maxWidth: .infinity, alignment: .leading) + .foregroundColor(.red) + }) } } + if let bundleShortVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"], let bundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] { Section(NSLocalizedString("Version", comment: "Section title for displaying the version number of the Damus app.")) { Text(verbatim: "\(bundleShortVersion) (\(bundleVersion))") diff --git a/damus/Views/CreateAccountView.swift b/damus/Views/CreateAccountView.swift index 3539d9f8..dd4a33c3 100644 --- a/damus/Views/CreateAccountView.swift +++ b/damus/Views/CreateAccountView.swift @@ -111,7 +111,8 @@ struct LoginPrompt: View { struct BackNav: View { @Environment(\.dismiss) var dismiss var body: some View { - Image(systemName: "chevron.backward") + Image("chevron-left") + .foregroundColor(.white) .onTapGesture { self.dismiss() } diff --git a/damus/Views/DMChatView.swift b/damus/Views/DMChatView.swift index ffc89c4c..c5e6bab9 100644 --- a/damus/Views/DMChatView.swift +++ b/damus/Views/DMChatView.swift @@ -115,7 +115,7 @@ struct DMChatView: View, KeyboardReadable { } } ) { - Label("", systemImage: "arrow.right.circle") + Label("", image: "send") .font(.title) } } diff --git a/damus/Views/Empty Views/EmptyTimelineView.swift b/damus/Views/Empty Views/EmptyTimelineView.swift index 90354a5e..3eb929db 100644 --- a/damus/Views/Empty Views/EmptyTimelineView.swift +++ b/damus/Views/Empty Views/EmptyTimelineView.swift @@ -10,7 +10,7 @@ import SwiftUI struct EmptyTimelineView: View { var body: some View { VStack { - Image(systemName: "tray.fill") + Image("question") .font(.system(size: 35)) .padding() Text("Nothing to see here. Check back later!", comment: "Indicates that there are no notes in the timeline to view.") diff --git a/damus/Views/Empty Views/EmptyUserSearchView.swift b/damus/Views/Empty Views/EmptyUserSearchView.swift index 8a0c52ad..65fbf08d 100644 --- a/damus/Views/Empty Views/EmptyUserSearchView.swift +++ b/damus/Views/Empty Views/EmptyUserSearchView.swift @@ -17,7 +17,7 @@ import SwiftUI struct EmptyUserSearchView: View { var body: some View { VStack { - Image(systemName: "person.fill.questionmark") + Image("question") .font(.system(size: 35)) .padding() Text("Could not find the user you're looking for", comment: "Indicates that there are no users found.") diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift index 60e49706..9d0d3662 100644 --- a/damus/Views/EventView.swift +++ b/damus/Views/EventView.swift @@ -74,7 +74,7 @@ extension View { Button { UIPasteboard.general.string = bech32_pubkey } label: { - Label(NSLocalizedString("Copy Account ID", comment: "Context menu option for copying the ID of the account that created the note."), systemImage: "doc.on.doc") + Label(NSLocalizedString("Copy Account ID", comment: "Context menu option for copying the ID of the account that created the note."), image: "copy2") } } } diff --git a/damus/Views/Events/EventMenu.swift b/damus/Views/Events/EventMenu.swift index 0bd6b6f5..80d11010 100644 --- a/damus/Views/Events/EventMenu.swift +++ b/damus/Views/Events/EventMenu.swift @@ -60,25 +60,25 @@ struct MenuItems: View { Button { UIPasteboard.general.string = event.get_content(keypair.privkey) } label: { - Label(NSLocalizedString("Copy text", comment: "Context menu option for copying the text from an note."), systemImage: "doc.on.doc") + Label(NSLocalizedString("Copy text", comment: "Context menu option for copying the text from an note."), image: "copy2") } Button { UIPasteboard.general.string = bech32_pubkey(target_pubkey) } label: { - Label(NSLocalizedString("Copy user public key", comment: "Context menu option for copying the ID of the user who created the note."), systemImage: "person") + Label(NSLocalizedString("Copy user public key", comment: "Context menu option for copying the ID of the user who created the note."), image: "user") } Button { UIPasteboard.general.string = bech32_note_id(event.id) ?? event.id } label: { - Label(NSLocalizedString("Copy note ID", comment: "Context menu option for copying the ID of the note."), systemImage: "note.text") + Label(NSLocalizedString("Copy note ID", comment: "Context menu option for copying the ID of the note."), image: "note-book") } Button { UIPasteboard.general.string = event_to_json(ev: event) } label: { - Label(NSLocalizedString("Copy note JSON", comment: "Context menu option for copying the JSON text from the note."), systemImage: "square.on.square") + Label(NSLocalizedString("Copy note JSON", comment: "Context menu option for copying the JSON text from the note."), image: "code.on.square") } Button { @@ -88,7 +88,7 @@ struct MenuItems: View { let imageName = isBookmarked ? "bookmark.fill" : "bookmark" let removeBookmarkString = NSLocalizedString("Remove bookmark", comment: "Context menu option for removing a note bookmark.") let addBookmarkString = NSLocalizedString("Add bookmark", comment: "Context menu option for adding a note bookmark.") - Label(isBookmarked ? removeBookmarkString : addBookmarkString, systemImage: imageName) + Label(isBookmarked ? removeBookmarkString : addBookmarkString, image: imageName) } if event.known_kind != .dm { @@ -97,17 +97,17 @@ struct MenuItems: View { let muted = self.muted_threads.isMutedThread(event, privkey: self.keypair.privkey) isMutedThread = muted } label: { - let imageName = isMutedThread ? "speaker" : "speaker.slash" + let imageName = isMutedThread ? "mute" : "mute" let unmuteThreadString = NSLocalizedString("Unmute conversation", comment: "Context menu option for unmuting a conversation.") let muteThreadString = NSLocalizedString("Mute conversation", comment: "Context menu option for muting a conversation.") - Label(isMutedThread ? unmuteThreadString : muteThreadString, systemImage: imageName) + Label(isMutedThread ? unmuteThreadString : muteThreadString, image: imageName) } } Button { NotificationCenter.default.post(name: .broadcast_event, object: event) } label: { - Label(NSLocalizedString("Broadcast", comment: "Context menu option for broadcasting the user's note to all of the user's connected relay servers."), systemImage: "globe") + Label(NSLocalizedString("Broadcast", comment: "Context menu option for broadcasting the user's note to all of the user's connected relay servers."), image: "globe") } // Only allow reporting if logged in with private key and the currently viewed profile is not the logged in profile. @@ -116,13 +116,13 @@ struct MenuItems: View { let target: ReportTarget = .note(ReportNoteTarget(pubkey: target_pubkey, note_id: event.id)) notify(.report, target) } label: { - Label(NSLocalizedString("Report", comment: "Context menu option for reporting content."), systemImage: "exclamationmark.bubble") + Label(NSLocalizedString("Report", comment: "Context menu option for reporting content."), image: "raising-hand") } Button(role: .destructive) { notify(.mute, target_pubkey) } label: { - Label(NSLocalizedString("Mute user", comment: "Context menu option for muting users."), systemImage: "exclamationmark.octagon") + Label(NSLocalizedString("Mute user", comment: "Context menu option for muting users."), image: "mute") } } } diff --git a/damus/Views/Events/ZapEvent.swift b/damus/Views/Events/ZapEvent.swift index e0531e80..69c1e496 100644 --- a/damus/Views/Events/ZapEvent.swift +++ b/damus/Views/Events/ZapEvent.swift @@ -19,7 +19,7 @@ struct ZapEvent: View { .padding([.top], 2) if zap.is_private { - Image(systemName: "lock.fill") + Image("lock") .foregroundColor(DamusColors.green) .help(NSLocalizedString("Only you can see this message and who sent it.", comment: "Help text on green lock icon that explains that only the current user can see the message of a zap event and who sent the zap.")) } diff --git a/damus/Views/Images/ImageContextMenuModifier.swift b/damus/Views/Images/ImageContextMenuModifier.swift index 61be672d..a3090bb5 100644 --- a/damus/Views/Images/ImageContextMenuModifier.swift +++ b/damus/Views/Images/ImageContextMenuModifier.swift @@ -19,24 +19,24 @@ struct ImageContextMenuModifier: ViewModifier { Button { UIPasteboard.general.url = url } label: { - Label(NSLocalizedString("Copy Image URL", comment: "Context menu option to copy the URL of an image into clipboard."), systemImage: "doc.on.doc") + Label(NSLocalizedString("Copy Image URL", comment: "Context menu option to copy the URL of an image into clipboard."), image: "copy2") } if let someImage = image { Button { UIPasteboard.general.image = someImage } label: { - Label(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image into clipboard."), systemImage: "photo.on.rectangle") + Label(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image into clipboard."), image: "copy2.fill") } Button { UIImageWriteToSavedPhotosAlbum(someImage, nil, nil, nil) } label: { - Label(NSLocalizedString("Save Image", comment: "Context menu option to save an image."), systemImage: "square.and.arrow.down") + Label(NSLocalizedString("Save Image", comment: "Context menu option to save an image."), image: "download") } } Button { showShareSheet = true } label: { - Label(NSLocalizedString("Share", comment: "Button to share an image."), systemImage: "square.and.arrow.up") + Label(NSLocalizedString("Share", comment: "Button to share an image."), image: "upload") } } } diff --git a/damus/Views/Images/ProfilePicImageView.swift b/damus/Views/Images/ProfilePicImageView.swift index e2f2dae3..97f9b63d 100644 --- a/damus/Views/Images/ProfilePicImageView.swift +++ b/damus/Views/Images/ProfilePicImageView.swift @@ -49,7 +49,7 @@ struct NavDismissBarView: View { Button(action: { presentationMode.wrappedValue.dismiss() }, label: { - Image(systemName: "xmark") + Image("close") .frame(width: 33, height: 33) .background(.regularMaterial) .clipShape(Circle()) diff --git a/damus/Views/Muting/MutelistView.swift b/damus/Views/Muting/MutelistView.swift index 5783eb69..444c848c 100644 --- a/damus/Views/Muting/MutelistView.swift +++ b/damus/Views/Muting/MutelistView.swift @@ -29,7 +29,7 @@ struct MutelistView: View { damus_state.postbox.send(new_ev) users = get_mutelist_users(new_ev) } label: { - Label(NSLocalizedString("Delete", comment: "Button to remove a user from their mutelist."), systemImage: "trash") + Label(NSLocalizedString("Delete", comment: "Button to remove a user from their mutelist."), image: "delete") } .tint(.red) } diff --git a/damus/Views/Notifications/EventGroupView.swift b/damus/Views/Notifications/EventGroupView.swift index 280d244a..2b3c125c 100644 --- a/damus/Views/Notifications/EventGroupView.swift +++ b/damus/Views/Notifications/EventGroupView.swift @@ -168,7 +168,7 @@ struct EventGroupView: View { func ZapIcon(_ zapgrp: ZapGroup) -> some View { let fmt = format_msats_abbrev(zapgrp.msat_total) return VStack(alignment: .center) { - Image(systemName: "bolt.fill") + Image("zap.fill") .foregroundColor(.orange) Text(verbatim: fmt) .foregroundColor(Color.orange) @@ -179,13 +179,15 @@ struct EventGroupView: View { Group { switch group { case .repost: - Image(systemName: "arrow.2.squarepath") + Image("repost") .foregroundColor(DamusColors.green) case .reaction: LINEAR_GRADIENT - .mask(Image("shaka-full") + .mask(Image("shaka.fill") .resizable() - ).frame(width: 24, height: 24) + .aspectRatio(contentMode: .fit) + ) + .frame(width: 20, height: 20) case .profile_zap(let zapgrp): ZapIcon(zapgrp) case .zap(let zapgrp): diff --git a/damus/Views/ParticipantsView.swift b/damus/Views/ParticipantsView.swift index ebfecfac..a1ff976d 100644 --- a/damus/Views/ParticipantsView.swift +++ b/damus/Views/ParticipantsView.swift @@ -67,7 +67,7 @@ struct ParticipantsView: View { Spacer() - Image(systemName: "checkmark.circle.fill") + Image("check-circle.fill") .font(.system(size: 30)) .foregroundColor(references.contains(participant) ? DamusColors.purple : .gray) } diff --git a/damus/Views/PostButton.swift b/damus/Views/PostButton.swift index 6a88fa62..c0e066c3 100644 --- a/damus/Views/PostButton.swift +++ b/damus/Views/PostButton.swift @@ -26,7 +26,7 @@ func PostButton(action: @escaping () -> ()) -> some View { radius: 3, x: 3, y: 3) - Image(systemName: "plus") + Image("plus") .font(.system(.title2)) .foregroundColor(Color.white) } diff --git a/damus/Views/PostView.swift b/damus/Views/PostView.swift index d06e793a..395f8878 100644 --- a/damus/Views/PostView.swift +++ b/damus/Views/PostView.swift @@ -114,7 +114,7 @@ struct PostView: View { Button(action: { attach_media = true }, label: { - Image(systemName: "photo") + Image("images") .padding(6) }) } @@ -123,7 +123,7 @@ struct PostView: View { Button(action: { attach_camera = true }, label: { - Image(systemName: "camera") + Image("camera") .padding(6) }) } @@ -477,11 +477,11 @@ struct PVImageCarouselView: View { Button(action: { UIPasteboard.general.string = uploadedURL.absoluteString }) { - Label(NSLocalizedString("Copy URL", comment: "Label for button in context menu to copy URL of the selected uploaded media asset."), systemImage: "doc.on.doc") + Label(NSLocalizedString("Copy URL", comment: "Label for button in context menu to copy URL of the selected uploaded media asset."), image: "copy") } } } - Image(systemName: "xmark.circle.fill") + Image("close-circle") .foregroundColor(.white) .padding(20) .shadow(radius: 5) diff --git a/damus/Views/Profile/EditProfilePictureControl.swift b/damus/Views/Profile/EditProfilePictureControl.swift index dfc55493..8aa6e4b0 100644 --- a/damus/Views/Profile/EditProfilePictureControl.swift +++ b/damus/Views/Profile/EditProfilePictureControl.swift @@ -39,7 +39,7 @@ struct EditProfilePictureControl: View { if viewModel.isLoading { ProgressView() } else { - Image(systemName: "camera") + Image("camera") .resizable() .scaledToFit() .frame(width: 25, height: 25) diff --git a/damus/Views/Profile/MaybeAnonPfpView.swift b/damus/Views/Profile/MaybeAnonPfpView.swift index 622ed7ad..e79ba610 100644 --- a/damus/Views/Profile/MaybeAnonPfpView.swift +++ b/damus/Views/Profile/MaybeAnonPfpView.swift @@ -23,7 +23,8 @@ struct MaybeAnonPfpView: View { var body: some View { Group { if is_anon { - Image(systemName: "person.fill.questionmark") + Image("question") + .resizable() .font(.largeTitle) .frame(width: size, height: size) } else { diff --git a/damus/Views/Profile/ProfileView.swift b/damus/Views/Profile/ProfileView.swift index 4c1f5b97..d2a2cc85 100644 --- a/damus/Views/Profile/ProfileView.swift +++ b/damus/Views/Profile/ProfileView.swift @@ -168,8 +168,8 @@ struct ProfileView: View { } @ViewBuilder - func navImage(systemImage: String) -> some View { - Image(systemName: systemImage) + func navImage(img: String) -> some View { + Image(img) .frame(width: 33, height: 33) .background(Color.black.opacity(0.6)) .clipShape(Circle()) @@ -179,7 +179,7 @@ struct ProfileView: View { Button { presentationMode.wrappedValue.dismiss() } label: { - navImage(systemImage: "chevron.left") + navImage(img: "chevron-left") } } @@ -187,7 +187,7 @@ struct ProfileView: View { Button(action: { action_sheet_presented = true }) { - navImage(systemImage: "ellipsis") + navImage(img: "share3") } .confirmationDialog(NSLocalizedString("Actions", comment: "Title for confirmation dialog to either share, report, or mute a profile."), isPresented: $action_sheet_presented) { Button(NSLocalizedString("Share", comment: "Button to share the link to a profile.")) { @@ -242,7 +242,7 @@ struct ProfileView: View { } func lnButton(lnurl: String, profile: Profile) -> some View { - let button_img = profile.reactions == false ? "bolt.brakesignal" : "bolt.circle" + let button_img = profile.reactions == false ? "zap.fill" : "zap" return Button(action: { if damus_state.settings.show_wallet_selector { showing_select_wallet = true @@ -250,7 +250,8 @@ struct ProfileView: View { open_with_wallet(wallet: damus_state.settings.default_wallet.model, invoice: lnurl) } }) { - Image(systemName: button_img) + Image(button_img) + .foregroundColor(button_img == "zap.fill" ? .orange : Color.primary) .profile_button_style(scheme: colorScheme) .contextMenu { if profile.reactions == false { @@ -261,13 +262,13 @@ struct ProfileView: View { Button { UIPasteboard.general.string = addr } label: { - Label(addr, systemImage: "doc.on.doc") + Label(addr, image: "copy2") } } else if let lnurl = profile.lnurl { Button { UIPasteboard.general.string = lnurl } label: { - Label(NSLocalizedString("Copy LNURL", comment: "Context menu option for copying a user's Lightning URL."), systemImage: "doc.on.doc") + Label(NSLocalizedString("Copy LNURL", comment: "Context menu option for copying a user's Lightning URL."), image: "copy") } } } @@ -283,7 +284,7 @@ struct ProfileView: View { let dm_model = damus_state.dms.lookup_or_create(profile.pubkey) let dmview = DMChatView(damus_state: damus_state, dms: dm_model) return NavigationLink(destination: dmview) { - Image(systemName: "bubble.left.circle") + Image("messages") .profile_button_style(scheme: colorScheme) } } @@ -353,7 +354,9 @@ struct ProfileView: View { var followersCount: some View { HStack { if followers.count == nil { - Image(systemName: "square.and.arrow.down") + Image("download") + .resizable() + .frame(width: 20, height: 20) Text("Followers", comment: "Label describing followers of a user.") .font(.subheadline) .foregroundColor(.gray) @@ -554,7 +557,8 @@ struct KeyView: View { Label { Text("Public key", comment: "Label indicating that the text is a user's public account key.") } icon: { - Image(systemName: "square.on.square.dashed") + Image("copy2") + .resizable() .contentShape(Rectangle()) .foregroundColor(.accentColor) .frame(width: 20, height: 20) @@ -564,7 +568,8 @@ struct KeyView: View { } } else { HStack { - Image(systemName: "checkmark.circle") + Image("check-circle") + .resizable() .frame(width: 20, height: 20) Text(NSLocalizedString("Copied", comment: "Label indicating that a user's key was copied.")) .font(.footnote) diff --git a/damus/Views/QRCodeView.swift b/damus/Views/QRCodeView.swift index 0b7f97ae..5b988d60 100644 --- a/damus/Views/QRCodeView.swift +++ b/damus/Views/QRCodeView.swift @@ -30,7 +30,7 @@ struct QRCodeView: View { Button { presentationMode.wrappedValue.dismiss() } label: { - Image(systemName: "xmark") + Image("close") .foregroundColor(.white) .font(.subheadline) .padding(.leading, 20) diff --git a/damus/Views/Relays/RecommendedRelayView.swift b/damus/Views/Relays/RecommendedRelayView.swift index b4019ca1..47026170 100644 --- a/damus/Views/Relays/RecommendedRelayView.swift +++ b/damus/Views/Relays/RecommendedRelayView.swift @@ -52,14 +52,16 @@ struct RecommendedRelayView: View { Spacer() - Image(systemName: "info.circle") - .font(.system(size: 20, weight: .regular)) + Image("info") + .resizable() + .frame(width: 20, height: 20) .foregroundColor(Color.accentColor) } else { Spacer() - Image(systemName: "questionmark.circle") - .font(.system(size: 20, weight: .regular)) + Image("question") + .resizable() + .frame(width: 20, height: 20) .foregroundColor(.gray) } } @@ -85,7 +87,7 @@ struct RecommendedRelayView: View { Button { UIPasteboard.general.setValue(relay, forPasteboardType: "public.plain-text") } label: { - Label(NSLocalizedString("Copy", comment: "Button to copy a relay server address."), systemImage: "doc.on.doc") + Label(NSLocalizedString("Copy", comment: "Button to copy a relay server address."), image: "copy") } } @@ -96,8 +98,9 @@ struct RecommendedRelayView: View { if showText { Text(NSLocalizedString("Connect", comment: "Button to connect to recommended relay server.")) } - Image(systemName: "plus.circle.fill") - .font(.system(size: 20, weight: .medium)) + Image("plus-circle") + .resizable() + .frame(width: 20, height: 20) .foregroundColor(.accentColor) .padding(.leading, 5) } diff --git a/damus/Views/Relays/RelayStatus.swift b/damus/Views/Relays/RelayStatus.swift index e951abf4..55457609 100644 --- a/damus/Views/Relays/RelayStatus.swift +++ b/damus/Views/Relays/RelayStatus.swift @@ -22,12 +22,12 @@ struct RelayStatus: View { if relay.id == self.relay { let c = relay.connection if c.isConnected { - conn_image = "network" + conn_image = "globe" conn_color = .green } else if c.isConnecting { connecting = true } else { - conn_image = "exclamationmark.circle.fill" + conn_image = "warning.fill" conn_color = .red } } @@ -38,13 +38,14 @@ struct RelayStatus: View { HStack { if connecting { ProgressView() - .padding(.trailing, 4) + .frame(width: 20, height: 20) + .padding(.trailing, 5) } else { - Image(systemName: conn_image) - .frame(width: 8.0, height: 8.0) + Image(conn_image) + .resizable() + .frame(width: 20, height: 20) .foregroundColor(conn_color) - .padding(.leading, 5) - .padding(.trailing, 10) + .padding(.trailing, 5) } } .onReceive(timer) { _ in diff --git a/damus/Views/Relays/RelayType.swift b/damus/Views/Relays/RelayType.swift index 6aeb5746..9e8b93d3 100644 --- a/damus/Views/Relays/RelayType.swift +++ b/damus/Views/Relays/RelayType.swift @@ -14,7 +14,9 @@ struct RelayType: View { if is_paid { Image("bitcoin-logo") } else { - Image(systemName: "globe.americas.fill") + Image("globe") + .resizable() + .frame(width: 20, height: 20) .foregroundColor(.gray) } } diff --git a/damus/Views/Relays/RelayView.swift b/damus/Views/Relays/RelayView.swift index c2960b43..a88e135d 100644 --- a/damus/Views/Relays/RelayView.swift +++ b/damus/Views/Relays/RelayView.swift @@ -33,16 +33,21 @@ struct RelayView: View { NavigationLink("", destination: RelayDetailView(state: state, relay: relay, nip11: meta)).opacity(0.0) .disabled(showActionButtons) ) + Spacer() - Image(systemName: "info.circle") - .font(.system(size: 20, weight: .regular)) + Image("info") + .resizable() + .frame(width: 20, height: 20) .foregroundColor(Color.accentColor) } else { Text(relay) + Spacer() - Image(systemName: "questionmark.circle") - .font(.system(size: 20, weight: .regular)) + + Image("question") + .resizable() + .frame(width: 20, height: 20) .foregroundColor(.gray) } } @@ -66,7 +71,7 @@ struct RelayView: View { Button { UIPasteboard.general.setValue(relay, forPasteboardType: "public.plain-text") } label: { - Label(NSLocalizedString("Copy", comment: "Button to copy a relay server address."), systemImage: "doc.on.doc") + Label(NSLocalizedString("Copy", comment: "Button to copy a relay server address."), image: "copy2") } } @@ -87,8 +92,10 @@ struct RelayView: View { if showText { Text(NSLocalizedString("Disconnect", comment: "Button to disconnect from a relay server.")) } - Image(systemName: "minus.circle.fill") - .font(.system(size: 20, weight: .medium)) + + Image("minus-circle") + .resizable() + .frame(width: 20, height: 20) .foregroundColor(.red) .padding(.leading, 5) } diff --git a/damus/Views/SaveKeysView.swift b/damus/Views/SaveKeysView.swift index fd4a576b..0235ce5d 100644 --- a/damus/Views/SaveKeysView.swift +++ b/damus/Views/SaveKeysView.swift @@ -187,7 +187,7 @@ struct SaveKeyView: View { VStack { spacerBlock(width: 0, height: 0) Button(action: copy_text) { - Label("", systemImage: is_copied ? "checkmark.circle.fill" : "doc.on.doc") + Label("", image: is_copied ? "check-circle.fill" : "copy2") .foregroundColor(is_copied ? .green : .gray) .background { if is_copied { diff --git a/damus/Views/SearchHomeView.swift b/damus/Views/SearchHomeView.swift index b1f5605e..7b31ed86 100644 --- a/damus/Views/SearchHomeView.swift +++ b/damus/Views/SearchHomeView.swift @@ -20,7 +20,7 @@ struct SearchHomeView: View { var SearchInput: some View { HStack { HStack{ - Image(systemName: "magnifyingglass") + Image("search") .foregroundColor(.gray) TextField(NSLocalizedString("Search...", comment: "Placeholder text to prompt entry of search query."), text: $search) .autocorrectionDisabled(true) diff --git a/damus/Views/SelectWalletView.swift b/damus/Views/SelectWalletView.swift index 6395b697..dc1512ae 100644 --- a/damus/Views/SelectWalletView.swift +++ b/damus/Views/SelectWalletView.swift @@ -28,7 +28,7 @@ struct SelectWalletView: View { Spacer() - Image(systemName: self.invoice_copied ? "checkmark.circle" : "doc.on.doc").foregroundColor(.blue) + Image(self.invoice_copied ? "check-circle" : "copy2").foregroundColor(.blue) }.clipShape(RoundedRectangle(cornerRadius: 5)).onTapGesture { UIPasteboard.general.string = invoice self.invoice_copied = true diff --git a/damus/Views/Settings/KeySettingsView.swift b/damus/Views/Settings/KeySettingsView.swift index 20510f27..06674c3e 100644 --- a/damus/Views/Settings/KeySettingsView.swift +++ b/damus/Views/Settings/KeySettingsView.swift @@ -66,7 +66,7 @@ struct KeySettingsView: View { } }) { let copied = is_pk ? self.pubkey_copied : self.privkey_copied - Image(systemName: copied ? "checkmark.circle" : "doc.on.doc") + Image(copied ? "check-circle" : "copy2") } } diff --git a/damus/Views/Zaps/CustomizeZapView.swift b/damus/Views/Zaps/CustomizeZapView.swift index 543465ae..41a59bc9 100644 --- a/damus/Views/Zaps/CustomizeZapView.swift +++ b/damus/Views/Zaps/CustomizeZapView.swift @@ -257,16 +257,16 @@ struct CustomizeZapView: View { }) { switch zap_type { case .pub: - Image(systemName: "person.2") + Image("globe") Text("Public", comment: "Button text to indicate that the zap type is a public zap.") case .anon: - Image(systemName: "person.fill.questionmark") + Image("question") Text("Anonymous", comment: "Button text to indicate that the zap type is a anonymous zap.") case .priv: - Image(systemName: "lock") + Image("lock") Text("Private", comment: "Button text to indicate that the zap type is a private zap.") case .non_zap: - Image(systemName: "bolt") + Image("zap") Text("None", comment: "Button text to indicate that the zap type is a private zap.") } } diff --git a/damus/Views/Zaps/ZapTypePicker.swift b/damus/Views/Zaps/ZapTypePicker.swift index 134ef4cc..63d1d751 100644 --- a/damus/Views/Zaps/ZapTypePicker.swift +++ b/damus/Views/Zaps/ZapTypePicker.swift @@ -61,10 +61,10 @@ struct ZapTypePicker: View { } } } - ZapTypeSelection(text: "Public", comment: "Picker option to indicate that a zap should be sent publicly and identify the user as who sent it.", img: "person.2.circle.fill", action: {zap_type = ZapType.pub}, type: ZapType.pub) - ZapTypeSelection(text: "Private", comment: "Picker option to indicate that a zap should be sent privately and not identify the user to the public.", img: "lock.circle.fill", action: {zap_type = ZapType.priv}, type: ZapType.priv) - ZapTypeSelection(text: "Anonymous", comment: "Picker option to indicate that a zap should be sent anonymously and not identify the user as who sent it.", img: "person.crop.circle.fill.badge.questionmark", action: {zap_type = ZapType.anon}, type: ZapType.anon) - ZapTypeSelection(text: "None", comment: "Picker option to indicate that sats should be sent to the user's wallet as a regular Lightning payment, not as a zap.", img: "bolt.circle.fill", action: {zap_type = ZapType.non_zap}, type: ZapType.non_zap) + ZapTypeSelection(text: "Public", comment: "Picker option to indicate that a zap should be sent publicly and identify the user as who sent it.", img: "globe", action: {zap_type = ZapType.pub}, type: ZapType.pub) + ZapTypeSelection(text: "Private", comment: "Picker option to indicate that a zap should be sent privately and not identify the user to the public.", img: "lock", action: {zap_type = ZapType.priv}, type: ZapType.priv) + ZapTypeSelection(text: "Anonymous", comment: "Picker option to indicate that a zap should be sent anonymously and not identify the user as who sent it.", img: "question", action: {zap_type = ZapType.anon}, type: ZapType.anon) + ZapTypeSelection(text: "None", comment: "Picker option to indicate that sats should be sent to the user's wallet as a regular Lightning payment, not as a zap.", img: "zap", action: {zap_type = ZapType.non_zap}, type: ZapType.non_zap) } .padding(.horizontal) } @@ -73,14 +73,19 @@ struct ZapTypePicker: View { Button(action: action) { VStack(alignment: .leading, spacing: 5) { HStack { - Image(systemName: img) + Image(img) + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: 20, height: 20) .foregroundColor(.gray) - .font(.system(size: 24)) + Text(text, comment: comment) .font(.system(size: 20, weight: .semibold)) + Spacer() } .padding(.horizontal) + Text(zap_type_desc(type: type, profiles: profiles, pubkey: pubkey)) .padding(.horizontal) .foregroundColor(.gray)