diff --git a/DESCRIPTION b/DESCRIPTION
index 19c4c17..5a20b7f 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
Package: DisplayR
Title: Functions for visualising data
-Version: 0.1
+Version: 0.1.1
Authors@R:
c(person("Jack", "Penzer", , "jack.penzer@sharecreative.com", role = c("aut", "cre"),
comment = c(ORCID = "Capture Intelligence")),
@@ -43,6 +43,6 @@ Suggests:
VignetteBuilder: knitr
Config/testthat/edition: 3
Depends:
- R (>= 3.20)
+ R (>= 4.4.0)
LazyData: true
Language: en-GB
diff --git a/NEWS.md b/NEWS.md
index f72e874..e40a327 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,11 @@
# DisplayR (development version)
+# DisplayR 0.1.1
+
+- Add the 'samyds' brand to brands
+- Update some functions in line with ggplot updates
+- Remove gghalves dependency due to ggplot changes
+
# DisplayR 0.1.0
- Added montserrat and source-sans-pro fonts to package installation
diff --git a/README.Rmd b/README.Rmd
index 17d0339..9a1592e 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -15,18 +15,18 @@ knitr::opts_chunk$set(
# DisplayR
+---
+
[](https://github.com/jpcompartir/DisplayR/actions/workflows/R-CMD-check.yaml)
[](https://github.com/jpcompartir/DisplayR/actions/workflows/pkgdown.yaml)
-
-[](https://codecov.io/gh/jpcompartir/DisplayR)
-
+---
-DisplayR is Capture Intelligence's comprehensive package for data visualization, offering a wide array of functions tailored to meet various data visualization needs. This versatile package aims to improve data presentation and communication by providing visually engaging and informative graphics.
+DisplayR is SAMY Data Science's comprehensive package for data visualisation, offering a wide array of functions tailored to meet various data visualisation needs. This versatile package aims to improve data presentation and communication by providing visually engaging and informative graphics.
-The package caters to a diverse set of visualization requirements, including static and interactive data visualization, tables, and seamless PowerPoint integration with R. DisplayR streamlines the process of creating and customizing charts and plots, enabling users to efficiently produce visuals that effectively convey the insights and patterns hidden within their data.
+The package caters to a diverse set of visualisation requirements, including static and interactive data visualisation, tables, and seamless PowerPoint integration with R. DisplayR streamlines the process of creating and customising charts and plots, enabling users to efficiently produce visuals that effectively convey the insights and patterns hidden within their data.
## Installation
@@ -37,4 +37,6 @@ You can install the development version of DisplayR from [GitHub](https://github
devtools::install_github("jpcompartir/DisplayR")
```
+---
+
diff --git a/README.md b/README.md
index cb2adf8..f6db412 100644
--- a/README.md
+++ b/README.md
@@ -3,19 +3,21 @@
# DisplayR
+------------------------------------------------------------------------
+
[](https://github.com/jpcompartir/DisplayR/actions/workflows/R-CMD-check.yaml)
[](https://github.com/jpcompartir/DisplayR/actions/workflows/pkgdown.yaml)
-
-[](https://codecov.io/gh/jpcompartir/DisplayR)
-
+------------------------------------------------------------------------
-DisplayR is Capture Intelligence’s package for data
+DisplayR is SAMY Data Science’s comprehensive package for data
visualisation, offering a wide array of functions tailored to meet
-various data visualisation needs.
+various data visualisation needs. This versatile package aims to improve
+data presentation and communication by providing visually engaging and
+informative graphics.
The package caters to a diverse set of visualisation requirements,
including static and interactive data visualisation, tables, and
@@ -33,3 +35,7 @@ You can install the development version of DisplayR from
# install.packages("devtools")
devtools::install_github("jpcompartir/DisplayR")
```
+
+------------------------------------------------------------------------
+
+
diff --git a/_pkgdown.yml b/_pkgdown.yml
index ea0b8cd..a94bfdf 100644
--- a/_pkgdown.yml
+++ b/_pkgdown.yml
@@ -1,16 +1,69 @@
+url: https://jpcompartir.github.io/DisplayR/
+
template:
bootstrap: 5
- params:
- bootswatch: "cosmo"
- hljs:
- style: "tango"
- toc: true
- toc_depth: 3
+ favicon: man/figures/samy_logo_small.png
+ bslib:
+ # SAMY Brand Colours
+ bg: "#F5F5F4"
+ fg: "#2C2E35"
+ primary: "#B5651D"
+ secondary: "#D4A574"
+ success: "#7C9885"
+ info: "#5B7C99"
+ warning: "#D4A574"
+ danger: "#8B5A6F"
+
+ # Typography
+ base_font:
+ google: "Lato"
+ heading_font:
+ google: "Merriweather"
+ code_font:
+ google: "Fira Code"
+
+ # Component Styling
+ navbar-bg: "#2C2E35"
+ code-bg: "#FDFDFD"
+ code-color: "#5B7C99"
navbar:
+ bg: dark
+ structure:
+ left: [intro, reference, articles, news]
+ right: [search, github]
+ components:
+ intro:
+ text: Get Started
+ href: articles/plotting_theme_functions.html
+ reference:
+ text: Reference
+ href: reference/index.html
+ articles:
+ text: Articles
+ menu:
+ - text: All vignettes
+ - text: Plotting & Theme Functions
+ href: articles/plotting_theme_functions.html
+ - text: Charts for PowerPoint
+ href: articles/powerpoint.html
+ - text: Creating Beautiful Tables
+ href: articles/tables.html
+ news:
+ text: Changelog
+ href: news/index.html
+
+footer:
structure:
- left: [home, reference, articles]
- right: [github]
+ left: developed_by
+ right: built_with
+
+home:
+ sidebar:
+ structure: [links, license, community, citation, authors, dev]
+ links:
+ - text: Report an issue
+ href: https://github.com/jpcompartir/DisplayR/issues
reference:
- title: "Plotting in R - ggplot2"
@@ -54,7 +107,12 @@ repo:
home: https://github.com/jpcompartir/DisplayR
source: https://github.com/jpcompartir/DisplayR/tree/main
-home:
- links:
- - text: Report an issue
- href: https://github.com/jpcompartir/DisplayR/issues
+development:
+ mode: auto
+
+news:
+ releases:
+ - text: "Version 0.1.1"
+ href: news/index.html#displayr-011
+ - text: "Version 0.1.0"
+ href: news/index.html#displayr-010
diff --git a/inst/brands/samyds/_brand.yml b/inst/brands/samyds/_brand.yml
index 73176a1..2f8550f 100644
--- a/inst/brands/samyds/_brand.yml
+++ b/inst/brands/samyds/_brand.yml
@@ -1,41 +1,74 @@
+# Quarto does nothing with meta values (LOL love that for us) but including here incase it's useful going forward.
+# Feel free to remove
+meta:
+ name: SAMY
+ links:
+ home: https://samy.com/
+
color:
palette:
- samy-nero-black: "#232323"
- samy-inferno: "#FF5D17"
- samy-peach: "#F7AB81"
- samy-turquoise: "#1C7E76"
- samy-crimson: "#B80F0A"
- samy-blue: "#191970"
- samy-bg: "#F7F7F7"
- samy-green: "#028A0F"
- primary: samy-peach
- background: samy-bg
- foreground: samy-nero-black
- secondary: samy-nero-black
- danger: samy-crimson
+ ink: "#2C2E35"
+ cloud: "#E8E9EB"
+ pearl: "#F5F5F4"
+ snow: "#FDFDFD"
+ cognac: "#B5651D"
+ honey: "#D4A574"
+ sage: "#7C9885"
+ ocean: "#5B7C99"
+ wine: "#8B5A6F"
+
+ foreground: ink
+ background: pearl
+ primary: cognac
+ secondary: cognac
+ tertiary: cloud
+ success: sage
+ info: ocean
+ warning: honey
+ danger: wine
typography:
fonts:
- - family: Helvetica
- source: system
+ - family: Lato
+ source: google
+ weight: [300, 400, 600, 700]
+ style: normal
+ - family: Lato
+ source: google
+ weight: [300, 400, 600, 700]
+ style: italic
+ - family: Merriweather
+ source: google
+ weight: [300, 400, 600, 700]
+ style: normal
+
base:
- family: Helvetica
+ family: Lato
weight: 300
+
headings:
- family: Helvetica
- weight: 400
- color: samy-nero-black
- link:
- color: samy-nero-black
- decoration: underline
+ family: Merriweather
+ weight: 600
+ style: normal
+ color: ink
monospace:
- background-color: white
+ family: Monaco
+ size: 0.9em
+
monospace-inline:
- color: samy-inferno
- background-color: white
+ color: ocean
+ background-color: pearl
+
monospace-block:
- background-color: white
+ color: ink
+ background-color: snow
+ line-height: 1.2
+
+ link:
+ weight: 400
+ color: ink
+ decoration: underline
logo:
small: samy_isotype.png
diff --git a/man/figures/samy_banner.png b/man/figures/samy_banner.png
new file mode 100644
index 0000000..9418f7c
Binary files /dev/null and b/man/figures/samy_banner.png differ
diff --git a/man/figures/samy_logo_small.png b/man/figures/samy_logo_small.png
new file mode 100644
index 0000000..4f8a3ba
Binary files /dev/null and b/man/figures/samy_logo_small.png differ