Skip to content

Commit 766ae6e

Browse files
MoohanMoohan
authored
Merge branch 'master' into 15-update-readme
2 parents 60b7413 + a199d24 commit 766ae6e

23 files changed

Lines changed: 292 additions & 229 deletions

‎.github/dependabot.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
# Maintain dependencies for GitHub Actions
9+
- package-ecosystem: "github-actions" # See documentation for possible values
10+
directory: "/" # Location of package manifests
11+
schedule:
12+
interval: "weekly"
13+
day: "sunday"
14+
assignees:
15+
- "Tina815"
16+
reviewers:
17+
- "Tina815"

‎.github/workflows/phs_package_checks.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
on:
2+
push:
3+
branches: [main, master]
4+
pull_request:
5+
workflow_dispatch:
6+
7+
name: phs_package_checks.yaml
8+
9+
permissions:
10+
contents: read
11+
pull-requests: read
12+
statuses: read
13+
14+
jobs:
15+
PHS-checks:
16+
uses: Public-Health-Scotland/actions/.github/workflows/phs_package_checks.yaml@v2.5.0
17+
permissions:
18+
contents: write
19+
pull-requests: write
20+
statuses: write
21+
secrets: inherit

‎.github/workflows/pkgdown.yaml‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎.github/workflows/render-rmarkdown.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1414
steps:
1515
- name: Checkout repo
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v6
1717

1818
- name: Setup R
1919
uses: r-lib/actions/setup-r@v2
@@ -32,6 +32,6 @@ jobs:
3232
run: Rscript -e 'rmarkdown::render("README.Rmd")'
3333

3434
- name: Commit the results
35-
uses: stefanzweifel/git-auto-commit-action@v4
35+
uses: stefanzweifel/git-auto-commit-action@v7
3636
with:
3737
commit_message: Render `README.md` after changes to the `.Rmd` version (GitHub action)

‎DESCRIPTION‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
Package: phsstyles
22
Title: Standard Graphic Styles for use in Public Health Scotland
3-
Version: 0.1.2
3+
Version: 0.2.0
44
Authors@R: c(
5-
person("Tina", "Fu", email = "Yuyan.Fu2@phs.scot", role = c("aut", "cre")),
6-
person("Bob", "Taylor", email = "bob.taylor2@phs.scot", role = "aut")
7-
)
8-
Description: Bespoke functions for creating graphics and visualisations in Public Health Scotland.
5+
person("Tina", "Fu", , "Yuyan.Fu2@phs.scot", role = c("aut", "cre")),
6+
person("Bob", "Taylor", , "bob.taylor2@phs.scot", role = "aut"),
7+
person("Jason", "McGlasson", , "Jason.Mcglasson2@phs.scot", role = "aut")
8+
)
9+
Description: Bespoke functions for creating graphics and visualisations in
10+
Public Health Scotland.
911
License: MIT + file LICENSE
10-
URL: https://github.com/Public-Health-Scotland/phsstyles, https://public-health-scotland.github.io/phsstyles/
12+
URL: https://github.com/Public-Health-Scotland/phsstyles,
13+
https://public-health-scotland.github.io/phsstyles/
1114
BugReports: https://github.com/Public-Health-Scotland/phsstyles/issues
1215
Depends:
1316
R (>= 2.10)
1417
Imports:
15-
ggplot2,
18+
ggplot2,
1619
scales
1720
Suggests:
1821
testthat (>= 3.0.0)
22+
Config/roxygen2/version: 8.0.0
23+
Config/testthat/edition: 3
1924
Encoding: UTF-8
2025
Roxygen: list(markdown = TRUE)
21-
RoxygenNote: 7.3.3
22-
Config/testthat/edition: 3

