diff --git a/DESCRIPTION b/DESCRIPTION index de829b4..51f71fc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,3 +29,4 @@ Suggests: tidycensus Config/testthat/edition: 3 Config/roxygen2/version: 8.0.0 +RoxygenNote: 7.3.3 diff --git a/NAMESPACE b/NAMESPACE index b3e75f9..409f60f 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -5,6 +5,7 @@ export(add_logo_ga) export(agresti_coull_interval) export(civilytics_colors) export(civilytics_load_fonts) +export(civilytics_logo) export(civilytics_pal) export(clopper_pearson) export(countCleanr) diff --git a/R/logo.R b/R/logo.R index e38931c..c3a6d55 100644 --- a/R/logo.R +++ b/R/logo.R @@ -9,8 +9,10 @@ #' @importFrom jpeg readJPEG #' @importFrom graphics rasterImage #' @examples -#' img <- system.file("img","civilytics_logo.jpg",package="civilytics") +#' \dontrun{ +#' img <- system.file("img","Knowles_Headshot_2019_good.jpg",package="civilytics") #' plot_jpeg(img) +#' } plot_jpeg <- function(path, add=FALSE, upscale = TRUE) { jpg = readJPEG(path, native = TRUE) # read the file @@ -160,27 +162,96 @@ add_logo_ga <- function(plot_list, logo, nrow = 1, widths = NULL, margin_param = #' Get a Civilytics Logo grob #' #' Returns a ggplot object containing the Civilytics logo as a rasterGrob, -#' ready to compose with plots via [add_logo()] or [add_logo_ga()]. +#' ready to compose with plots via [add_logo()], [add_logo_ga()], or the +#' pipe-friendly [civilytics_logo()]. #' -#' @param variant Character. `"light"` (default) uses the standard dark logo -#' suitable for light backgrounds. `"dark"` uses the white logo suitable for -#' dark backgrounds (pairs with [theme_civilytics_dark()]). +#' @param type Character. `"wordmark"` (default) uses the full wordmark. +#' `"mark"` uses the compact C-pulse icon only. +#' @param variant Character. `"light"` (default) uses the dark logo for light +#' backgrounds. `"dark"` uses the reverse (light) logo for dark backgrounds +#' (pairs with [theme_civilytics_dark()]). #' #' @return A ggplot object (class `"gg"`) containing the logo grob. #' @export #' @importFrom ggplot2 ggplot theme_void annotation_custom #' @examples -#' logo <- make_logo_grob() # light background -#' logo_dark <- make_logo_grob("dark") # dark background +#' logo <- make_logo_grob() # wordmark, light +#' logo <- make_logo_grob("mark", "dark") # mark, dark #' class(logo) # "gg" "ggplot" -make_logo_grob <- function(variant = c("light", "dark")) { - variant <- match.arg(variant) - img_file <- if (variant == "dark") "civilytics_logo_white.png" else "civilytics_logo.png" +make_logo_grob <- function(type = c("wordmark", "mark"), + variant = c("light", "dark")) { + type <- match.arg(type) + variant <- match.arg(variant) + + img_file <- switch( + paste(type, variant, sep = "_"), + wordmark_light = "civilytics-wordmark.png", + wordmark_dark = "civilytics-wordmark-reverse.png", + mark_light = "civilytics-mark.png", + mark_dark = "civilytics-mark-reverse.png" + ) + + # Right-align the logo; the mark is compact so it gets a narrower slice. + xmin <- if (type == "mark") 0.93 else 0.65 + ggplot2::ggplot() + ggplot2::theme_void() + ggplot2::annotation_custom( get_png(system.file("img", img_file, package = "civilytics")), - xmin = 0.7, xmax = 1 + xmin = xmin, xmax = 1 ) } +#' Add a Civilytics logo to a ggplot (pipe-friendly) +#' +#' A convenience wrapper that creates the logo grob and attaches it below the +#' plot in one call. Designed for use with the base pipe `|>`: +#' +#' ``` +#' ggplot(mpg, aes(displ, hwy)) + +#' geom_point() + +#' theme_civilytics() |> +#' civilytics_logo() +#' ``` +#' +#' Since `|>` has lower precedence than `+`, the entire ggplot chain is piped +#' as the first argument — no parentheses needed. +#' +#' @param plot A ggplot object. +#' @param type Character. `"wordmark"` (default) or `"mark"`. Passed to +#' [make_logo_grob()]. +#' @param variant Character. `"light"` (default) or `"dark"`. Passed to +#' [make_logo_grob()]. +#' @param margin_param Numeric or `NULL`. Manual margin adjustment passed to +#' [add_logo()]. +#' +#' @return A grob (from [gridExtra::arrangeGrob()]) ready to draw with +#' [grid::grid.draw()]. +#' @export +#' +#' @examples +#' \dontrun{ +#' library(ggplot2); library(grid) +#' +#' # Pipe-friendly usage +#' ggplot(mpg, aes(displ, hwy)) + +#' geom_point() + +#' theme_civilytics() |> +#' civilytics_logo() |> +#' grid.draw() +#' +#' # Dark theme with mark +#' ggplot(mpg, aes(displ, hwy)) + +#' geom_point() + +#' theme_civilytics_dark() |> +#' civilytics_logo(variant = "dark", type = "mark") |> +#' grid.draw() +#' } +civilytics_logo <- function(plot, + type = c("wordmark", "mark"), + variant = c("light", "dark"), + margin_param = NULL) { + logo <- make_logo_grob(type = type, variant = variant) + add_logo(plot, logo, margin_param = margin_param) +} + diff --git a/R/theme.R b/R/theme.R index 675bcd2..2937fe3 100644 --- a/R/theme.R +++ b/R/theme.R @@ -33,6 +33,7 @@ #' @export #' #' @examples +#' \dontrun{ #' library(ggplot2) #' ggplot(mpg, aes(displ, hwy)) + #' geom_point() + @@ -42,6 +43,7 @@ #' geom_point() + #' scale_color_civilytics() + #' theme_civilytics() +#' } theme_civilytics <- function( font_size = 14, font_family = CV_FONT_SANS, @@ -241,6 +243,7 @@ theme_civilytics <- function( #' @export #' #' @examples +#' \dontrun{ #' library(ggplot2) #' ggplot(mpg, aes(displ, hwy)) + #' geom_point() + @@ -250,6 +253,7 @@ theme_civilytics <- function( #' geom_point() + #' scale_color_civilytics() + #' theme_civilytics_dark() +#' } theme_civilytics_dark <- function( font_size = 14, font_family = CV_FONT_SANS, diff --git a/inst/img/civilytics-mark-reverse.png b/inst/img/civilytics-mark-reverse.png new file mode 100644 index 0000000..c088f22 Binary files /dev/null and b/inst/img/civilytics-mark-reverse.png differ diff --git a/inst/img/civilytics-mark.png b/inst/img/civilytics-mark.png new file mode 100644 index 0000000..53163f6 Binary files /dev/null and b/inst/img/civilytics-mark.png differ diff --git a/inst/img/civilytics-wordmark-reverse.png b/inst/img/civilytics-wordmark-reverse.png new file mode 100644 index 0000000..1582113 Binary files /dev/null and b/inst/img/civilytics-wordmark-reverse.png differ diff --git a/inst/img/civilytics-wordmark.png b/inst/img/civilytics-wordmark.png new file mode 100644 index 0000000..c15659f Binary files /dev/null and b/inst/img/civilytics-wordmark.png differ diff --git a/inst/img/civilytics_logo.jpg b/inst/img/civilytics_logo.jpg deleted file mode 100644 index 59210ae..0000000 Binary files a/inst/img/civilytics_logo.jpg and /dev/null differ diff --git a/inst/img/civilytics_logo.pdf b/inst/img/civilytics_logo.pdf deleted file mode 100644 index f14c02e..0000000 --- a/inst/img/civilytics_logo.pdf +++ /dev/null @@ -1,720 +0,0 @@ -%PDF-1.5 % -1 0 obj <>/OCGs[5 0 R]>>/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <>stream - - - - - application/pdf - - - Civilytics Consulting Logo - - - Adobe Illustrator CC 23.0 (Windows) - 2019-10-03T08:33:30-04:00 - 2019-10-03T08:33:30-04:00 - 2019-10-03T08:33:30-04:00 - - - - 256 - 52 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgANAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A6bpPnfzD+Y/nzWNH8uX7 6N5P8suLbUtUt1ie7vrslh6cDyrIkUSlDVlUsR3HIUVRP5kx+ffJXlC91vy1r89+lsqrdWuqpDcP GkjLH9YtpUjjbnFXkVl5oRXYHqqi/wAx/L+jeYfNXlgy+cxodxol8kj6RFcxRSXTy8DFHx5pIJHI ULXlVWNBU4qzK483eVLaeS3uNasIZ4mKSxSXMKurDYqylgQRiqrdeZPLtpefUrrVbO3vaqPq0txE ktX+yODMG+Ku22+KsG0nQfL97+bV75pg86LqhvbAW0PlmO6hkiVFAWRvTRzyj2DU4/aJJOKvP/yf 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 - - - - uuid:9E3E5C9A8C81DB118734DB58FDDE4BA7 - xmp.did:f663c0bc-2bc8-e14f-a4eb-0ae2aefff354 - uuid:cd5f7198-b551-4996-b056-4cfbcc97d13d - proof:pdf - - uuid:dab6724e-c618-4184-9b2e-7d44879e5e5f - xmp.did:008add62-65b7-3547-8416-6472cd533b2c - uuid:9E3E5C9A8C81DB118734DB58FDDE4BA7 - proof:pdf - - - - - saved - xmp.iid:f663c0bc-2bc8-e14f-a4eb-0ae2aefff354 - 2019-10-03T08:33:27-04:00 - Adobe Illustrator CC 23.0 (Windows) - / - - - - Basic RGB - 1 - False - False - - 6.728299 - 1.834201 - Inches - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - CMYK - PROCESS - 0.000000 - 0.000000 - 0.000000 - 0.000000 - - - Black - CMYK - PROCESS - 74.972147 - 67.919427 - 67.049664 - 90.145719 - - - RGB Red - CMYK - PROCESS - 0.000000 - 99.328601 - 100.000000 - 0.000000 - - - RGB Yellow - CMYK - PROCESS - 6.182956 - 0.000000 - 96.548408 - 0.000000 - - - RGB Green - CMYK - PROCESS - 62.658119 - 0.000000 - 100.000000 - 0.000000 - - - RGB Cyan - CMYK - PROCESS - 51.808953 - 0.000000 - 12.567329 - 0.000000 - - - RGB Blue - CMYK - PROCESS - 88.384831 - 76.852059 - 0.000000 - 0.000000 - - - RGB Magenta - CMYK - PROCESS - 27.106124 - 81.603718 - 0.000000 - 0.000000 - - - R=193 G=39 B=45 - CMYK - PROCESS - 16.891736 - 97.961390 - 92.785531 - 6.729228 - - - R=237 G=28 B=36 - CMYK - PROCESS - 0.296025 - 99.276721 - 97.207594 - 0.088502 - - - R=241 G=90 B=36 - CMYK - PROCESS - 0.000000 - 79.913020 - 96.704048 - 0.012207 - - - R=247 G=147 B=30 - CMYK - PROCESS - 0.021363 - 50.087738 - 98.608375 - 0.000000 - - - R=251 G=176 B=59 - CMYK - PROCESS - 0.000000 - 34.851605 - 87.261766 - 0.000000 - - - R=252 G=238 B=33 - CMYK - PROCESS - 4.547188 - 0.000000 - 93.218887 - 0.000000 - - - R=217 G=224 B=33 - CMYK - PROCESS - 18.875410 - 0.000000 - 98.425263 - 0.000000 - - - R=140 G=198 B=63 - CMYK - PROCESS - 50.032806 - 0.161746 - 99.304187 - 0.000000 - - - R=57 G=181 B=74 - CMYK - PROCESS - 74.663919 - 0.000000 - 99.768060 - 0.009155 - - - R=0 G=146 B=69 - CMYK - PROCESS - 86.407262 - 17.633325 - 100.000000 - 3.823911 - - - R=0 G=104 B=55 - CMYK - PROCESS - 90.328830 - 33.408102 - 98.858625 - 26.044098 - - - R=34 G=181 B=115 - CMYK - PROCESS - 76.229495 - 0.000000 - 74.920267 - 0.000000 - - - R=0 G=169 B=157 - CMYK - PROCESS - 78.408480 - 9.073014 - 45.722133 - 0.027466 - - - R=41 G=171 B=226 - CMYK - PROCESS - 69.719994 - 14.785992 - 0.000000 - 0.000000 - - - R=0 G=113 B=188 - CMYK - PROCESS - 87.487596 - 52.660406 - 0.000000 - 0.000000 - - - R=46 G=49 B=146 - CMYK - PROCESS - 99.197370 - 96.453798 - 3.418021 - 0.491341 - - - R=27 G=20 B=100 - CMYK - PROCESS - 100.000000 - 100.000000 - 26.172274 - 24.441901 - - - R=102 G=45 B=145 - CMYK - PROCESS - 74.554050 - 98.455787 - 0.982681 - 0.228885 - - - R=147 G=39 B=143 - CMYK - PROCESS - 49.448386 - 99.258411 - 1.321431 - 0.106813 - - - R=158 G=0 B=93 - CMYK - PROCESS - 34.848553 - 100.000000 - 37.164873 - 10.803387 - - - R=212 G=20 B=90 - CMYK - PROCESS - 11.926451 - 100.000000 - 49.256122 - 0.878920 - - - R=237 G=30 B=121 - CMYK - PROCESS - 0.000000 - 97.082472 - 20.383000 - 0.000000 - - - R=199 G=178 B=153 - CMYK - PROCESS - 22.882429 - 27.399099 - 39.954221 - 0.000000 - - - R=153 G=134 B=117 - CMYK - PROCESS - 39.859617 - 42.893109 - 52.553594 - 6.805523 - - - R=115 G=99 B=87 - CMYK - PROCESS - 50.441748 - 53.072399 - 60.970473 - 23.602654 - - - R=83 G=71 B=65 - CMYK - PROCESS - 57.607383 - 60.415041 - 63.701838 - 41.919583 - - - R=198 G=156 B=109 - CMYK - PROCESS - 22.659647 - 38.376439 - 63.649952 - 1.181048 - - - R=166 G=124 B=82 - CMYK - PROCESS - 31.540397 - 49.149308 - 74.108487 - 9.897001 - - - R=140 G=98 B=57 - CMYK - PROCESS - 36.243227 - 57.430381 - 83.996338 - 22.613870 - - - R=117 G=76 B=36 - CMYK - PROCESS - 39.163804 - 64.052790 - 93.292129 - 35.577935 - - - R=96 G=56 B=19 - CMYK - PROCESS - 41.574728 - 70.016021 - 97.061110 - 49.149308 - - - R=66 G=33 B=11 - CMYK - PROCESS - 47.708857 - 73.470664 - 83.718622 - 68.142211 - - - - - - Cold - 1 - - - - C=56 M=0 Y=20 K=0 - CMYK - PROCESS - 55.809867 - 0.000000 - 19.998473 - 0.000000 - - - C=51 M=43 Y=0 K=0 - CMYK - PROCESS - 51.107037 - 43.094528 - 0.000000 - 0.000000 - - - C=26 M=41 Y=0 K=0 - CMYK - PROCESS - 26.425573 - 41.297016 - 0.000000 - 0.000000 - - - - - - Grays - 1 - - - - R=0 G=0 B=0 - CMYK - PROCESS - 74.972147 - 67.919427 - 67.049664 - 90.145719 - - - R=26 G=26 B=26 - CMYK - PROCESS - 72.606999 - 66.668189 - 65.243000 - 78.234529 - - - R=51 G=51 B=51 - CMYK - PROCESS - 69.433123 - 63.234907 - 62.102687 - 58.355075 - - - R=77 G=77 B=77 - CMYK - PROCESS - 65.395588 - 58.022428 - 56.820017 - 36.655220 - - - R=102 G=102 B=102 - CMYK - PROCESS - 59.771115 - 51.183337 - 50.771338 - 20.129701 - - - R=128 G=128 B=128 - CMYK - PROCESS - 51.619744 - 43.204394 - 43.204394 - 7.547112 - - - R=153 G=153 B=153 - CMYK - PROCESS - 42.615396 - 34.741738 - 35.318530 - 0.985733 - - - R=179 G=179 B=179 - CMYK - PROCESS - 30.695048 - 24.188600 - 24.777599 - 0.000000 - - - R=204 G=204 B=204 - CMYK - PROCESS - 19.467460 - 15.017928 - 15.637445 - 0.000000 - - - R=230 G=230 B=230 - CMYK - PROCESS - 8.499275 - 6.103609 - 6.628519 - 0.000000 - - - R=242 G=242 B=242 - CMYK - PROCESS - 3.707942 - 2.462806 - 2.462806 - 0.000000 - - - - - - - Adobe PDF library 15.00 - - - - - - - - - - - - - - - - - - - - - - - - - -endstream endobj 3 0 obj <> endobj 7 0 obj <>/Properties<>>>/Thumb 10 0 R/TrimBox[0.0 0.0 484.438 132.062]/Type/Page>> endobj 8 0 obj <>stream -H|Wɮ$IW%+ !āhȞ4f摯fR_=~ӏc{?>>¯6+o>ykgn?=ǯOM /mqYF;{Ю6~ |׼-g\3gY{c-{\e|Yc~ sn+?x_s7>%W~By- S3az"]ju3be>؆y|RVp'lGe=?Uu[o+נv5d6ք*ğ~g πןtĢOuk@5^,,I0^toeJF2t$*zaWF~ vFI3il;LDV6 -hKn(.iZV[mT0>jC8QF X{.MKq_݆2e&ٹ6űE"b Yj BU T[Sp{lP(a9doּ|8 RJ-ƁZml!׀6 B:t! -[W{EVX -HzY@1v4vO(-Cjr""BV) }2f<8hA~ `滙b0 w롮ະDVazѳ%h) |ꞅ4Za; X6ǒz;@60,nmv2kFXZmۈRփ6@CN4jC/4idž`@4!Zb&e2L Ԅ&΁ 0bzJ`©0taP;%ibkZڳ.e$U]&qҮ9GhH߆/Q8)QWJ v`~Zؐc@rv)KSWE]W}ƒh<*]S9]l4 uքpҷ|KCY dmY꤈RGV5CcK`![3WY%Qj5^Q{ 94Qi -qD|f>!zŰ Y4(l-%Gf;GY4:*,[nfQ,vP^(WԀ+oZJ0 9#ӳjw9 [8թnQ%A>]:ςCx)ht@Z$HYM?̇-(pѤw<%@8f2طjr,S(^i¾70w Vb[̐@Rx]QJȯ/0,\\r#>֧QӍ1ۜ F9EBܒI -ͪMsL2Qo͌ѲJm2 NƊW Jt$!K DA"/rou%ҳ%g0ȸqAon)yCݸKwv !YU/ME9(o6@ɛvA, yx"g(#ћ\zY^g+|#xQ>{MTr432Z6"_%q1zUl돥$5'E!ܜLLjHL[$e4wS;IR}OYs?iWpfH{^=-6㯖"x ::F'58,})A g -PKqZÂ%8FiSc4 ݛ rk;k?[7$dtqMtTR"bi%]W\t!ZȶB*΅BÔ'L2bUTyD[l7G/?!r.y/pKO$+w(7ۋqʼnۜAI|ZQknCtMMFy-e[ُ+cؽ}v -4ES)K(d~kH/g5)^](Б/~":f?+dkCVz/!Mhɾ>g~s?(ϧ6ڡ}4~OmlЩ㌍Д+} -Þ3CKuh׉Yn< fVIJHY<;.MY1!aAR&μ^m&_Yl~HజF9G%OԝҭuYV5 C %'&i9]FoV&C_FkD$k0n5s0hD=ߊX=s:֖IS-y/!flNZAS.Qd"! Itn`BiZ4xε\LGUxZ2bFqF9a0Ns9i0EXVD _˶ o7Gyƫ3 394iz@Gͳl{밗KxVSެiѭW48JSdޟa`# -lz5 yZv`*0O84&ߊDx2"[]d4_:H6Aio;~HH P(TvzL3}"U{ 2%3 2Mۨp}Fu%Q0 -k9fpXɧ ̶c am˳d؋hi/;Gvl^Ok)]]^==^3W|m2 yܛKձaC&KVr GԈƫ$q@#N}ur~H uQ¢I -xא,u]N<ɄDrqQ,@r -sh 388JoGEe#TWl/ M%cM9(59j@aHМ֓)w_ُ[3]6j[Hij<_G'ZԒޱ%N7!?JVLIM3J1&rF˲iJ<\6u'縞Lb;Rd*IMP/F_iv/U&VZ6E _ZdB>@y;5ldVY)g9_1$E?D`)2psH*"~j,zM1h@>LpEMۖ#)bK L`G~8PjullMA=YM$+5*zVHu!~ -ڌׅIz=LMTVJ]L#k'PVJC;O-VtsPuhhɚ^sy,ҧ!b49& uċ0ɪiȸnb}ry%\t؁'ώ%lb 2jJvr(w~=}"8{9)8{XXeT.PvX#14"uFbV]2Q#QmaeĬ@@@ρX9r ,MsdZ!A[<@_1nt} ~5|~a qC|OȟO;c 謞1"_ _ y7 y!*Lk - ~A~;ܴ%S-|@zסm<}.*rI&)خmH=9_1/s40!E V4;@tz`ށ4 M%l8.^r>^0ǃJVoޟQ]o4>_4? ;1r]_%Y~w|J 6a} ͥh:C${61` *= -_\ː_a$%wd-Ck4B d!I">!gpyk7CMvceZtfZ>l\3{sfP -Ed̽1h}Xp8ZۄրX0C]PSajT:O˜]0.)˜m m2{ᇇ(? etpX/]>F^s\]yI]h_[Ex4$1JƱtyp=)aq1?1I2]nzGNNgZͫа朁,RRB*-D1պV3$jH^ ka)+=ij+Ɋ£5'WL -S+H`IQ5sw%ɰwɣ}z!Y &HIOi[$Yߔ ~҂; -fÃv!QW*>UR✧Ydy,eMp9_J؛W -gNxp<N춴I`bK3 &ct/#ŖqbK;K?"DQڀI]GvfH嘽Y[=rڵ:GDmw~ޘV7MWw -lڨC5x9){E8ٹOEth !xlf@`}MzEOd(Iq((&e]U+϶wMɮ.4*" -XhWӥm){z@j0HGR*O 5HtPkN@E>ps5$\< қs? Rۀ5ݥa^ㅽ"rJU#1 ΐp[Tp,]Q|چ@"|aPn =KrM`+[8TAI<|<@xщ< -P`fӥ;tM8':^J83m$&?G>m߅fK,dC;kIt4uKUh!eRjpэSg@\X %41l* & 5?j\Q1D-K/k֩()cTD8Ap< Ec鯱'[*:n O- 3iM-bޫFj>J 7UĶl26\U7Y#5HtB`> -n rde]cSVX4JDaުzK=4%WJr1BJ?綒X{&mQ9ѿC(k0ה]B58&^Gc: q~f&b_ ) %L)>cm+މW<Ӛzt'y\إ8t9rh:KO}?w#f7p=o1®hF/H!ض(\B )1mlXէP@.0]AV$@_,'Zҩ|4Bq-GͻVo<< Rݤb|6%ЌҸW,_ԉmR~.?a[㓣>1"Q9D"lb{tAW"Q6C"š CukWUc@˱etB ^`: NܐS|6]ϟt6k9A -iLp{ؤCU Ϯ.l -ePᛞc \6šfٗP1:q.Td:!<\LG`Aj eT95" hDtc[TAk/P) ũD!xVPkJ*)!t|?CHƋ;=a1!]p+JN[%IB =cW];qQS* 3dSOtO.Dh-UGaҺ*,yw{C\h0yGUtl1YP/QTShˋ[RB ؚƌem可Eȑ(swGG*jB7lWe<0*+i?TSBcWx1;kCǕJviq=UC>1no5 -W_=>:W#(&wMGF黹xZwȎuLu4AK!Vv鶴8 -eƲľDUbV>תrX꧕> pgBsy}nlB=xTֵYF5v:r}/O_Z;#NIWRk׌e>InZa}eo+ժ7'Uu]z@O -k$ ^|ȹ+ak6)45cS>sʲHy3hT[4fY56VC;,#bD1?]9؏lvlY6C_pbQ#ݎ M(Su;ڽ4(!uUsSLh^j/kfk慙z4P3{)p&LB|3g)ߨs?v i (3rGrܭCJ %_a瑚7&yTJ4tR@#})cW+-j. -?-X*qp~;[Sd;;<d _͒']Q˰1ZV HƢ9Ye4&Q$utPN<<2P˴XOᙐb\,nޜf#U]N᷄v,Υ90DmV{A&=֒n9h@%p_GkMZGcK=!1!Z=78qq - uQHCu`znitDji#qʿ.k~Z:!IB䕦e- $,2&І&iGTZO2%RhؗВ)f*! u2.cr@wquksEI.|ON=۶tC -Xf,x"Y܈QsM Xt4΍ W6T'=I,Ȇ*8Lt -n~T>5?|aؤbS .iRRY7,ϷIT.[s;&4c~c;.Z%7&j-ipG - ̾j7𼔈cCEScL䴊N9l]glg,ZyTN' -^rn\Ve"LGyLZHs4ըΒFMbƒ8Scxxu3*2Nakm͔6 Ұ +%Ab77&UPv.+Kvn1K5ʵM/Dxg}QUj~Ne}B-ݔi;C3ׯR]<(qX]3iv!),3^7AbNtg4'U4h:j4Ģkn z&b6N37.|6[qmw91j1;BQ"AEhϱ/?,<$/ |$0rBk~V`F?" {+p~~HdY+u4&7/AKYYڃqc %/:"5s}Xac) -O1CWDB95̽QI *n1o -ci7DY_T&,[ r;r -2OnK|K7oe~T|zT/;EܲFY͗]őyB7~{5d噟n͟Kw264Qgo %MЛF/1&xs7{Rӄ #Ԧҫ˯.+*1klݪ+$tӺv]*$K|ql[onXM9VNw??pHyz?s{9yz.쾪ڤ"<5*}/b u:Q]MIpLY}sZ_ٰ|EB6?E_rW:|`fVp̦&4?N-<|qZR!vGR)4uUH1Z )xi,LD||G`HI^o:}|@췞0*sND\u'w^?q\%)n.E4"ɩ]Λe  -_shO{Әjnk*m5, bQd ۀNhS\WBB8&QJc9tӶ/?'CO/G+|ߞh/=',dM*t{&/Pi넕fw,JP^S6 ,_ɁoOԿϑO]\1ã+ϋ RhNSG>TgĀxűkצ5(yR&fj~΢q95O%ACTRVTyM< -4/+Ch@E;Bٯq46:?K%/;S7Nxis:뤣Cʏ7RjkCܣqBվxv'5u>tɢn+n -^WWzo"Br}o;݂x82+Y顉\u1Xq(TQ0}"ͶKgRrK#^T'ChzD[OffDYdK8E/%B1ˋeg6r ,9|rsGٞ^w\'7n;q -iO -B| s6:KH(-4{tb?sl`>YX7HiMN'5+$2*,Bwww;n9yҳ;G2N;ytH3Ldsl]U,RiuF'g nEou? JX( \n@ qQsZD;U米qMR"$ͥ괮^9!jgnۉNh76o5S>S<#& J/Q6aLЮv̜EwC$|5Բ9 -椱ƹ72" b<,,X_vOC%t(~ - -uoHՙr 0 QIht0!F9oֲuT&BɖQ<%V݈($\ooޚB4U1?44,2 q:bx߱YP"V_stU;!H@)jGpE l#od1 IV0BC#}BΰLM.'IǸ|3 -i)bZPjr|n;YM֟;cky u"#82(+ۦ$Cd8F1vQ) 9-nDjvyLO -loM>+A{n39cQԧ-7zެ /1*A- `z&|&}1^,I]˝X׏219C7*gN| \n}NG\|)ifpnId7i.aBN,Vzɕ)>s5O߮/T#hBםnz(ÑS-ΡU% Dta2d>ߣ q,3|*uu0^}bմ9)R`ApRLeO5AUzRg\zn]w]YfBO91;-h_HT!Ws% T4T-\oce_BAV1|zfف([UCC0rKw$ɱ0tV !?iQm&UYH2}E%\@C8Un/iH;60gjzI< -i[0R;.!tA1ȸ`W~ q:XToDZ55~ơau@i=][{ Hjݦ-(616Y>9פwv%g) ӆFf -Xj\(>wM꒭se?.ZPUhGNi 2K}ۇ[H˱EiїCHsF ʆѥ9GOwTjcavCsK9ƛGTG~ݩA(S&~IRqzDˢk@B IR$`½&BKa|N9r5xkDQ䕕( a6ڥE"ris%bv=s[UdDtfڭ$3W^ ]\ \y&O^8C0{%))0*pZd",Ps‷Jd0+6 -m᫠5h^A^ -qiNneu'o(LQf#yHjY55XC̀N .3,LmgKЫ=K/>۝;RrE%ᨠɅZlhȁicP.OI$r(DȁKw35ϋ'tV8/ghl$܋a1nsFwb.^!qսHy<0-nZߐ7Բ{bm΄-4G)($wB=>`) OhGf5cKE6e|hT-]SjF＾F'7>+\ҌC"k5+@s_H5]Ma`R߲ƯoaiCq - LO/WE4 Ъ/=b t  )dV5>"}?$S ="xЃ]oo1 1c9g`boճm/ޒ1veږ'M;ȍh\^u'Tqi>Ԩn dB7&s֟DqF6ޏBwq!17-p}k6/8HXz[D"q^!A|L"s5,x`L=G__{Qh\|۷vZETߠ[J x Z+Л5.}_MÂ4G- m[5lX^W)[Z~h -`sm2t/WLmQ1jBCx"g*܍I0c_iծ:Hu\]=M.YZC^)vcm YKSC%E <ťc̯+ty[Fȣwߩn$aW3j ?،9xyp~1(~{FһRz.xO]qP<^ƲO 8p)sx!mt,, VX`DЙNHWb+3/t -,CNb{I4_RV@gBO38Kjhv&hRؕxw`_$5tRrP~~TH䜳2e '@M~21&o'P{-Sw ~)2k~2 N1-d+S=0bw =\Ϗw)/&Pa"6@Cл3gV4ۧ>stream -8;Yhn>7SFk#igu`GlP,B3^^np[#um^tW3'&uU]94N0I_^lK[ -7W/[/Vc>n8*U`,[/GHaY%Xt"!.EM4$3qGWW!s!Ibd)5~> -endstream endobj 11 0 obj [/Indexed/DeviceRGB 255 12 0 R] endobj 12 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> -endstream endobj 5 0 obj <> endobj 13 0 obj [/View/Design] endobj 14 0 obj <>>> endobj 9 0 obj <> endobj 6 0 obj [5 0 R] endobj 15 0 obj <> endobj xref -0 16 -0000000000 65535 f -0000000016 00000 n -0000000144 00000 n -0000046685 00000 n -0000000000 00000 f -0000065098 00000 n -0000065396 00000 n -0000046736 00000 n -0000047043 00000 n -0000065284 00000 n -0000064217 00000 n -0000064536 00000 n -0000064584 00000 n -0000065168 00000 n -0000065199 00000 n -0000065419 00000 n -trailer -<]>> -startxref -65626 -%%EOF diff --git a/inst/img/civilytics_logo.png b/inst/img/civilytics_logo.png deleted file mode 100644 index ab29a4b..0000000 Binary files a/inst/img/civilytics_logo.png and /dev/null differ diff --git a/inst/img/civilytics_logo_white.png b/inst/img/civilytics_logo_white.png deleted file mode 100644 index 0f9c9c6..0000000 Binary files a/inst/img/civilytics_logo_white.png and /dev/null differ diff --git a/inst/img/favicon.ico b/inst/img/favicon.ico deleted file mode 100644 index f0e564f..0000000 Binary files a/inst/img/favicon.ico and /dev/null differ diff --git a/inst/img/icon-192.png b/inst/img/icon-192.png deleted file mode 100644 index 781ef64..0000000 Binary files a/inst/img/icon-192.png and /dev/null differ diff --git a/inst/img/icon-32.png b/inst/img/icon-32.png deleted file mode 100644 index 696f09a..0000000 Binary files a/inst/img/icon-32.png and /dev/null differ diff --git a/inst/img/icon-512.png b/inst/img/icon-512.png deleted file mode 100644 index db5c2ca..0000000 Binary files a/inst/img/icon-512.png and /dev/null differ diff --git a/inst/img/icon.png b/inst/img/icon.png deleted file mode 100644 index 696f09a..0000000 Binary files a/inst/img/icon.png and /dev/null differ diff --git a/man/civilytics-package.Rd b/man/civilytics-package.Rd index 29400e1..854fdd1 100644 --- a/man/civilytics-package.Rd +++ b/man/civilytics-package.Rd @@ -19,10 +19,5 @@ Useful links: \author{ \strong{Maintainer}: Jared E. Knowles \email{jared@civilytics.com} -Authors: -\itemize{ - \item Jared E. Knowles \email{jared@civilytics.com} -} - } \keyword{internal} diff --git a/man/civilytics_colors.Rd b/man/civilytics_colors.Rd index b1cea73..313911e 100644 --- a/man/civilytics_colors.Rd +++ b/man/civilytics_colors.Rd @@ -1,5 +1,6 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/colors.R +\docType{data} \name{civilytics_colors} \alias{civilytics_colors} \title{Civilytics brand colors} @@ -17,3 +18,4 @@ custom properties defined on www.civilytics.com (`--cv-*` variables). civilytics_colors["accent"] civilytics_colors[c("ink", "paper")] } +\keyword{datasets} diff --git a/man/civilytics_logo.Rd b/man/civilytics_logo.Rd new file mode 100644 index 0000000..26699a8 --- /dev/null +++ b/man/civilytics_logo.Rd @@ -0,0 +1,63 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/logo.R +\name{civilytics_logo} +\alias{civilytics_logo} +\title{Add a Civilytics logo to a ggplot (pipe-friendly)} +\usage{ +civilytics_logo( + plot, + type = c("wordmark", "mark"), + variant = c("light", "dark"), + margin_param = NULL +) +} +\arguments{ +\item{plot}{A ggplot object.} + +\item{type}{Character. `"wordmark"` (default) or `"mark"`. Passed to +[make_logo_grob()].} + +\item{variant}{Character. `"light"` (default) or `"dark"`. Passed to +[make_logo_grob()].} + +\item{margin_param}{Numeric or `NULL`. Manual margin adjustment passed to +[add_logo()].} +} +\value{ +A grob (from [gridExtra::arrangeGrob()]) ready to draw with + [grid::grid.draw()]. +} +\description{ +A convenience wrapper that creates the logo grob and attaches it below the +plot in one call. Designed for use with the base pipe `|>`: +} +\details{ +``` +ggplot(mpg, aes(displ, hwy)) + + geom_point() + + theme_civilytics() |> + civilytics_logo() +``` + +Since `|>` has lower precedence than `+`, the entire ggplot chain is piped +as the first argument — no parentheses needed. +} +\examples{ +\dontrun{ +library(ggplot2); library(grid) + +# Pipe-friendly usage +ggplot(mpg, aes(displ, hwy)) + + geom_point() + + theme_civilytics() |> + civilytics_logo() |> + grid.draw() + +# Dark theme with mark +ggplot(mpg, aes(displ, hwy)) + + geom_point() + + theme_civilytics_dark() |> + civilytics_logo(variant = "dark", type = "mark") |> + grid.draw() +} +} diff --git a/man/make_logo_grob.Rd b/man/make_logo_grob.Rd index 8d57744..848f430 100644 --- a/man/make_logo_grob.Rd +++ b/man/make_logo_grob.Rd @@ -4,22 +4,26 @@ \alias{make_logo_grob} \title{Get a Civilytics Logo grob} \usage{ -make_logo_grob(variant = c("light", "dark")) +make_logo_grob(type = c("wordmark", "mark"), variant = c("light", "dark")) } \arguments{ -\item{variant}{Character. `"light"` (default) uses the standard dark logo -suitable for light backgrounds. `"dark"` uses the white logo suitable for -dark backgrounds (pairs with [theme_civilytics_dark()]).} +\item{type}{Character. `"wordmark"` (default) uses the full wordmark. +`"mark"` uses the compact C-pulse icon only.} + +\item{variant}{Character. `"light"` (default) uses the dark logo for light +backgrounds. `"dark"` uses the reverse (light) logo for dark backgrounds +(pairs with [theme_civilytics_dark()]).} } \value{ A ggplot object (class `"gg"`) containing the logo grob. } \description{ Returns a ggplot object containing the Civilytics logo as a rasterGrob, -ready to compose with plots via [add_logo()] or [add_logo_ga()]. +ready to compose with plots via [add_logo()], [add_logo_ga()], or the +pipe-friendly [civilytics_logo()]. } \examples{ -logo <- make_logo_grob() # light background -logo_dark <- make_logo_grob("dark") # dark background +logo <- make_logo_grob() # wordmark, light +logo <- make_logo_grob("mark", "dark") # mark, dark class(logo) # "gg" "ggplot" } diff --git a/man/plot_jpeg.Rd b/man/plot_jpeg.Rd index 5ad1306..2550ef4 100644 --- a/man/plot_jpeg.Rd +++ b/man/plot_jpeg.Rd @@ -21,6 +21,8 @@ a rasterImage Plot a jpeg image as a raster } \examples{ -img <- system.file("img","civilytics_logo.jpg",package="civilytics") +\dontrun{ +img <- system.file("img","Knowles_Headshot_2019_good.jpg",package="civilytics") plot_jpeg(img) } +} diff --git a/man/theme_civilytics.Rd b/man/theme_civilytics.Rd index 658cd97..7fbe383 100644 --- a/man/theme_civilytics.Rd +++ b/man/theme_civilytics.Rd @@ -64,6 +64,7 @@ automatically via [showtext] when the package is attached. Call [civilytics_load_fonts()] to reload them if needed. } \examples{ +\dontrun{ library(ggplot2) ggplot(mpg, aes(displ, hwy)) + geom_point() + @@ -74,3 +75,4 @@ ggplot(mpg, aes(displ, hwy, colour = class)) + scale_color_civilytics() + theme_civilytics() } +} diff --git a/man/theme_civilytics_dark.Rd b/man/theme_civilytics_dark.Rd index 0dd25b2..9964c31 100644 --- a/man/theme_civilytics_dark.Rd +++ b/man/theme_civilytics_dark.Rd @@ -64,6 +64,7 @@ All parameters from [theme_civilytics()] are accepted and override the dark defaults. } \examples{ +\dontrun{ library(ggplot2) ggplot(mpg, aes(displ, hwy)) + geom_point() + @@ -74,3 +75,4 @@ ggplot(mpg, aes(displ, hwy, colour = class)) + scale_color_civilytics() + theme_civilytics_dark() } +} diff --git a/tests/testthat/test_theme.R b/tests/testthat/test_theme.R index 407d7f9..21de497 100644 --- a/tests/testthat/test_theme.R +++ b/tests/testthat/test_theme.R @@ -160,20 +160,43 @@ test_that("theme_civilytics_dark uses navy for strip background", { # --- make_logo_grob ---------------------------------------------------------- -test_that("make_logo_grob returns a gg object for light variant", { - logo <- make_logo_grob("light") - expect_s3_class(logo, "gg") +test_that("make_logo_grob returns a gg object for all type/variant combos", { + for (type in c("wordmark", "mark")) { + for (variant in c("light", "dark")) { + logo <- make_logo_grob(type = type, variant = variant) + expect_s3_class(logo, "gg") + } + } }) -test_that("make_logo_grob returns a gg object for dark variant", { - logo <- make_logo_grob("dark") - expect_s3_class(logo, "gg") -}) - -test_that("make_logo_grob defaults to light variant", { +test_that("make_logo_grob defaults to wordmark light", { expect_no_error(make_logo_grob()) }) +test_that("make_logo_grob errors on invalid type", { + expect_error(make_logo_grob(type = "banner")) +}) + test_that("make_logo_grob errors on invalid variant", { - expect_error(make_logo_grob("purple")) + expect_error(make_logo_grob(variant = "purple")) +}) + +# --- civilytics_logo (pipe-friendly) ----------------------------------------- + +test_that("civilytics_logo returns a grob", { + p <- ggplot(mpg, aes(displ, hwy)) + geom_point() + theme_civilytics() + result <- suppressWarnings(civilytics_logo(p)) + expect_s3_class(result, "grob") +}) + +test_that("civilytics_logo works with pipe operator", { + p <- ggplot(mpg, aes(displ, hwy)) + geom_point() + theme_civilytics() + result <- suppressWarnings(p |> civilytics_logo()) + expect_s3_class(result, "grob") +}) + +test_that("civilytics_logo accepts type and variant params", { + p <- ggplot(mpg, aes(displ, hwy)) + geom_point() + theme_civilytics_dark() + result <- suppressWarnings(civilytics_logo(p, type = "mark", variant = "dark")) + expect_s3_class(result, "grob") })