From e67a18783bf81b1a05fc48582d374fefa75c5121 Mon Sep 17 00:00:00 2001 From: Monique Solanki Date: Wed, 14 Nov 2018 17:09:09 -0800 Subject: [PATCH] Changed primary color, added visibility + attachment icons, and added those icons to the compose view controller. --- .../Colors/Primary.colorset/Contents.json | 6 +++--- .../Icons/Attachment.imageset/Attachment.pdf | Bin 0 -> 4054 bytes .../Icons/Attachment.imageset/Contents.json | 12 ++++++++++++ .../Icons/Users.imageset/Contents.json | 2 +- .../Users.imageset/{users.pdf => Users.pdf} | Bin 4043 -> 4029 bytes .../Icons/Visibility.imageset/Contents.json | 12 ++++++++++++ .../Icons/Visibility.imageset/Eye.pdf | Bin 0 -> 3940 bytes elpha-ios/Base.lproj/Main.storyboard | 16 +++++++++------- 8 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 elpha-ios/Assets.xcassets/Icons/Attachment.imageset/Attachment.pdf create mode 100644 elpha-ios/Assets.xcassets/Icons/Attachment.imageset/Contents.json rename elpha-ios/Assets.xcassets/Icons/Users.imageset/{users.pdf => Users.pdf} (82%) create mode 100644 elpha-ios/Assets.xcassets/Icons/Visibility.imageset/Contents.json create mode 100644 elpha-ios/Assets.xcassets/Icons/Visibility.imageset/Eye.pdf diff --git a/elpha-ios/Assets.xcassets/Colors/Primary.colorset/Contents.json b/elpha-ios/Assets.xcassets/Colors/Primary.colorset/Contents.json index 17e45ef..4d85a75 100644 --- a/elpha-ios/Assets.xcassets/Colors/Primary.colorset/Contents.json +++ b/elpha-ios/Assets.xcassets/Colors/Primary.colorset/Contents.json @@ -9,10 +9,10 @@ "color" : { "color-space" : "srgb", "components" : { - "red" : "0x8A", + "red" : "0x53", "alpha" : "1.000", - "blue" : "0xAE", - "green" : "0x7B" + "blue" : "0x8E", + "green" : "0x34" } } } diff --git a/elpha-ios/Assets.xcassets/Icons/Attachment.imageset/Attachment.pdf b/elpha-ios/Assets.xcassets/Icons/Attachment.imageset/Attachment.pdf new file mode 100644 index 0000000000000000000000000000000000000000..4b4667b290672df0da525bd92083cd3135639d0f GIT binary patch literal 4054 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 literal 0 HcmV?d00001 diff --git a/elpha-ios/Assets.xcassets/Icons/Attachment.imageset/Contents.json b/elpha-ios/Assets.xcassets/Icons/Attachment.imageset/Contents.json new file mode 100644 index 0000000..6fdc403 --- /dev/null +++ b/elpha-ios/Assets.xcassets/Icons/Attachment.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Attachment.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/elpha-ios/Assets.xcassets/Icons/Users.imageset/Contents.json b/elpha-ios/Assets.xcassets/Icons/Users.imageset/Contents.json index eb6f086..db94bec 100644 --- a/elpha-ios/Assets.xcassets/Icons/Users.imageset/Contents.json +++ b/elpha-ios/Assets.xcassets/Icons/Users.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "users.pdf" + "filename" : "Users.pdf" } ], "info" : { diff --git a/elpha-ios/Assets.xcassets/Icons/Users.imageset/users.pdf b/elpha-ios/Assets.xcassets/Icons/Users.imageset/Users.pdf similarity index 82% rename from elpha-ios/Assets.xcassets/Icons/Users.imageset/users.pdf rename to elpha-ios/Assets.xcassets/Icons/Users.imageset/Users.pdf index fbdd48a7168beb735503b88d6b6093398905dbd1..ca676675572586ad70f44365ace981a0c4bd8349 100644 GIT binary patch delta 600 zcmX>tzgK=jP`zQ%VFRAqf4OQFXlZ(jSf;<8c3ODPmc1n>N?&~EUbXS^>7OM`ngR`# zhb7HJ{y2O*_L)<&jepO)eWJ^`wK*>ud~C_}C|}=lb#33ZLd(J!#XoUV5_E2hUrCq| ze%Mr7SNTY9OW3LwvrAKrZcLakXYK^2>Wv)n=4L%Tr+KO@N;4Yj!+8DFXRpfM@ZrB} z-*4yl3zinldhe$rx2>i8cI?*$Kfm1mu+Qe`N}kA?ltrSpfla0dMYp=_FufPE;1y4b zuF{U<*M6@E`nh`Mb5B$A=jAt53YMluw0yJNxvKTDOG-ub|0h3p$jtrneu}NsUY?ao zA1_EQZTsoUBenVU|Y z!K=q^XlQC+U}`b>EN`=xvAKc)2q@$!aDf>H2FB(l=wil3mIjln_|)o6P0^(cOiZyT z$D+>E$Ov7pv5_%`dB(=(h8XHhj38qCNbWQ?u{52m$8Q&JXkiXCJITxCCSv( zz#`2&DKXU`InB`0B-Ox<%Z8v5g;)hUJFeoA#G;alqSQ1lV>3e|E>%@me>W}wi`dT> delta 585 zcmdlhe_DP*P`z~!t0B+pVy^gxgy)ZMd@U=<|Hg5f;j_lQfP&g58{`wpj3x@XUi#%| zUKOxVU#RL}mHIia{4aZIxOBB8th=?N518$kEqWj+%I)r@(JHa1khd02HS=UMKTS&R6d-*agzTadQ&+arfvi}z2~{L!7GtQG#M zktw91Wcj4KzS3nr5h-TZp2?N1{T^tMCffSnSJ5qdw=N5(@p&`w#9ku+h$$^a0Oy(w=^B8$}_!VL_ zoJuouQWOj=9E~jvCwKAcu^Si~8<-fGPu|bltYvDbU;qLNc?w)$hJk^xg(bR}v9W>a z7mgb3eTsDN1OkT(@%xPrCrK;-c@5TiHg?r85 diff --git a/elpha-ios/Assets.xcassets/Icons/Visibility.imageset/Contents.json b/elpha-ios/Assets.xcassets/Icons/Visibility.imageset/Contents.json new file mode 100644 index 0000000..f460f3a --- /dev/null +++ b/elpha-ios/Assets.xcassets/Icons/Visibility.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Eye.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/elpha-ios/Assets.xcassets/Icons/Visibility.imageset/Eye.pdf b/elpha-ios/Assets.xcassets/Icons/Visibility.imageset/Eye.pdf new file mode 100644 index 0000000000000000000000000000000000000000..1633f6a928fbaee2285b9e3ebdd105cc19d2879e GIT binary patch literal 3940 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 - - @@ -1833,6 +1833,7 @@ + @@ -1844,11 +1845,12 @@ + - +