‎NEWS.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# phsstyles 0.2.0 (2026-05-05)
2+
3+
- New colour palettes have been added based on the
4+
[2025 Accessibility Guidance](https://spark.publichealthscotland.org/media/2926/accessibility-guidance-may-2025-v13.pdf).
5+
They are named as `categories`, `categories-large`, `rag` and `rag-large`
6+
([#18](https://github.com/Public-Health-Scotland/phsstyles/issues/18)).
7+
18
# phsstyles 0.1.2 (2024-08-06)
29

310
- Exported `phs_colour_values`, `phs_palettes` and `phs_palette_types`.

‎R/phs_colours.R‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
#' phs_colours()
1818
#'
1919
#' @export
20-
phs_colours <- function(colourname = NULL, keep_names = FALSE){
21-
20+
phs_colours <- function(colourname = NULL, keep_names = FALSE) {
2221
if (is.null(colourname)) {
2322
phs_colour_values
2423
} else if (any(!colourname %in% names(phs_colour_values))) {
25-
col_not_list <- colourname[!colourname %in% names(phs_colour_values)]
26-
msg <- paste("These colours are not available:",
27-
paste(col_not_list, collapse = ','),
28-
"\nPlease run phs_colours() to see all the available colours"
29-
)
30-
stop(msg)
24+
col_not_list <- colourname[!colourname %in% names(phs_colour_values)]
25+
msg <- paste(
26+
"These colours are not available:",
27+
paste(col_not_list, collapse = ","),
28+
"\nPlease run phs_colours() to see all the available colours"
29+
)
30+
stop(msg)
3131
} else if (!keep_names) {
32-
unname(phs_colour_values[colourname])
32+
unname(phs_colour_values[colourname])
3333
} else {
34-
phs_colour_values[colourname]
34+
phs_colour_values[colourname]
3535
}
3636
}
3737

‎R/phs_data.R‎

Lines changed: 114 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -117,82 +117,129 @@ phs_colour_values <- c(
117117
"phs-green-provisional" = "#3A9948",
118118
"phs-green-rag" = "#005D30",
119119
"phs-blue-rag" = "#5DA9DD"
120-
)
120+
)
121121

122122
#' @rdname phs_data
123123
#' @format `phs_colour_palettes` - A `list` of PHS colours grouped into palettes.
124124
#' @export
125125
phs_palettes <- list(
126-
"main" = phs_colours(c("phs-purple", "phs-magenta",
127-
"phs-blue", "phs-green"), keep_names = TRUE),
128-
"supporting" = phs_colours(c("phs-graphite", "phs-teal",
129-
"phs-liberty", "phs-rust"),
130-
keep_names = TRUE),
131-
"all" = phs_colours(c("phs-purple", "phs-magenta",
132-
"phs-blue", "phs-green",
133-
"phs-graphite", "phs-teal",
134-
"phs-liberty", "phs-rust"), keep_names = TRUE),
135-
"main-purples" = phs_colours(c("phs-purple", "phs-purple-80",
136-
"phs-purple-50", "phs-purple-30",
137-
"phs-purple-10"), keep_names = TRUE),
138-
"main-magentas" = phs_colours(c("phs-magenta", "phs-magenta-80",
139-
"phs-magenta-50", "phs-magenta-30",
140-
"phs-magenta-10"),
141-
keep_names = TRUE),
142-
"main-blues" = phs_colours(c("phs-blue", "phs-blue-80",
143-
"phs-blue-50", "phs-blue-30",
144-
"phs-blue-10"), keep_names = TRUE),
145-
"main-greens" = phs_colours(c("phs-green", "phs-green-80",
146-
"phs-green-50", "phs-green-30",
147-
"phs-green-10"), keep_names = TRUE),
148-
"supporting-graphites" = phs_colours(c("phs-graphite",
149-
"phs-graphite-80",
150-
"phs-graphite-50",
151-
"phs-graphite-30",
152-
"phs-graphite-10"),
153-
keep_names = TRUE),
154-
"supporting-teals" = phs_colours(c("phs-teal", "phs-teal-80",
155-
"phs-teal-50", "phs-teal-30",
156-
"phs-teal-10"),
157-
keep_names = TRUE),
158-
"supporting-liberties" = phs_colours(c("phs-liberty",
159-
"phs-liberty-80",
160-
"phs-liberty-50",
161-
"phs-liberty-30",
162-
"phs-liberty-10"),
163-
keep_names = TRUE),
164-
"supporting-rusts" = phs_colours(c("phs-rust", "phs-rust-80",
165-
"phs-rust-50", "phs-rust-30",
166-
"phs-rust-10"),
167-
keep_names = TRUE),
168-
"categories" = phs_colours(c("phs-dark-blue", "phs-turquoise", "phs-pink",
169-
"phs-orange", "phs-dark-purple", "phs-light-blue",
170-
"phs-grey", "phs-light-purple"),
171-
keep_names = TRUE),
172-
"categories-large" = phs_colours(c("phs-dark-blue", "phs-dark-blue-tint",
173-
"phs-turquoise", "phs-turquoise-tint",
174-
"phs-pink", "phs-pink-tint",
175-
"phs-orange", "phs-orange-tint",
176-
"phs-grey", "phs-grey-tint",
177-
"phs-light-blue", "phs-light-blue-tint",
178-
"phs-dark-purple", "phs-light-purple"),
179-
keep_names = TRUE),
126+
"main" = phs_colours(c(
127+
"phs-purple", "phs-magenta",
128+
"phs-blue", "phs-green"
129+
), keep_names = TRUE),
130+
"supporting" = phs_colours(
131+
c(
132+
"phs-graphite", "phs-teal",
133+
"phs-liberty", "phs-rust"
134+
),
135+
keep_names = TRUE
136+
),
137+
"all" = phs_colours(c(
138+
"phs-purple", "phs-magenta",
139+
"phs-blue", "phs-green",
140+
"phs-graphite", "phs-teal",
141+
"phs-liberty", "phs-rust"
142+
), keep_names = TRUE),
143+
"main-purples" = phs_colours(c(
144+
"phs-purple", "phs-purple-80",
145+
"phs-purple-50", "phs-purple-30",
146+
"phs-purple-10"
147+
), keep_names = TRUE),
148+
"main-magentas" = phs_colours(
149+
c(
150+
"phs-magenta", "phs-magenta-80",
151+
"phs-magenta-50", "phs-magenta-30",
152+
"phs-magenta-10"
153+
),
154+
keep_names = TRUE
155+
),
156+
"main-blues" = phs_colours(c(
157+
"phs-blue", "phs-blue-80",
158+
"phs-blue-50", "phs-blue-30",
159+
"phs-blue-10"
160+
), keep_names = TRUE),
161+
"main-greens" = phs_colours(c(
162+
"phs-green", "phs-green-80",
163+
"phs-green-50", "phs-green-30",
164+
"phs-green-10"
165+
), keep_names = TRUE),
166+
"supporting-graphites" = phs_colours(
167+
c(
168+
"phs-graphite",
169+
"phs-graphite-80",
170+
"phs-graphite-50",
171+
"phs-graphite-30",
172+
"phs-graphite-10"
173+
),
174+
keep_names = TRUE
175+
),
176+
"supporting-teals" = phs_colours(
177+
c(
178+
"phs-teal", "phs-teal-80",
179+
"phs-teal-50", "phs-teal-30",
180+
"phs-teal-10"
181+
),
182+
keep_names = TRUE
183+
),
184+
"supporting-liberties" = phs_colours(
185+
c(
186+
"phs-liberty",
187+
"phs-liberty-80",
188+
"phs-liberty-50",
189+
"phs-liberty-30",
190+
"phs-liberty-10"
191+
),
192+
keep_names = TRUE
193+
),
194+
"supporting-rusts" = phs_colours(
195+
c(
196+
"phs-rust", "phs-rust-80",
197+
"phs-rust-50", "phs-rust-30",
198+
"phs-rust-10"
199+
),
200+
keep_names = TRUE
201+
),
202+
"categories" = phs_colours(
203+
c(
204+
"phs-dark-blue", "phs-turquoise", "phs-pink",
205+
"phs-orange", "phs-dark-purple", "phs-light-blue",
206+
"phs-grey", "phs-light-purple"
207+
),
208+
keep_names = TRUE
209+
),
210+
"categories-large" = phs_colours(
211+
c(
212+
"phs-dark-blue", "phs-dark-blue-tint",
213+
"phs-turquoise", "phs-turquoise-tint",
214+
"phs-pink", "phs-pink-tint",
215+
"phs-orange", "phs-orange-tint",
216+
"phs-grey", "phs-grey-tint",
217+
"phs-light-blue", "phs-light-blue-tint",
218+
"phs-dark-purple", "phs-light-purple"
219+
),
220+
keep_names = TRUE
221+
),
180222
"rag" = phs_colours(c("phs-red", "phs-amber", "phs-green-rag"),
181-
keep_names = TRUE),
182-
"rag-large" = phs_colours(c("phs-red",
183-
"phs-amber-provisional","phs-amber",
184-
"phs-green-provisional","phs-green-rag",
185-
"phs-blue-rag"), keep_names = TRUE)
186-
)
223+
keep_names = TRUE
224+
),
225+
"rag-large" = phs_colours(c(
226+
"phs-red",
227+
"phs-amber-provisional", "phs-amber",
228+
"phs-green-provisional", "phs-green-rag",
229+
"phs-blue-rag"
230+
), keep_names = TRUE)
231+
)
187232

188233
#' @rdname phs_data
189234
#' @format `phs_palette_types` - A `list` of PHS palettes grouped into palette types.
190235
#' @export
191236
phs_palette_types <- list(
192237
qual = c("main", "supporting", "all"),
193-
seq = c("main-purples", "main-magentas",
194-
"main-blues", "main-greens",
195-
"supporting-graphites", "supporting-teals",
196-
"supporting-liberties", "supporting-rusts",
197-
"categories", "categories-large", "rag", "rag-large"))
198-
238+
seq = c(
239+
"main-purples", "main-magentas",
240+
"main-blues", "main-greens",
241+
"supporting-graphites", "supporting-teals",
242+
"supporting-liberties", "supporting-rusts",
243+
"categories", "categories-large", "rag", "rag-large"
244+
)
245+
)

‎R/phs_pal.R‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ phs_pal <- function(type = "seq", palette = 1, direction = 1,
88
if (direction == -1) {
99
pal <- rev(pal)
1010
}
11-
if(colour_names == TRUE){
11+
if (colour_names == TRUE) {
1212
pal
13-
}
14-
else{
13+
} else {
1514
as.vector(pal)
1615
}
1716
}

0 commit comments

Comments
 (0)