From 8c633c718eec06b267da74584efd0454dd4a8e46 Mon Sep 17 00:00:00 2001 From: Nora Trapp Date: Tue, 18 Oct 2022 15:34:34 -0700 Subject: [PATCH] Private Story -> Custom Story --- .../Contents.json | 2 +- .../custom-story-dark-36.pdf} | Bin 4152 -> 4029 bytes .../Contents.json | 2 +- .../custom-story-light-36.pdf} | Bin 4270 -> 4159 bytes .../lock-16.imageset/lock-16.pdf | 103 ------------------ .../private-story-dark-36.pdf | Bin 4358 -> 0 bytes .../private-story-light-36.pdf | Bin 4563 -> 0 bytes .../Contents.json | 12 -- .../private-story-outline-24.pdf | Bin 4496 -> 0 bytes .../Contents.json | 12 -- .../private-story-outline-40.pdf | Bin 4369 -> 0 bytes .../Contents.json | 12 -- .../Contents.json | 12 -- .../Contents.json | 2 +- .../stories-16.imageset/stories-16.pdf | 89 +++++++++++++++ .../Context View/StoryItemMediaView.swift | 2 +- .../StoryPrivacySettingsViewController.swift | 8 +- .../translations/en.lproj/Localizable.strings | 25 +++-- .../en.lproj/PluralAware.stringsdict | 4 +- SignalUI/Appearance/Theme+OWS.swift | 7 -- .../ConversationPicker/ConversationItem.swift | 2 +- ...NewPrivateStoryConfirmViewController.swift | 31 +----- .../Stories/NewStorySheet.swift | 10 +- 23 files changed, 125 insertions(+), 210 deletions(-) rename Signal/Images.xcassets/{private-story-dark-36.imageset => custom-story-dark-36.imageset}/Contents.json (71%) rename Signal/Images.xcassets/{private-story-solid-40.imageset/private-story-solid-40.pdf => custom-story-dark-36.imageset/custom-story-dark-36.pdf} (75%) rename Signal/Images.xcassets/{private-story-light-36.imageset => custom-story-light-36.imageset}/Contents.json (71%) rename Signal/Images.xcassets/{private-story-solid-24.imageset/private-story-solid-24.pdf => custom-story-light-36.imageset/custom-story-light-36.pdf} (73%) delete mode 100644 Signal/Images.xcassets/lock-16.imageset/lock-16.pdf delete mode 100644 Signal/Images.xcassets/private-story-dark-36.imageset/private-story-dark-36.pdf delete mode 100644 Signal/Images.xcassets/private-story-light-36.imageset/private-story-light-36.pdf delete mode 100644 Signal/Images.xcassets/private-story-outline-24.imageset/Contents.json delete mode 100644 Signal/Images.xcassets/private-story-outline-24.imageset/private-story-outline-24.pdf delete mode 100644 Signal/Images.xcassets/private-story-outline-40.imageset/Contents.json delete mode 100644 Signal/Images.xcassets/private-story-outline-40.imageset/private-story-outline-40.pdf delete mode 100644 Signal/Images.xcassets/private-story-solid-24.imageset/Contents.json delete mode 100644 Signal/Images.xcassets/private-story-solid-40.imageset/Contents.json rename Signal/Images.xcassets/{lock-16.imageset => stories-16.imageset}/Contents.json (76%) create mode 100644 Signal/Images.xcassets/stories-16.imageset/stories-16.pdf diff --git a/Signal/Images.xcassets/private-story-dark-36.imageset/Contents.json b/Signal/Images.xcassets/custom-story-dark-36.imageset/Contents.json similarity index 71% rename from Signal/Images.xcassets/private-story-dark-36.imageset/Contents.json rename to Signal/Images.xcassets/custom-story-dark-36.imageset/Contents.json index ec60d7dde5..45c21f4e57 100644 --- a/Signal/Images.xcassets/private-story-dark-36.imageset/Contents.json +++ b/Signal/Images.xcassets/custom-story-dark-36.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "private-story-dark-36.pdf", + "filename" : "custom-story-dark-36.pdf", "idiom" : "universal" } ], diff --git a/Signal/Images.xcassets/private-story-solid-40.imageset/private-story-solid-40.pdf b/Signal/Images.xcassets/custom-story-dark-36.imageset/custom-story-dark-36.pdf similarity index 75% rename from Signal/Images.xcassets/private-story-solid-40.imageset/private-story-solid-40.pdf rename to Signal/Images.xcassets/custom-story-dark-36.imageset/custom-story-dark-36.pdf index b6575c54d85c4eac448374a8badf5c4e380e080c..3bb2e9854171d19eb409a2660b2b4f6a00012650 100644 GIT binary patch delta 723 zcmdm?uvdP9UA>8+v4Wi)S8+*EYGN)|1>@A9(|OW{JbT`Ue~3}&`XQh>_cyEUQ|2BP z&IckMfBrkP@17>Zd{*&T(pkl$is@nUU)t?DtV65RJB@lG8LzCIeygf~njznuPxW&n z4hDwY_bcc9TDC>*?$@yRGu11beodWMcQO9VUG?U-pJ&c93Y=4a@5RUOtuIR$Ck0ko z{5Rh<=f%Q_hAj_TpU+v}zHP2?|MMP0{q{KhJF}!u9?0C5wAkJMh?REWp33$wQ$2gR z3t8_w?OmZ6y}OY0ql}P%#@kcU8N&K=j~)|K`8z9~N4uHx#q83LIWZY|+gEJ(J*!b- z_PLJ^EC1X}_;u{TL$R&BYp2y`v#d^MX?|W~`eWH;$pxQzIS<&hS41x}?wr~ z7>F)CCm;Fe=nd=c)+vRy3o4tv>%JyFD>^^(bMi!!_yyJXwGQU}uz&OAINRnFrVega zV>1O~v&kQMyI9-}4NWK4^J(iE8W>s_0fDhml!1Xd5NRst`{t*(B$lKqXt-Dz85kKM zluW+PXD)7PV6I>Q0t$HwTwsQQv5A4vWL19EU{ecBIb$;nF#|JGQ%o}~j4{Majg2PH z<+q79Hn%V^Of)o1Of$4JHnvPkGfYl3vox|uNli7fv`9*^;M1& delta 847 zcmdlhze8byUA?KXnSz}iS8+*EYGN)|1!HKiXP>ko&z|qv6?_71t5xPbXDyz^F2N~t zKse#ie`d{-cXN-wZT2W!o%FK%-plSa#ir`T-|oHmyyaooF4<+=-f6R!t=i(2XR$*% zvS^xn?z=lNi(WX1>Fj-YX|k!+p|cSs3Tr2d^}qXEqWJdC+T%s_>f6KC&bOS+mK~+F zHzdq?a!HEJ-_V`>Q*N{0Ios)#-dwu-?Tft2Vx=W5$E7}n+*rzD(R2KT(TW}6`lnwO z8qO^iyPa{kf%)r}+4)D6=G{EW^5^Tkkk2btXJ2H94Kh9Opl8doxel>MHC#5e_ZMY7 zu$gr(OEe>M${lGwJ9qJOM|A6JZiQL2xz_}K*bpk1GvoD^tsk6)3YI@BtJ-j&Q6<)~ zUuCuB((9Y`Y-A-qZMFWv({TOmj6$P3hc|8$KK^No`nA)_Y&y0bJ8W~fFYMjCeBieKrPlG=vM=7hj(SnIP{HSmWxTqI_4)0& z_VvfNwR7CqrTFUVu1oq=|Jgg2-}T%4lCguE)xDh;B(EeEl~fd^rg0ft7+P?ts=E5SaRC6p6I*Qn diff --git a/Signal/Images.xcassets/private-story-light-36.imageset/Contents.json b/Signal/Images.xcassets/custom-story-light-36.imageset/Contents.json similarity index 71% rename from Signal/Images.xcassets/private-story-light-36.imageset/Contents.json rename to Signal/Images.xcassets/custom-story-light-36.imageset/Contents.json index 622d4e86b1..3ef2365273 100644 --- a/Signal/Images.xcassets/private-story-light-36.imageset/Contents.json +++ b/Signal/Images.xcassets/custom-story-light-36.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "private-story-light-36.pdf", + "filename" : "custom-story-light-36.pdf", "idiom" : "universal" } ], diff --git a/Signal/Images.xcassets/private-story-solid-24.imageset/private-story-solid-24.pdf b/Signal/Images.xcassets/custom-story-light-36.imageset/custom-story-light-36.pdf similarity index 73% rename from Signal/Images.xcassets/private-story-solid-24.imageset/private-story-solid-24.pdf rename to Signal/Images.xcassets/custom-story-light-36.imageset/custom-story-light-36.pdf index 851bc2041526631259ba3fb242ea5c9d0be41893..77103bc3cc50462a128fc64cc8c8d9f9754d8b41 100644 GIT binary patch delta 854 zcmZ3dxL;v{UA?J^v4Wi)S8+*EYGN)|1!HcAW1g%b$KBr|ap7F13CwZNSz@0u#IKEd zxjkssZ|~YON9N7fx|DH@Kl#DI&wH-rf8APiC9FQYaMs*N#w%F?(t>tHyzS9-+mFZ1 znVt3Y+e3%lF}Evs#s0SbwDGFIuk_lVLH`xrPn5j)uWr45ro!s_{jaV+H($5id_m^j z+cV~`yO;Mh^U67eCh>XI`{udrTrPWFHnVO{&D08>*P%T3_Dr12%YEVPmGp{`nNxFr z`V~ysDEO!|aKo3Gbwb(ct~+(ux}*zNf8P{1q3o&Mx`;Z}!a28p%5s(`?pv*Aedt*u zkHz-Ln+I!-AAI4)S8eRcqt{%Y_T|~r8|=o_?*&?2uCK|DoOIUdBJJkHX-nsIZ$;@h0UyD$ za?P@)i`C?JTw38_(Ra|G^ypmstuM;LJadliO?bp4=l}a8Dcd6dT}DWc|AE9K`w0tK*KfYX)WOYaY^GprHaVTIi^bj0&~)-w zK5bn?149cVBO_xY!zcp-bs*AI(D%(xaY-ymRnTy;GBPkSLMWN+%Wp1jW^Art00Ihm z3S3}@fw8Hv(d60us=?-lm~tkT7-9zI7N!_xm>C*likTTr78bCHPct_%N;ES!Nj9}G zNHH-_N=Y)cOfxn#PE9njG%-v{wd1lOs6-(al4TN$N-By{)3}T+j7+&yRbBnvxB$%w BUAzDQ delta 946 zcmdn5uugG;UA>v9iGrOSS8+*EYGN)|1!HcAcbe~dH^^u+l9qCurX+CXf`@#BD zyTp9|yu~L4zunoB=Fzg~YA%z&g@gcxqM1hNU6<@*+?*0l^;kb_@tLqL_0}XA#@&$$5kg7h5yhq?yXdAoKh*%s~~+dZBe~-)SE@T zZ;$MHb?Ug|i?;g?|L@6kbRDyr=a#XzIpI}pfI{k0-}i@>$~u%d{PL4fj@kHl9Y@-W z$v0QsV_|OM5IR(FRfHiUac)Z9-Pt}0;R1hl>}IaYBJ9ls%sd- zB*mw%l#>p;l@_JIXWh3}&MZ4II#Kmg{fWIL5{yrF%3SU2<;rN&Rh@iY*VoD1m!4r)*Q+0Y|KrJu`}UVB z+?y2{_r|e*Hf67{w!deW%%c0otKQ=HUtXQ~W9L7<)#uzG^k#E5QwKMzk%@wl$>blr zT`aCfrWTXi__VnUOpVM8j7^LTOegQ=lSJm;<1-gGH?dGK00D(O1uihdz}U>hc(M+^ zYOsY77C8e9F#`)rGYm7#fi6Ke*WBEA@)CZVctZmtBl9%Fq!iOMBMXyM%e1sagTzDw qGt<;WOY>wi13NAof=U!(A=xppsHCDOHI2*I(%6hkRn^tsjSB!I> >> >> -endobj - -2 0 obj - << /Length 3 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -1.000000 0.000000 -0.000000 1.000000 3.451996 1.947266 cm -1.000000 1.000000 1.000000 scn -7.977000 7.198875 m -7.788000 7.198875 l -7.788000 8.476875 l -7.831105 9.431831 7.509348 10.367428 6.888000 11.093875 c -6.594810 11.421329 6.233249 11.680359 5.828892 11.852643 c -5.424535 12.024926 4.987261 12.106255 4.548000 12.090876 c -4.108861 12.106545 3.671681 12.025036 3.267693 11.852170 c -2.863705 11.679303 2.502881 11.419348 2.211000 11.090876 c -1.594219 10.362336 1.275911 9.427419 1.320000 8.473875 c -1.320000 7.198875 l -1.120000 7.198875 l -0.972967 7.199007 0.827349 7.170160 0.691470 7.113984 c -0.555592 7.057808 0.432116 6.975404 0.328101 6.871482 c -0.224086 6.767560 0.141572 6.644158 0.085274 6.508329 c -0.028977 6.372501 -0.000000 6.226909 0.000000 6.079875 c -0.000000 1.132875 l -0.000000 0.836098 0.117894 0.551476 0.327748 0.341623 c -0.537601 0.131770 0.822223 0.013876 1.119000 0.013876 c -7.977000 0.013876 l -8.273777 0.013876 8.558399 0.131770 8.768252 0.341623 c -8.978106 0.551476 9.096001 0.836098 9.096001 1.132875 c -9.096001 6.079875 l -9.096001 6.376653 8.978106 6.661275 8.768252 6.871128 c -8.558399 7.080981 8.273777 7.198875 7.977000 7.198875 c -7.977000 7.198875 l -h -2.753000 8.588875 m -2.725315 9.143169 2.901381 9.688442 3.248000 10.121876 c -3.407440 10.309250 3.607204 10.458126 3.832334 10.557357 c -4.057464 10.656587 4.302126 10.703600 4.548000 10.694876 c -4.795379 10.705052 5.041826 10.658742 5.268636 10.559459 c -5.495445 10.460176 5.696657 10.310528 5.857000 10.121876 c -6.200709 9.687088 6.375152 9.142444 6.348001 8.588875 c -6.348001 7.205875 l -2.753000 7.205875 l -2.753000 8.588875 l -h -f -n -Q - -endstream -endobj - -3 0 obj - 1657 -endobj - -4 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ] - /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 -0000000074 00000 n -0000001787 00000 n -0000001810 00000 n -0000001983 00000 n -0000002057 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 6 0 R - /Size 7 ->> -startxref -2116 -%%EOF \ No newline at end of file diff --git a/Signal/Images.xcassets/private-story-dark-36.imageset/private-story-dark-36.pdf b/Signal/Images.xcassets/private-story-dark-36.imageset/private-story-dark-36.pdf deleted file mode 100644 index 47d13f1434bfc2452da8b863fbd8f29a097e26f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4358 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 diff --git a/Signal/Images.xcassets/private-story-light-36.imageset/private-story-light-36.pdf b/Signal/Images.xcassets/private-story-light-36.imageset/private-story-light-36.pdf deleted file mode 100644 index 3326ee9458e06304afa3f32d0c46f2089be32267..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4563 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 Y-vpjO3DB>%Ck>T_frNz-`Wm4B038eMApigX diff --git a/Signal/Images.xcassets/private-story-outline-40.imageset/Contents.json b/Signal/Images.xcassets/private-story-outline-40.imageset/Contents.json deleted file mode 100644 index f0f7a40675..0000000000 --- a/Signal/Images.xcassets/private-story-outline-40.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "private-story-outline-40.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Signal/Images.xcassets/private-story-outline-40.imageset/private-story-outline-40.pdf b/Signal/Images.xcassets/private-story-outline-40.imageset/private-story-outline-40.pdf deleted file mode 100644 index 84405eae97fdba020f4d4520aa7d42c82fcbef9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4369 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 wC> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 2.500000 2.500000 cm +0.000000 0.000000 0.000000 scn +4.577820 11.000000 m +3.749393 11.000000 3.077820 10.328427 3.077820 9.500000 c +3.077820 1.500000 l +3.077820 0.671573 3.749393 0.000000 4.577820 0.000000 c +9.077820 0.000000 l +9.906247 0.000000 10.577820 0.671573 10.577820 1.500000 c +10.577820 9.500000 l +10.577820 10.328427 9.906247 11.000000 9.077820 11.000000 c +4.577820 11.000000 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 2.500000 5.889893 cm +0.000000 0.000000 0.000000 scn +2.000000 5.610089 m +2.000000 5.937339 2.078597 6.246233 2.217944 6.518921 c +0.987378 6.071032 l +0.208911 5.787693 -0.192469 4.926929 0.090869 4.148463 c +1.971980 -1.019848 l +1.980771 -1.043999 1.990117 -1.067788 2.000000 -1.091206 c +2.000000 5.610089 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 814 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ] + /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 +0000000904 00000 n +0000000926 00000 n +0000001099 00000 n +0000001173 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +1232 +%%EOF \ No newline at end of file diff --git a/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryItemMediaView.swift b/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryItemMediaView.swift index 53505d9735..f49ad844f0 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryItemMediaView.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Context View/StoryItemMediaView.swift @@ -296,7 +296,7 @@ class StoryItemMediaView: UIView { // For private stories, other than "My Story", render the name of the story let contextIcon = UIImageView() - contextIcon.setTemplateImageName("lock-16", tintColor: Theme.darkThemePrimaryColor) + contextIcon.setTemplateImageName("stories-16", tintColor: Theme.darkThemePrimaryColor) contextIcon.autoSetDimensions(to: .square(16)) let contextNameLabel = UILabel() diff --git a/Signal/src/ViewControllers/HomeView/Stories/Settings/StoryPrivacySettingsViewController.swift b/Signal/src/ViewControllers/HomeView/Stories/Settings/StoryPrivacySettingsViewController.swift index 77e59b52b2..5b044acf9c 100644 --- a/Signal/src/ViewControllers/HomeView/Stories/Settings/StoryPrivacySettingsViewController.swift +++ b/Signal/src/ViewControllers/HomeView/Stories/Settings/StoryPrivacySettingsViewController.swift @@ -74,14 +74,14 @@ class StoryPrivacySettingsViewController: OWSTableViewController2 { let myStoriesSection = OWSTableSection() myStoriesSection.customHeaderView = NewStoryHeaderView( title: NSLocalizedString( - "STORIES_SETTINGS_MY_STORIES_HEADER", - comment: "Header for the 'My Stories' section of the stories settings" + "STORIES_SETTINGS_STORIES_HEADER", + comment: "Header for the 'Stories' section of the stories settings" ), delegate: self ) myStoriesSection.footerTitle = NSLocalizedString( - "STORIES_SETTINGS_MY_STORIES_FOOTER", - comment: "Footer for the 'My Stories' section of the stories settings" + "STORIES_SETTINGS_STORIES_FOOTER", + comment: "Footer for the 'Stories' section of the stories settings" ) contents.addSection(myStoriesSection) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 82f96c33b4..3b58db9a68 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -3892,6 +3892,9 @@ /* Title for error alert indicating that a story name is required. */ "NEW_PRIVATE_STORY_MISSING_NAME_ALERT_TITLE" = "Missing Story Name"; +/* Section footer for the name text field on the 'new private story' creation view */ +"NEW_PRIVATE_STORY_NAME_FOOTER" = "Only you can see the name of this story."; + /* Placeholder text for a new private story name */ "NEW_PRIVATE_STORY_NAME_PLACEHOLDER" = "Story Name (Required)"; @@ -3904,18 +3907,18 @@ /* table section header button to add a new story */ "NEW_STORY_HEADER_VIEW_ADD_NEW_STORY_BUTTON" = "New"; +/* Subtitle for create custom story row on the 'new story sheet' */ +"NEW_STORY_SHEET_CUSTOM_STORY_SUBTITLE" = "Visible only to specific people"; + +/* Title for create custom story row on the 'new story sheet' */ +"NEW_STORY_SHEET_CUSTOM_STORY_TITLE" = "New Custom Story"; + /* Subtitle for create group story row on the 'new story sheet' */ "NEW_STORY_SHEET_GROUP_STORY_SUBTITLE" = "Share to an existing group"; /* Title for create group story row on the 'new story sheet' */ "NEW_STORY_SHEET_GROUP_STORY_TITLE" = "New Group Story"; -/* Subtitle for create private story row on the 'new story sheet' */ -"NEW_STORY_SHEET_PRIVATE_STORY_SUBTITLE" = "Visible only to specific people"; - -/* Title for create private story row on the 'new story sheet' */ -"NEW_STORY_SHEET_PRIVATE_STORY_TITLE" = "New Private Story"; - /* Title for the new story sheet */ "NEW_STORY_SHEET_TITLE" = "Choose Story Type"; @@ -4739,7 +4742,7 @@ "PRIVATE_STORY_SETTINGS_ADD_VIEWER_BUTTON" = "Add Viewers"; /* Button to delete the story on the 'private story settings' view */ -"PRIVATE_STORY_SETTINGS_DELETE_BUTTON" = "Delete Private Story"; +"PRIVATE_STORY_SETTINGS_DELETE_BUTTON" = "Delete Custom Story"; /* Action sheet title confirming deletion of a private story on the 'private story settings' view. Embeds {{ $1%@ private story name }} */ "PRIVATE_STORY_SETTINGS_DELETE_CONFIRMATION_FORMAT" = "Are you sure you want to delete “%1$@”? Updates shared to this story will also be deleted."; @@ -6283,11 +6286,11 @@ /* Context menu action to save the selected story */ "STORIES_SAVE_STORY_ACTION" = "Save"; -/* Footer for the 'My Stories' section of the stories settings */ -"STORIES_SETTINGS_MY_STORIES_FOOTER" = "Stories automatically disappear after 24 hours. Choose who can view your story or create new stories with specific viewers or groups."; +/* Footer for the 'Stories' section of the stories settings */ +"STORIES_SETTINGS_STORIES_FOOTER" = "Stories automatically disappear after 24 hours. Choose who can view your story or create new stories with specific viewers or groups."; -/* Header for the 'My Stories' section of the stories settings */ -"STORIES_SETTINGS_MY_STORIES_HEADER" = "My Stories"; +/* Header for the 'Stories' section of the stories settings */ +"STORIES_SETTINGS_STORIES_HEADER" = "Stories"; /* Title for the action sheet confirming you want to turn off and delete all stories */ "STORIES_SETTINGS_TURN_OFF_ACTION_SHEET_MESSAGE" = "You will no longer be able to share or view stories. Story updates you have recently shared will also be deleted."; diff --git a/Signal/translations/en.lproj/PluralAware.stringsdict b/Signal/translations/en.lproj/PluralAware.stringsdict index f55d952cc3..2628912e2e 100644 --- a/Signal/translations/en.lproj/PluralAware.stringsdict +++ b/Signal/translations/en.lproj/PluralAware.stringsdict @@ -376,9 +376,9 @@ NSStringFormatValueTypeKey d one - Private Story · 1 Viewer + Custom Story · 1 Viewer other - Private Story · %d Viewers + Custom Story · %d Viewers MY_STORY_VIEWERS_ALL_CONNECTIONS_%d diff --git a/SignalUI/Appearance/Theme+OWS.swift b/SignalUI/Appearance/Theme+OWS.swift index 586587b272..a52f7764b9 100644 --- a/SignalUI/Appearance/Theme+OWS.swift +++ b/SignalUI/Appearance/Theme+OWS.swift @@ -52,7 +52,6 @@ public enum ThemeIcon: UInt { case settingsBoost case settingsReceipts case settingsGift - case settingsPrivateStory case stickerButton case cameraButton @@ -82,8 +81,6 @@ public enum ThemeIcon: UInt { case contextMenuInfo20 case contextMenuInfo24 - case privateStory40 - case compose24 case composeNewGroup case composeFindByPhoneNumber @@ -299,10 +296,6 @@ public extension Theme { return isDarkThemeEnabled ? "receipts-solid-24" : "receipts-outline-24" case .settingsGift: return isDarkThemeEnabled ? "gift-solid-24" : "gift-outline-24" - case .settingsPrivateStory: - return isDarkThemeEnabled ? "private-story-solid-24" : "private-story-outline-24" - case .privateStory40: - return isDarkThemeEnabled ? "private-story-solid-40" : "private-story-outline-40" // Input Toolbar case .stickerButton: diff --git a/SignalUI/ViewControllers/ConversationPicker/ConversationItem.swift b/SignalUI/ViewControllers/ConversationPicker/ConversationItem.swift index 6be2c63350..820b9de07e 100644 --- a/SignalUI/ViewControllers/ConversationPicker/ConversationItem.swift +++ b/SignalUI/ViewControllers/ConversationPicker/ConversationItem.swift @@ -461,7 +461,7 @@ extension PrivateStoryConversationItem: ConversationItem { } public var image: UIImage? { - UIImage(named: "private-story-\(Theme.isDarkThemeEnabled ? "dark" : "light")-36") + UIImage(named: "custom-story-\(Theme.isDarkThemeEnabled ? "dark" : "light")-36") } public func getExistingThread(transaction: SDSAnyReadTransaction) -> TSThread? { diff --git a/SignalUI/ViewControllers/Stories/NewPrivateStoryConfirmViewController.swift b/SignalUI/ViewControllers/Stories/NewPrivateStoryConfirmViewController.swift index 5adca0fb1a..80d62f54a1 100644 --- a/SignalUI/ViewControllers/Stories/NewPrivateStoryConfirmViewController.swift +++ b/SignalUI/ViewControllers/Stories/NewPrivateStoryConfirmViewController.swift @@ -78,48 +78,29 @@ public class NewPrivateStoryConfirmViewController: OWSTableViewController2 { return textField }() - private lazy var iconImageView: UIImageView = { - let imageView = UIImageView() - - imageView.contentMode = .center - imageView.layer.cornerRadius = 32 - imageView.clipsToBounds = true - imageView.autoSetDimensions(to: CGSize(square: 64)) - - return imageView - }() public override func applyTheme() { super.applyTheme() nameTextField.textColor = Theme.primaryTextColor - - iconImageView.setThemeIcon(.privateStory40, tintColor: Theme.primaryIconColor) - iconImageView.backgroundColor = Theme.isDarkThemeEnabled ? .ows_gray65 : .ows_gray02 } private func updateTableContents() { let contents = OWSTableContents() let nameAndAvatarSection = OWSTableSection() + nameAndAvatarSection.footerTitle = OWSLocalizedString( + "NEW_PRIVATE_STORY_NAME_FOOTER", + comment: "Section footer for the name text field on the 'new private story' creation view" + ) nameAndAvatarSection.add(.init( customCellBlock: { [weak self] in let cell = OWSTableItem.newCell() cell.selectionStyle = .none guard let self = self else { return cell } - self.iconImageView.setContentHuggingVerticalHigh() - self.nameTextField.setContentHuggingHorizontalLow() - let firstSection = UIStackView(arrangedSubviews: [ - self.iconImageView, - self.nameTextField - ]) - firstSection.axis = .horizontal - firstSection.alignment = .center - firstSection.spacing = ContactCellView.avatarTextHSpacing - - cell.contentView.addSubview(firstSection) - firstSection.autoPinEdgesToSuperviewMargins() + cell.contentView.addSubview(self.nameTextField) + self.nameTextField.autoPinEdgesToSuperviewMargins() return cell }, diff --git a/SignalUI/ViewControllers/Stories/NewStorySheet.swift b/SignalUI/ViewControllers/Stories/NewStorySheet.swift index 6f8ccf0faf..4d0de64060 100644 --- a/SignalUI/ViewControllers/Stories/NewStorySheet.swift +++ b/SignalUI/ViewControllers/Stories/NewStorySheet.swift @@ -47,11 +47,11 @@ public class NewStorySheet: OWSTableSheetViewController { optionsSection.customHeaderHeight = 28 contents.addSection(optionsSection) optionsSection.add(buildOptionItem( - icon: .settingsPrivateStory, - title: OWSLocalizedString("NEW_STORY_SHEET_PRIVATE_STORY_TITLE", - comment: "Title for create private story row on the 'new story sheet'"), - subtitle: OWSLocalizedString("NEW_STORY_SHEET_PRIVATE_STORY_SUBTITLE", - comment: "Subtitle for create private story row on the 'new story sheet'"), + icon: .settingsStories, + title: OWSLocalizedString("NEW_STORY_SHEET_CUSTOM_STORY_TITLE", + comment: "Title for create custom story row on the 'new story sheet'"), + subtitle: OWSLocalizedString("NEW_STORY_SHEET_CUSTOM_STORY_SUBTITLE", + comment: "Subtitle for create custom story row on the 'new story sheet'"), action: { [weak self] in guard let self = self else { return } let presentingViewController = self.presentingViewController