gt & cleanup

Author: gordonwoodhull

DESCRIPTION

@@ -31,6 +31,7 @@ Suggests:
     curl,
     flextable,
     ggplot2,
+    gt,
     knitr,
     rsconnect (>= 0.8.26),
     testthat (>= 3.1.7),

R/theme.R

@@ -1,14 +1,47 @@
+#' Create a flextable theme using background and foreground colors
+#'
+#' Create a flextable theme that uses the specified background and
+#' foreground colors.
+#'
+#' @param bg The background color
+#' @param fg The foreground color
+#'
+#' @export
+flextable_theme_colors <- function(bg, fg) {
+  (function(x) {
+    if (!inherits(x, "flextable")) {
+      stop("flextable_theme_colors only supports flextable objects.")
+    }
+    x <- flextable::bg(x, bg = bg, part = "all")
+    x <- flextable::color(x, color = fg, part = "all")
+    flextable::autofit(x)
+  })
+}
+
+#' Create a flextable theme from a brand.yml file
+#'
+#' Create a flextable theme that uses colors from the brand file.
+#'
+#' @param brand_yml The path to the brand.yml file
+#'
+#' @export
+flextable_theme_brand <- function(brand_yml) {
+  brand <- yaml::yaml.load_file(brand_yml)
+  flextable_theme_colors(brand$color$background, brand$color$foreground)
+}
+
+
 #' Create a ggplot2 theme using background and foreground colors
 #'
 #' Create a ggplot2 theme that uses the specified background and
 #' foreground colors.
 #'
-#' @param bgcolor The background color
-#' @param fgcolor The foreground color
+#' @param bg The background color
+#' @param fg The foreground color
 #'
 #' @export
-ggplot_theme_colors <- function(bgcolor, fgcolor) {
-  if(!requireNamespace("ggplot2", quietly = TRUE)) {
+ggplot_theme_colors <- function(bg, fg) {
+  if (!requireNamespace("ggplot2", quietly = TRUE)) {
     return(NULL)
   }
   ggplot2::`%+%`(ggplot2::theme_minimal(base_size = 11),
@@ -18,12 +51,12 @@ ggplot_theme_colors <- function(bgcolor, fgcolor) {
       panel.grid.minor.y = ggplot2::element_blank(),
       panel.grid.major.x = ggplot2::element_blank(),
       panel.grid.minor.x = ggplot2::element_blank(),
-      text = ggplot2::element_text(colour = fgcolor),
-      axis.text = ggplot2::element_text(colour = fgcolor),
-      rect = ggplot2::element_rect(colour = bgcolor, fill = bgcolor),
-      plot.background = ggplot2::element_rect(fill = bgcolor, colour = NA),
-      axis.line = ggplot2::element_line(colour = fgcolor),
-      axis.ticks = ggplot2::element_line(colour = fgcolor)
+      text = ggplot2::element_text(colour = fg),
+      axis.text = ggplot2::element_text(colour = fg),
+      rect = ggplot2::element_rect(colour = bg, fill = bg),
+      plot.background = ggplot2::element_rect(fill = bg, colour = NA),
+      axis.line = ggplot2::element_line(colour = fg),
+      axis.ticks = ggplot2::element_line(colour = fg)
     ))
 }
 
@@ -40,34 +73,33 @@ ggplot_theme_brand <- function(brand_yml) {
 }
 
 
-#' Create a flextable theme using background and foreground colors
+
+#' Create a gt theme using background and foreground colors
 #'
-#' Create a flextable theme that uses the specified background and
+#' Create a gt theme that uses the specified background and
 #' foreground colors.
 #'
 #' @param bg The background color
 #' @param fg The foreground color
 #'
 #' @export
-flextable_theme_colors <- function(bg, fg) {
-  (function(x) {
-    if (!inherits(x, "flextable")) {
-      stop("flextable_theme_colors only supports flextable objects.")
-    }
-    x <- flextable::bg(x, bg = bg, part = "all")
-    x <- flextable::color(x, color = fg, part = "all")
-    flextable::autofit(x)
+gt_theme_colors <- function(bg, fg) {
+  (function(table) {
+    table |>
+      gt::tab_options(
+        table.background.color = bg,
+        table.font.color = fg,
+      )
   })
 }
-
-#' Create a flextable theme from a brand.yml file
+#' Create a gt theme from a brand.yml file
 #'
-#' Create a flextable theme that uses colors from the brand file.
+#' Create a gt theme that uses colors from the brand file.
 #'
 #' @param brand_yml The path to the brand.yml file
 #'
 #' @export
-flextable_theme_brand <- function(brand_yml) {
+gt_theme_brand <- function(brand_yml) {
   brand <- yaml::yaml.load_file(brand_yml)
-  flextable_theme_colors(brand$color$background, brand$color$foreground)
+  gt_theme_colors(brand$color$background, brand$color$foreground)
 }