Small update

-Improved dark theme -Improved visibility of axes
JoachimGoedhart · Sep 8, 2020 · aabe94b · aabe94b
1 parent 929c204
commit aabe94b
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 2 deletions.
diff --git a/app.R b/app.R
@@ -1549,7 +1549,7 @@ plot_data <- reactive({
 
     # This needs to go here (before annotations)
     p <- p+ theme_light(base_size = 16)
-    if (input$dark) {p <- p+ theme_darker(base_size = 16)}
+    if (input$dark) {p <- p+ theme_dark_basic(base_size = 16)}
 
 
     ############## Adjust Y-scaling if necessary ##########
@@ -1836,7 +1836,7 @@ plot_data <- reactive({
     #Remove upper and right axis
 
         p <- p + theme(panel.border = element_blank())
-        p <- p + theme(axis.line.x  = element_line(colour = "black"), axis.line.y  = element_line(colour = "black"))
+        p <- p + theme(axis.line.x  = element_line(colour = line_color), axis.line.y  = element_line(colour = line_color))
 
     return(p)
 

diff --git a/themes.R b/themes.R
@@ -60,6 +60,69 @@ theme_darker <- function(base_size = 11, base_family = "",  base_line_size = bas
 
 }
 
+theme_dark_basic <- function(base_size = 11, base_family = "",  base_line_size = base_size/22, base_rect_size = base_size/22)
+{
+  half_line <- base_size/2
+  theme_light() %+replace%
+    theme(line = element_line(colour = "grey100", size = 0.5, linetype = 1, lineend = "butt"),
+
+          rect = element_rect(fill = "grey0", colour = "grey100", size = 0.5, linetype = 1),
+
+          text = element_text(family = base_family, face = "plain", colour = "grey100", size = base_size, lineheight = 0.9, hjust = 0.5, vjust = 0.5, angle = 0, margin = margin(), debug = FALSE),
+
+          axis.line = element_line(),
+          axis.line.x = element_blank(), 
+          axis.line.y = element_blank(),
+
+          axis.text = element_text(size = rel(0.8), colour = "grey80"),
+          # axis.text.x = element_text(margin = margin(t = 0.8 * half_line/2), vjust = 1),
+          # axis.text.y = element_text(margin = margin(r = 0.8 * half_line/2), hjust = 1),
+
+          axis.ticks = element_line(colour = "grey80"), 
+          # axis.ticks.length = unit(half_line/2, "pt"),
+
+          # axis.title.x = element_text(margin = margin(t = 0.8 * half_line, b = 0.8 * half_line/2)),
+          # axis.title.y = element_text(angle = 90, margin = margin(r = 0.8 * half_line, l = 0.8 * half_line/2)),
+
+          legend.background = element_rect(colour = NA),
+          # legend.margin = unit(0.2, "cm"),
+          legend.key = element_rect(fill = NULL, colour = "grey0"),
+          # legend.key.size = unit(1.2, "lines"), 
+          # legend.key.height = NULL, legend.key.width = NULL,
+          # legend.text = element_text(size = rel(0.8)), 
+          # legend.text.align = NULL,
+          # legend.title = element_text(hjust = 0), 
+          # legend.title.align = NULL,
+          # legend.position = "right", 
+          # legend.direction = NULL,
+          # legend.justification = "center", 
+          # legend.box = NULL,
+
+          panel.background = element_rect(fill = "grey5", colour = NA),
+          panel.border = element_rect(fill = NA, colour = "grey80"),
+          panel.grid.major = element_line(colour = "grey30"), 
+          panel.grid.minor = element_line(colour = "grey30", size = 0.25), 
+          # panel.margin = unit(half_line, "pt"),
+          # panel.margin.x = NULL, 
+          # panel.margin.y = NULL,
+          panel.ontop = FALSE,
+
+          strip.background = element_rect(fill = "grey40", colour = NA),
+          strip.text = element_text(colour = "grey10", size = rel(0.8)),
+          strip.text.x = element_text(margin = margin(t = half_line, b = half_line)),
+          strip.text.y = element_text(angle = -90, margin = margin(l = half_line, r = half_line)),
+          strip.switch.pad.grid = unit(0.1, "cm"),
+          strip.switch.pad.wrap = unit(0.1, "cm"),
+
+          #To avoid white line around plot panel
+          plot.background = element_rect(colour = "black"), 
+          # plot.title = element_text(size = rel(1.2), margin = margin(b = half_line * 1.2)),
+          # plot.margin = margin(half_line, half_line, half_line, half_line),
+          complete = TRUE)
+
+}
+
+
 
 ############## https://debruine.github.io/posts/plot-comparison/