diff --git a/NAMESPACE b/NAMESPACE index 1624fcce..2c914fdb 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -3,6 +3,8 @@ export("%>%") export(addF7Popover) export(addF7Tooltip) +export(add_framework7_deps) +export(add_shinyMobile_deps) export(create_manifest) export(f7Accordion) export(f7AccordionItem) diff --git a/R/f7Page.R b/R/f7Page.R index 4bfa16bd..2fa092ec 100644 --- a/R/f7Page.R +++ b/R/f7Page.R @@ -8,7 +8,7 @@ #' @param options shinyMobile configuration. See \url{https://framework7.io/docs/app.html}. Below are the most #' notable options. General options: #' \itemize{ -#' \item \code{theme}: App skin: "ios", "md", "auto" or "aurora". +#' \item \code{theme}: App skin: "ios", "md", or "auto". #' \item \code{dark}: Dark layout. TRUE or FALSE. #' \item \code{skeletonsOnLoad}: Whether to display skeletons on load. #' This is a preloading effect. Not compatible with preloader. @@ -56,7 +56,7 @@ f7Page <- function( title = NULL, # default options options = list( - theme = c("auto", "ios", "md", "aurora"), + theme = c("auto", "ios", "md"), dark = TRUE, skeletonsOnLoad = FALSE, preloader = FALSE, diff --git a/R/f7Sheet.R b/R/f7Sheet.R index eb0c1b28..ae2a5fcc 100644 --- a/R/f7Sheet.R +++ b/R/f7Sheet.R @@ -11,8 +11,7 @@ #' @param swipeToStep If TRUE then sheet will be opened partially, #' and with swipe it can be further expanded. #' @param backdrop Enables Sheet backdrop (dark semi transparent layer -#' behind). By default it is TRUE for MD and Aurora themes and -#' FALSE for iOS theme. +#' behind). By default it is true for MD theme and false for iOS theme. #' @param closeByOutsideClick When enabled, sheet will be closed on #' when click outside of it. #' @param swipeHandler Whether to display a swipe handler. TRUE by default. diff --git a/inst/examples/split_layout/app.R b/inst/examples/split_layout/app.R index 576f6eeb..c8a9616b 100644 --- a/inst/examples/split_layout/app.R +++ b/inst/examples/split_layout/app.R @@ -22,7 +22,7 @@ shinyApp( ui = f7Page( title = "Split layout", options = list( - theme = "aurora", + theme = "auto", dark = TRUE, filled = FALSE, color = "#007aff", diff --git a/man/add_framework7_deps.Rd b/man/add_framework7_deps.Rd index 3c000052..01bdda62 100644 --- a/man/add_framework7_deps.Rd +++ b/man/add_framework7_deps.Rd @@ -12,4 +12,3 @@ add_framework7_deps(tag) \description{ This function attaches framework7. dependencies to the given tag } -\keyword{internal} diff --git a/man/add_shinyMobile_deps.Rd b/man/add_shinyMobile_deps.Rd index c59253bd..fa028ca3 100644 --- a/man/add_shinyMobile_deps.Rd +++ b/man/add_shinyMobile_deps.Rd @@ -12,4 +12,3 @@ add_shinyMobile_deps(tag) \description{ This function attaches shinyMobile dependencies to the given tag } -\keyword{internal} diff --git a/man/f7Page.Rd b/man/f7Page.Rd index e711e73e..c604ad85 100644 --- a/man/f7Page.Rd +++ b/man/f7Page.Rd @@ -7,11 +7,11 @@ f7Page( ..., title = NULL, - options = list(theme = c("auto", "ios", "md", "aurora"), dark = TRUE, skeletonsOnLoad = - FALSE, preloader = FALSE, filled = FALSE, color = "#007aff", touch = list(tapHold = - TRUE, tapHoldDelay = 750, iosTouchRipple = FALSE), iosTranslucentBars = FALSE, navbar - = list(iosCenterTitle = TRUE, hideOnPageScroll = TRUE), toolbar = - list(hideOnPageScroll = FALSE), pullToRefresh = FALSE), + options = list(theme = c("auto", "ios", "md"), dark = TRUE, skeletonsOnLoad = FALSE, + preloader = FALSE, filled = FALSE, color = "#007aff", touch = list(tapHold = TRUE, + tapHoldDelay = 750, iosTouchRipple = FALSE), iosTranslucentBars = FALSE, navbar = + list(iosCenterTitle = TRUE, hideOnPageScroll = TRUE), toolbar = list(hideOnPageScroll + = FALSE), pullToRefresh = FALSE), allowPWA = FALSE ) } @@ -24,7 +24,7 @@ f7Page( \item{options}{shinyMobile configuration. See \url{https://framework7.io/docs/app.html}. Below are the most notable options. General options: \itemize{ - \item \code{theme}: App skin: "ios", "md", "auto" or "aurora". + \item \code{theme}: App skin: "ios", "md", or "auto". \item \code{dark}: Dark layout. TRUE or FALSE. \item \code{skeletonsOnLoad}: Whether to display skeletons on load. This is a preloading effect. Not compatible with preloader. diff --git a/man/sheet.Rd b/man/sheet.Rd index 413b9c4b..70b7b3f2 100644 --- a/man/sheet.Rd +++ b/man/sheet.Rd @@ -35,8 +35,7 @@ swipeToStep is TRUE. Default to NULL.} and with swipe it can be further expanded.} \item{backdrop}{Enables Sheet backdrop (dark semi transparent layer -behind). By default it is TRUE for MD and Aurora themes and -FALSE for iOS theme.} +behind). By default it is true for MD theme and false for iOS theme.} \item{closeByOutsideClick}{When enabled, sheet will be closed on when click outside of it.} diff --git a/vignettes/shinyMobile.Rmd b/vignettes/shinyMobile.Rmd index a2e6bdb4..c8d908c4 100644 --- a/vignettes/shinyMobile.Rmd +++ b/vignettes/shinyMobile.Rmd @@ -27,12 +27,12 @@ library(bslib) ## Custom skins -`{shinyMobile}` offers 3 skins: +`{shinyMobile}` offers 2 skins: - - __aurora__ for desktop apps. - - __ios__ and __md__ for mobile apps. + - __ios__ + - __md__ -It automatically detects if the app is running with android or iOS and accordingly adapts the layout. It is of course possible to apply the iOS skin on an android device and inversely, although not recommended. +It automatically detects if the app is running with android or iOS and accordingly adapts the layout. It will use the MD theme for all other devices. It is of course possible to apply the iOS skin on an android device and inversely, although not recommended. `{shinyMobile}` also provides 2 themes, namely light and dark. @@ -47,7 +47,7 @@ It automatically detects if the app is running with android or iOS and according ## UI elements ### Inputs: brief comparison side by side with `{shiny}` -`{shinyMobile}` has its own custom input widgets with unique design for each skin (iOS/android/aurora). Below we summarise all known shiny inputs and their +`{shinyMobile}` has its own custom input widgets with unique design for each skin (iOS/android). Below we summarise all known shiny inputs and their equivalent with `{shinyMobile}`. | Features (sample) | shiny | shinyMobile | @@ -520,7 +520,7 @@ shinyApp( ui = f7Page( title = "My app", options = list( - theme = "aurora", + theme = "auto", dark = TRUE, filled = FALSE, color = "#007aff", @@ -668,7 +668,7 @@ This is where you can customize the global app behavior: ```{r, eval=FALSE} options = list( - theme = c("ios", "md", "auto", "aurora"), + theme = c("ios", "md", "auto"), dark = TRUE, filled = FALSE, color = "#007aff",