From e63b0f07c18b49d272c2f81fc41b0eb0fbd6738c Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Sun, 7 Jul 2024 10:21:38 -0400 Subject: [PATCH 1/4] Update name to `dRacula` --- .gitignore | 1 + DESCRIPTION | 8 +++--- INSTALL.md | 8 +++--- LICENSE | 4 +-- R/{ggDracula-package.R => dRacula-package.R} | 0 R/theme_dracula.R | 2 +- README.md | 21 ++++++++-------- README.qmd | 18 +++++++------- ggDracula.Rproj => dRacula.Rproj | 0 data-raw/create_sticker.R | 4 +-- data-raw/stickers/logo-raw.svg | 16 ++++++------ man/dRacula-package.Rd | 26 ++++++++++++++++++++ man/figures/logo.svg | 16 ++++++------ man/ggDracula-package.Rd | 26 -------------------- man/theme_dracula.Rd | 2 +- tests/testthat.R | 4 +-- 16 files changed, 76 insertions(+), 80 deletions(-) rename R/{ggDracula-package.R => dRacula-package.R} (100%) rename ggDracula.Rproj => dRacula.Rproj (100%) create mode 100644 man/dRacula-package.Rd delete mode 100644 man/ggDracula-package.Rd diff --git a/.gitignore b/.gitignore index 6b123dd..29855c8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .RData .Ruserdata .httr-oauth +/.quarto/ # Ignore snapshots created by testthat and vdiffr _snaps/ diff --git a/DESCRIPTION b/DESCRIPTION index 686795e..ece0fa3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,13 +1,13 @@ -Package: ggDracula +Package: dRacula Title: Dracula theme for R Version: 0.5.4 Authors@R: person("Jordan", "Bradford", email = "jrdnbradford@gmail.com", role = c("aut", "cre")) Maintainer: Jordan Bradford -Description: Provides a Dracula ggplot2 theme and R palette. +Description: All things Dracula theme for R License: MIT + file LICENSE -BugReports: https://github.com/dracula/ggplot2/issues -URL: https://github.com/dracula/ggplot2, https://github.com/dracula, https://draculatheme.com, https://draculatheme.com/ggplot2 +BugReports: https://github.com/dracula/dRacula/issues +URL: https://github.com/dracula/dRacula, https://github.com/dracula, https://draculatheme.com, https://draculatheme.com/dRacula Encoding: UTF-8 RoxygenNote: 7.3.2 Imports: diff --git a/INSTALL.md b/INSTALL.md index f6461eb..e683918 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,11 +1,11 @@ -### [ggplot2](https://github.com/tidyverse/ggplot2) +### [R](https://cran.r-project.org/) -#### Install using `R` +#### Install Install with `R` using [`devtools`](https://github.com/r-lib/devtools): - devtools::install_github("dracula/ggplot2") + devtools::install_github("dracula/dRacula") or [`remotes`](https://github.com/r-lib/remotes): - remotes::install_github("dracula/ggplot2") + remotes::install_github("dracula/dRacula") diff --git a/LICENSE b/LICENSE index 0f9d76e..c8f1264 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,2 @@ -YEAR: 2023 -COPYRIGHT HOLDER: ggDracula authors +YEAR: 2023-2024 +COPYRIGHT HOLDER: dRacula authors diff --git a/R/ggDracula-package.R b/R/dRacula-package.R similarity index 100% rename from R/ggDracula-package.R rename to R/dRacula-package.R diff --git a/R/theme_dracula.R b/R/theme_dracula.R index 2b35569..48ddffb 100644 --- a/R/theme_dracula.R +++ b/R/theme_dracula.R @@ -9,7 +9,7 @@ #' #' # Or set it for the plot in the pipeline: #' library(dplyr) -#' library(ggDracula) +#' library(dRacula) #' library(ggplot2) #' #' mpg %>% diff --git a/README.md b/README.md index 1b6f36e..f584717 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,25 @@ -# {ggDracula} \| Dracula Theme for R +# {dRacula} \| Dracula Theme for R Dracula logo in an R hex sticker -> A dark theme for R, including a -> [ggplot2](https://github.com/tidyverse/ggplot2) theme and palette. +> All things Dracula themed for R ## Install All instructions can be found at -[draculatheme.com/ggplot2](https://draculatheme.com/ggplot2). +[draculatheme.com/R](https://draculatheme.com/R). ``` r -devtools::install_github("dracula/ggplot2") +devtools::install_github("dracula/dRacula") ``` or ``` r -remotes::install_github("dracula/ggplot2") +remotes::install_github("dracula/dRacula") ``` ## Examples @@ -28,7 +27,7 @@ remotes::install_github("dracula/ggplot2") ``` r library(dplyr) library(ggplot2) -# library(ggDracula) +library(dRacula) set.seed(1) ggplot(data.frame(x = rnorm(10000), y = rnorm(10000)), aes(x = x, y = y)) + @@ -42,7 +41,7 @@ ggplot(data.frame(x = rnorm(10000), y = rnorm(10000)), aes(x = x, y = y)) + ``` r library(dplyr) library(ggplot2) -library(ggDracula) +library(dRacula) lm <- lm(mpg ~ wt, data = mtcars) @@ -61,7 +60,7 @@ ggplot(mtcars %>% mutate(resid = abs(resid(lm)), fitted = fitted(lm))) + This theme is maintained by the following person(s) and a bunch of [awesome -contributors](https://github.com/dracula/ggplot2/graphs/contributors). +contributors](https://github.com/dracula/dRacula/graphs/contributors). | [![Jordan Bradford](https://github.com/jrdnbradford.png?size=100)](https://github.com/jrdnbradford) | |----| @@ -69,8 +68,8 @@ contributors](https://github.com/dracula/ggplot2/graphs/contributors). ## Community -- [Twitter](https://twitter.com/draculatheme) - Best for getting updates - about themes and new stuff. +- [X](https://x.com/draculatheme) - Best for getting updates about + themes and new stuff. - [GitHub](https://github.com/dracula/dracula-theme/discussions) - Best for asking questions and discussing issues. - [Discord](https://draculatheme.com/discord-invite) - Best for hanging diff --git a/README.qmd b/README.qmd index c97519e..c78ede0 100644 --- a/README.qmd +++ b/README.qmd @@ -1,5 +1,5 @@ --- -title: "{ggDracula} | Dracula Theme for R" +title: "{dRacula} | Dracula Theme for R" format: gfm --- @@ -16,7 +16,7 @@ knitr::opts_chunk$set( Dracula logo in an R hex sticker -> A dark theme for R, including a [ggplot2](https://github.com/tidyverse/ggplot2) theme and palette. +> All things Dracula themed for R ## Install @@ -24,13 +24,13 @@ knitr::opts_chunk$set( devtools::load_all() ``` -All instructions can be found at [draculatheme.com/ggplot2](https://draculatheme.com/ggplot2). +All instructions can be found at [draculatheme.com/R](https://draculatheme.com/R). ```{R devtools-install, echo=TRUE, eval=FALSE, output=FALSE} -devtools::install_github("dracula/ggplot2") +devtools::install_github("dracula/dRacula") ``` or ```{R remotes-install, echo=TRUE, eval=FALSE, output=FALSE} -remotes::install_github("dracula/ggplot2") +remotes::install_github("dracula/dRacula") ``` ## Examples @@ -41,7 +41,7 @@ remotes::install_github("dracula/ggplot2") #| dpi: 150 library(dplyr) library(ggplot2) -# library(ggDracula) +library(dRacula) set.seed(1) ggplot(data.frame(x = rnorm(10000), y = rnorm(10000)), aes(x = x, y = y)) + @@ -57,7 +57,7 @@ ggplot(data.frame(x = rnorm(10000), y = rnorm(10000)), aes(x = x, y = y)) + #| dpi: 150 library(dplyr) library(ggplot2) -library(ggDracula) +library(dRacula) lm <- lm(mpg ~ wt, data = mtcars) @@ -73,7 +73,7 @@ ggplot(mtcars %>% mutate(resid = abs(resid(lm)), fitted = fitted(lm))) + ## Team -This theme is maintained by the following person(s) and a bunch of [awesome contributors](https://github.com/dracula/ggplot2/graphs/contributors). +This theme is maintained by the following person(s) and a bunch of [awesome contributors](https://github.com/dracula/dRacula/graphs/contributors). | [![Jordan Bradford](https://github.com/jrdnbradford.png?size=100)](https://github.com/jrdnbradford) | | --------------------------------------------------------------------------------------------------- | @@ -81,7 +81,7 @@ This theme is maintained by the following person(s) and a bunch of [awesome cont ## Community -- [Twitter](https://twitter.com/draculatheme) - Best for getting updates about themes and new stuff. +- [X](https://x.com/draculatheme) - Best for getting updates about themes and new stuff. - [GitHub](https://github.com/dracula/dracula-theme/discussions) - Best for asking questions and discussing issues. - [Discord](https://draculatheme.com/discord-invite) - Best for hanging out with the community. diff --git a/ggDracula.Rproj b/dRacula.Rproj similarity index 100% rename from ggDracula.Rproj rename to dRacula.Rproj diff --git a/data-raw/create_sticker.R b/data-raw/create_sticker.R index 844c0e6..c1432db 100644 --- a/data-raw/create_sticker.R +++ b/data-raw/create_sticker.R @@ -6,7 +6,7 @@ download.file(dracula_url, signature_dest_path) hexSticker::sticker( signature_dest_path, - package = "ggDracula", + package = "dRacula", spotlight = FALSE, h_size = 1.5, h_color = "black", @@ -20,7 +20,7 @@ hexSticker::sticker( u_y = 0.1, u_color = "black", filename = raw_log_path, - dpi: 600 + dpi = 600 ) usethis::use_logo(raw_log_path) diff --git a/data-raw/stickers/logo-raw.svg b/data-raw/stickers/logo-raw.svg index d1f07e6..37a5aca 100644 --- a/data-raw/stickers/logo-raw.svg +++ b/data-raw/stickers/logo-raw.svg @@ -42,15 +42,13 @@ - - - - - - - - - + + + + + + + diff --git a/man/dRacula-package.Rd b/man/dRacula-package.Rd new file mode 100644 index 0000000..fdacd93 --- /dev/null +++ b/man/dRacula-package.Rd @@ -0,0 +1,26 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/dRacula-package.R +\docType{package} +\name{dRacula-package} +\alias{dRacula} +\alias{dRacula-package} +\title{dRacula: Dracula theme for R} +\description{ +All things Dracula theme for R +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/dracula/dRacula} + \item \url{https://github.com/dracula} + \item \url{https://draculatheme.com} + \item \url{https://draculatheme.com/dRacula} + \item Report bugs at \url{https://github.com/dracula/dRacula/issues} +} + +} +\author{ +\strong{Maintainer}: Jordan Bradford \email{jrdnbradford@gmail.com} + +} +\keyword{internal} diff --git a/man/figures/logo.svg b/man/figures/logo.svg index d1f07e6..37a5aca 100644 --- a/man/figures/logo.svg +++ b/man/figures/logo.svg @@ -42,15 +42,13 @@ - - - - - - - - - + + + + + + + diff --git a/man/ggDracula-package.Rd b/man/ggDracula-package.Rd deleted file mode 100644 index f3b5cd8..0000000 --- a/man/ggDracula-package.Rd +++ /dev/null @@ -1,26 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/ggDracula-package.R -\docType{package} -\name{ggDracula-package} -\alias{ggDracula} -\alias{ggDracula-package} -\title{ggDracula: Dracula Palettes and ggplot2 Theme} -\description{ -Provides a Dracula ggplot2 theme and palette. -} -\seealso{ -Useful links: -\itemize{ - \item \url{https://github.com/dracula/ggplot2} - \item \url{https://github.com/dracula} - \item \url{https://draculatheme.com} - \item \url{https://draculatheme.com/ggplot2} - \item Report bugs at \url{https://github.com/dracula/ggplot2/issues} -} - -} -\author{ -\strong{Maintainer}: Jordan Bradford \email{jrdnbradford@gmail.com} - -} -\keyword{internal} diff --git a/man/theme_dracula.Rd b/man/theme_dracula.Rd index b9c9581..c4273a6 100644 --- a/man/theme_dracula.Rd +++ b/man/theme_dracula.Rd @@ -16,7 +16,7 @@ theme_set(theme_dracula()) # Or set it for the plot in the pipeline: library(dplyr) -library(ggDracula) +library(dRacula) library(ggplot2) mpg \%>\% diff --git a/tests/testthat.R b/tests/testthat.R index 8726c61..2b9f8ec 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -7,6 +7,6 @@ # * https://testthat.r-lib.org/reference/test_package.html#special-files library(testthat) -library(ggDracula) +library(dRacula) -test_check("ggDracula") +test_check("dRacula") From 2e126bc16ef44bc7238c46a055c901ed1561973d Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Sun, 7 Jul 2024 13:10:57 -0400 Subject: [PATCH 2/4] R-CMD-check fixes --- .Rbuildignore | 1 + DESCRIPTION | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.Rbuildignore b/.Rbuildignore index 2c3fd0c..77a4096 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -2,6 +2,7 @@ ^\.Rproj\.user$ ^INSTALL\.md$ ^README\.qmd$ +^README_files$ ^screenshot\.png$ ^data-raw$ ^.lintr$ diff --git a/DESCRIPTION b/DESCRIPTION index ece0fa3..d44f509 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,7 +4,7 @@ Version: 0.5.4 Authors@R: person("Jordan", "Bradford", email = "jrdnbradford@gmail.com", role = c("aut", "cre")) Maintainer: Jordan Bradford -Description: All things Dracula theme for R +Description: Dracula theme for all things R. License: MIT + file LICENSE BugReports: https://github.com/dracula/dRacula/issues URL: https://github.com/dracula/dRacula, https://github.com/dracula, https://draculatheme.com, https://draculatheme.com/dRacula From 5a2de9fcb7047aa0f830d554f24fe81b7bed0e8d Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Sun, 7 Jul 2024 21:06:04 -0400 Subject: [PATCH 3/4] Update package docs --- man/dRacula-package.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/dRacula-package.Rd b/man/dRacula-package.Rd index fdacd93..2da7a45 100644 --- a/man/dRacula-package.Rd +++ b/man/dRacula-package.Rd @@ -6,7 +6,7 @@ \alias{dRacula-package} \title{dRacula: Dracula theme for R} \description{ -All things Dracula theme for R +Dracula theme for all things R. } \seealso{ Useful links: From 4d8bf252a6f8baa2d07d25715482a8070d749cb4 Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:07:09 -0400 Subject: [PATCH 4/4] Update title heading --- README.md | 3 +-- README.qmd | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f584717..2c71b9e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ -# {dRacula} \| Dracula Theme for R -Dracula logo in an R hex sticker +# {`dRacula`} \| Dracula Theme for R Dracula logo in an R hex sticker > All things Dracula themed for R diff --git a/README.qmd b/README.qmd index c78ede0..0764ebf 100644 --- a/README.qmd +++ b/README.qmd @@ -1,5 +1,4 @@ --- -title: "{dRacula} | Dracula Theme for R" format: gfm --- @@ -14,7 +13,7 @@ knitr::opts_chunk$set( ) ``` -Dracula logo in an R hex sticker +# {`dRacula`} | Dracula Theme for R Dracula logo in an R hex sticker > All things Dracula themed for R