From 29ac6e3306ced3da3e69761a2f6987eb4d38be64 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Thu, 28 Jul 2022 12:32:44 +0200 Subject: [PATCH] Switch to Font Awesome 6 icon names --- R/input-actiongroupbuttons.R | 2 +- R/input-circlebutton.R | 2 +- R/input-dropdown.R | 4 +-- R/input-icon.R | 2 +- R/input-search.R | 8 ++--- R/module-pickerGroup.R | 2 +- R/module-selectizeGroup.R | 4 +-- R/sw-dropdown.R | 4 +-- R/useShinydashboardPlus.R | 2 +- R/vertical-tab.R | 2 +- examples/checkboxGroupButtons.R | 2 +- examples/disable-buttons.R | 2 +- examples/ex-stati-card.R | 10 +++---- examples/prettyToggle.R | 4 +-- examples/radioGroupButtons.R | 2 +- examples/show_alert.R | 2 +- examples/show_toast.R | 4 +-- examples/textInputIcon.R | 4 +-- examples/updatePrettyCheckboxGroup.R | 2 +- examples/updatePrettyRadioButtons.R | 2 +- examples/useSweetAlert.R | 2 +- examples/vertical-tab.R | 2 +- inst/examples/checkboxGroupButtons/ui.R | 2 +- inst/examples/dropdown/ex-sw-dropdown.R | 2 +- inst/examples/radioGroupButtons/ui.R | 2 +- inst/examples/shinyWidgets/code_dropdown.R | 2 +- .../shinyWidgets/code_dropdownButton.R | 2 +- inst/examples/shinyWidgets/ui.R | 30 +++++++++---------- tests/testthat/test-bsplus.R | 4 +-- tests/testthat/test-checkboxGroupButtons.R | 10 +++---- tests/testthat/test-dropdown.R | 4 +-- tests/testthat/test-dropdownButton.R | 4 +-- tests/testthat/test-radioGroupButtons.R | 10 +++---- tests/testthat/test-vertical-tab.R | 4 +-- 34 files changed, 73 insertions(+), 73 deletions(-) diff --git a/R/input-actiongroupbuttons.R b/R/input-actiongroupbuttons.R index 9a225b76..7ed51de4 100644 --- a/R/input-actiongroupbuttons.R +++ b/R/input-actiongroupbuttons.R @@ -26,7 +26,7 @@ #' br(), #' actionGroupButtons( #' inputIds = c("btn1", "btn2", "btn3"), -#' labels = list("Action 1", "Action 2", tags$span(icon("cog"), "Action 3")), +#' labels = list("Action 1", "Action 2", tags$span(icon("gear"), "Action 3")), #' status = "primary" #' ), #' verbatimTextOutput(outputId = "res1"), diff --git a/R/input-circlebutton.R b/R/input-circlebutton.R index 5d04cd43..7cdb0f93 100644 --- a/R/input-circlebutton.R +++ b/R/input-circlebutton.R @@ -23,7 +23,7 @@ #' #' ui <- fluidPage( #' tags$h3("Rounded actionBution"), -#' circleButton(inputId = "btn1", icon = icon("cog")), +#' circleButton(inputId = "btn1", icon = icon("gear")), #' circleButton( #' inputId = "btn2", #' icon = icon("sliders"), diff --git a/R/input-dropdown.R b/R/input-dropdown.R index ad5adf65..b6b72a0f 100644 --- a/R/input-dropdown.R +++ b/R/input-dropdown.R @@ -55,7 +55,7 @@ #' label_on = "NAs keeped", #' label_off = "NAs removed", #' icon_on = icon("check"), -#' icon_off = icon("remove") +#' icon_off = icon("xmark") #' ) #' ), #' tags$div(style = "height: 140px;"), # spacing @@ -234,7 +234,7 @@ tooltipOptions <- function(placement = "right", #' label = "Close dropdown"), #' circle = TRUE, status = "danger", #' inputId = "mydropdown", -#' icon = icon("cog"), width = "300px" +#' icon = icon("gear"), width = "300px" #' ) #' ), #' column( diff --git a/R/input-icon.R b/R/input-icon.R index 6d1e8531..e9bd500d 100644 --- a/R/input-icon.R +++ b/R/input-icon.R @@ -69,7 +69,7 @@ textInputIcon <- function(inputId, #' textInputIcon( #' inputId = "id", #' label = "With an icon", -#' icon = icon("user-circle") +#' icon = icon("circle-user") #' ), #' actionButton("updateValue", "Update value"), #' actionButton("updateIcon", "Update icon"), diff --git a/R/input-search.R b/R/input-search.R index 377a39d8..684402dc 100644 --- a/R/input-search.R +++ b/R/input-search.R @@ -26,8 +26,8 @@ #' searchInput( #' inputId = "search", label = "Enter your text", #' placeholder = "A placeholder", -#' btnSearch = icon("search"), -#' btnReset = icon("remove"), +#' btnSearch = icon("magnifying-glass"), +#' btnReset = icon("xmark"), #' width = "450px" #' ), #' br(), @@ -118,8 +118,8 @@ searchInput <- function(inputId, label = NULL, value = "", placeholder = NULL, #' searchInput( #' inputId = "search", label = "Enter your text", #' placeholder = "A placeholder", -#' btnSearch = icon("search"), -#' btnReset = icon("remove"), +#' btnSearch = icon("magnifying-glass"), +#' btnReset = icon("xmark"), #' width = "450px" #' ), #' br(), diff --git a/R/module-pickerGroup.R b/R/module-pickerGroup.R index ca8b8cac..5105c201 100644 --- a/R/module-pickerGroup.R +++ b/R/module-pickerGroup.R @@ -188,7 +188,7 @@ pickerGroupUI <- function(id, params, label = NULL, btn_label = "Reset filters", actionLink( inputId = ns("reset_all"), label = btn_label, - icon = icon("remove"), + icon = icon("xmark"), style = "float: right;" ) ) diff --git a/R/module-selectizeGroup.R b/R/module-selectizeGroup.R index c784664a..d3088d65 100644 --- a/R/module-selectizeGroup.R +++ b/R/module-selectizeGroup.R @@ -61,7 +61,7 @@ selectizeGroupUI <- function(id, params, label = NULL, btn_label = "Reset filter actionLink( inputId = ns("reset_all"), label = btn_label, - icon = icon("times"), + icon = icon("xmark"), style = "float: right;" ) ) @@ -94,7 +94,7 @@ selectizeGroupUI <- function(id, params, label = NULL, btn_label = "Reset filter actionLink( inputId = ns("reset_all"), label = btn_label, - icon = icon("times"), + icon = icon("xmark"), style = "float: right;" ) ) diff --git a/R/sw-dropdown.R b/R/sw-dropdown.R index 6329a26c..22d11998 100644 --- a/R/sw-dropdown.R +++ b/R/sw-dropdown.R @@ -59,7 +59,7 @@ #' value = 3, #' min = 1, max = 9), #' -#' style = "unite", icon = icon("cog"), +#' style = "unite", icon = icon("gear"), #' status = "danger", width = "300px", #' animate = animateOptions( #' enter = animations$fading_entrances$fadeInLeftBig, @@ -215,7 +215,7 @@ dropdown <- function(..., style = "default", status = "default", #' #' dropdown( #' "Your contents goes here ! You can pass several elements", -#' circle = TRUE, status = "danger", icon = icon("cog"), width = "300px", +#' circle = TRUE, status = "danger", icon = icon("gear"), width = "300px", #' animate = animateOptions(enter = "fadeInDown", exit = "fadeOutUp", duration = 3) #' ) #' diff --git a/R/useShinydashboardPlus.R b/R/useShinydashboardPlus.R index 01f01776..923cf33c 100644 --- a/R/useShinydashboardPlus.R +++ b/R/useShinydashboardPlus.R @@ -41,7 +41,7 @@ #' boxDropdownItem("Link to google", href = "http://www.google.com"), #' boxDropdownItem("item 2", href = "#"), #' dropdownDivider(), -#' boxDropdownItem("item 3", href = "#", icon = icon("th")) +#' boxDropdownItem("item 3", href = "#", icon = icon("table-cells")) #' ), #' sidebar = boxSidebar( #' startOpen = TRUE, diff --git a/R/vertical-tab.R b/R/vertical-tab.R index 961980df..c40673cf 100644 --- a/R/vertical-tab.R +++ b/R/vertical-tab.R @@ -171,7 +171,7 @@ verticalTabPanel <- function(title, ..., value = title, icon = NULL, box_height #' verticalTabsetPanel( #' id = "TABS", #' verticalTabPanel( -#' title = "Title 1", icon = icon("home", "fa-2x"), +#' title = "Title 1", icon = icon("house", "fa-2x"), #' "Content panel 1" #' ), #' verticalTabPanel( diff --git a/examples/checkboxGroupButtons.R b/examples/checkboxGroupButtons.R index a0363a50..7cef0da2 100644 --- a/examples/checkboxGroupButtons.R +++ b/examples/checkboxGroupButtons.R @@ -24,7 +24,7 @@ ui <- fluidPage( label = "With icons:", choices = names(mtcars), checkIcon = list( - yes = icon("check-square"), + yes = icon("square-check"), no = icon("square-o") ) ), diff --git a/examples/disable-buttons.R b/examples/disable-buttons.R index 27378b56..ef1cfbb7 100644 --- a/examples/disable-buttons.R +++ b/examples/disable-buttons.R @@ -14,7 +14,7 @@ ui <- fluidPage( choices = setNames(1:6, head(month.name)), label = "Radio buttons", checkIcon = list( - yes = icon("check-square"), + yes = icon("square-check"), no = icon("square-o") ) ), diff --git a/examples/ex-stati-card.R b/examples/ex-stati-card.R index 1f0dd13b..d06c9874 100644 --- a/examples/ex-stati-card.R +++ b/examples/ex-stati-card.R @@ -9,7 +9,7 @@ ui <- fluidPage( fluidRow( column( width = 3, - statiCard(12, "Subtitle", icon("home")), + statiCard(12, "Subtitle", icon("house")), statiCard( 93, "Animated card", icon("users"), background = "deepskyblue", @@ -35,7 +35,7 @@ ui <- fluidPage( ), column( width = 3, - statiCard(12, "No animation", icon("home"), color = "firebrick") + statiCard(12, "No animation", icon("house"), color = "firebrick") ), column( width = 3, @@ -50,13 +50,13 @@ ui <- fluidPage( statiCard( "123456 something very very long", "Long value text with icon", - icon = icon("tachometer-alt"), + icon = icon("gauge"), left = TRUE ), statiCard( "123456 something very very long", "Long value text with icon right", - icon = icon("tasks") + icon = icon("list-check") ) ) ) @@ -85,7 +85,7 @@ server <- function(input, output, session) { statiCard( format(sample.int(1e6, 1), big.mark = " "), "Total spend", - icon("shopping-cart"), + icon("cart-shopping"), left = TRUE, animate = TRUE ) diff --git a/examples/prettyToggle.R b/examples/prettyToggle.R index 32a012bd..c0c6adc9 100644 --- a/examples/prettyToggle.R +++ b/examples/prettyToggle.R @@ -30,7 +30,7 @@ ui <- fluidPage( inputId = "toggle2", label_on = "Yes!", icon_on = icon("check"), status_on = "info", status_off = "warning", - label_off = "No..", icon_off = icon("remove") + label_off = "No..", icon_off = icon("xmark") ), verbatimTextOutput(outputId = "res2") ), @@ -89,7 +89,7 @@ ui <- fluidPage( inputId = "toggle3", label_on = "", label_off = "", - icon_on = icon("volume-up", lib = "glyphicon"), + icon_on = icon("volume-high", lib = "glyphicon"), icon_off = icon("volume-off", lib = "glyphicon"), status_on = "primary", status_off = "default", diff --git a/examples/radioGroupButtons.R b/examples/radioGroupButtons.R index a32cecc4..262a5710 100644 --- a/examples/radioGroupButtons.R +++ b/examples/radioGroupButtons.R @@ -24,7 +24,7 @@ ui <- fluidPage( label = "With icons:", choices = names(mtcars), checkIcon = list( - yes = icon("check-square"), + yes = icon("square-check"), no = icon("square-o") ) ), diff --git a/examples/show_alert.R b/examples/show_alert.R index 78e19419..84963f34 100644 --- a/examples/show_alert.R +++ b/examples/show_alert.R @@ -11,7 +11,7 @@ ui <- fluidPage( actionButton( inputId = "error", label = "Launch an error sweet alert", - icon = icon("remove") + icon = icon("xmark") ), actionButton( inputId = "sw_html", diff --git a/examples/show_toast.R b/examples/show_toast.R index fc84dab5..b42aa847 100644 --- a/examples/show_toast.R +++ b/examples/show_toast.R @@ -16,12 +16,12 @@ ui <- fluidPage( actionButton( inputId = "error", label = "Show error toast", - icon = icon("remove") + icon = icon("xmark") ), actionButton( inputId = "warning", label = "Show warning toast", - icon = icon("exclamation-triangle") + icon = icon("triangle-exclamation") ), actionButton( inputId = "info", diff --git a/examples/textInputIcon.R b/examples/textInputIcon.R index ebe22491..46966db4 100644 --- a/examples/textInputIcon.R +++ b/examples/textInputIcon.R @@ -12,13 +12,13 @@ ui <- fluidPage( textInputIcon( inputId = "ex1", label = "With an icon", - icon = icon("user-circle") + icon = icon("circle-user") ), verbatimTextOutput("res1"), textInputIcon( inputId = "ex2", label = "With an icon (right)", - icon = list(NULL, icon("user-circle")) + icon = list(NULL, icon("circle-user")) ), verbatimTextOutput("res2"), textInputIcon( diff --git a/examples/updatePrettyCheckboxGroup.R b/examples/updatePrettyCheckboxGroup.R index 78b3b877..923d1e25 100644 --- a/examples/updatePrettyCheckboxGroup.R +++ b/examples/updatePrettyCheckboxGroup.R @@ -13,7 +13,7 @@ ui <- fluidPage( label = "Update my value!", choices = month.name[1:4], status = "danger", - icon = icon("remove") + icon = icon("xmark") ), verbatimTextOutput(outputId = "res1"), br(), diff --git a/examples/updatePrettyRadioButtons.R b/examples/updatePrettyRadioButtons.R index fb36539f..38c6c11d 100644 --- a/examples/updatePrettyRadioButtons.R +++ b/examples/updatePrettyRadioButtons.R @@ -13,7 +13,7 @@ ui <- fluidPage( label = "Update my value!", choices = month.name[1:4], status = "danger", - icon = icon("remove") + icon = icon("xmark") ), verbatimTextOutput(outputId = "res1"), br(), diff --git a/examples/useSweetAlert.R b/examples/useSweetAlert.R index c73c1d77..30149ba4 100644 --- a/examples/useSweetAlert.R +++ b/examples/useSweetAlert.R @@ -16,7 +16,7 @@ if (interactive()) { actionButton( inputId = "error", label = "Launch an error sweet alert", - icon = icon("remove") + icon = icon("xmark") ), actionButton( inputId = "sw_html", diff --git a/examples/vertical-tab.R b/examples/vertical-tab.R index f46428d4..f4a649bf 100644 --- a/examples/vertical-tab.R +++ b/examples/vertical-tab.R @@ -13,7 +13,7 @@ ui <- fluidPage( id = "my_vertical_tab_panel", verticalTabPanel( title = "Title 1", - icon = icon("home", "fa-2x"), + icon = icon("house", "fa-2x"), "Content panel 1" ), verticalTabPanel( diff --git a/inst/examples/checkboxGroupButtons/ui.R b/inst/examples/checkboxGroupButtons/ui.R index 01b52a78..8f8f2bd3 100644 --- a/inst/examples/checkboxGroupButtons/ui.R +++ b/inst/examples/checkboxGroupButtons/ui.R @@ -157,7 +157,7 @@ fluidPage( choices = c("Choice 1", "Choice 2", "Choice 3"), checkIcon = list( yes = icon("check"), - no = icon("times") + no = icon("xmark") ) ), verbatimTextOutput(outputId = "res13") diff --git a/inst/examples/dropdown/ex-sw-dropdown.R b/inst/examples/dropdown/ex-sw-dropdown.R index 2331c8e9..61f237dd 100644 --- a/inst/examples/dropdown/ex-sw-dropdown.R +++ b/inst/examples/dropdown/ex-sw-dropdown.R @@ -11,7 +11,7 @@ ui <- fluidPage( shinyWidgets::pickerInput(inputId = 'xcol', label = 'X Variable', choices = names(iris)), selectInput(inputId = 'ycol', label = 'Y Variable', choices = names(iris), selected = names(iris)[[2]]), sliderInput(inputId = 'clusters', label = 'Cluster count', value = 3, min = 1, max = 9), - style = "material-circle", icon = icon("cog"), status = "danger", + style = "material-circle", icon = icon("gear"), status = "danger", animate = animateOptions(enter = animations$zooming_entrances$zoomInDown, exit = animations$zooming_exits$zoomOutUp, duration = 1) ), plotOutput(outputId = 'plot1') diff --git a/inst/examples/radioGroupButtons/ui.R b/inst/examples/radioGroupButtons/ui.R index 21689467..69dbfa66 100644 --- a/inst/examples/radioGroupButtons/ui.R +++ b/inst/examples/radioGroupButtons/ui.R @@ -134,7 +134,7 @@ fluidPage( choices = c("Choice 1", "Choice 2", "Choice 3"), checkIcon = list( yes = icon("check"), - no = icon("times") + no = icon("xmark") ) ), verbatimTextOutput(outputId = "res13") diff --git a/inst/examples/shinyWidgets/code_dropdown.R b/inst/examples/shinyWidgets/code_dropdown.R index 6893d90f..295b6d0c 100644 --- a/inst/examples/shinyWidgets/code_dropdown.R +++ b/inst/examples/shinyWidgets/code_dropdown.R @@ -24,7 +24,7 @@ ui <- fluidPage( value = 3, min = 1, max = 9), - style = "unite", icon = icon("cog"), + style = "unite", icon = icon("gear"), status = "danger", width = "300px", animate = animateOptions( enter = animations$fading_entrances$fadeInLeftBig, diff --git a/inst/examples/shinyWidgets/code_dropdownButton.R b/inst/examples/shinyWidgets/code_dropdownButton.R index 22e8a907..6d47dc29 100644 --- a/inst/examples/shinyWidgets/code_dropdownButton.R +++ b/inst/examples/shinyWidgets/code_dropdownButton.R @@ -24,7 +24,7 @@ ui <- fluidPage( max = 9), circle = TRUE, status = "danger", - icon = icon("cog"), width = "300px", + icon = icon("gear"), width = "300px", tooltip = tooltipOptions(title = "Click to see inputs !") ), diff --git a/inst/examples/shinyWidgets/ui.R b/inst/examples/shinyWidgets/ui.R index 77549b2b..d0768d40 100644 --- a/inst/examples/shinyWidgets/ui.R +++ b/inst/examples/shinyWidgets/ui.R @@ -50,18 +50,18 @@ header <- dashboardHeader(title = "shinyWidgets gallery") sidebar <- dashboardSidebar( sidebarMenu( id = "tabs", - menuItem(text = "Overview", tabName = "tabOverview", icon = icon("th")), + menuItem(text = "Overview", tabName = "tabOverview", icon = icon("table-cells")), menuItem(text = "switchInput", tabName = "tabswitchInput", icon = icon("toggle-on")), - menuItem(text = "Pretty Checkboxes & Radios", tabName = "tabPretty", icon = icon("check-circle")), - menuItem(text = "Awesome Checkboxes & Radios", tabName = "tabAwesome", icon = icon("check-square")), + menuItem(text = "Pretty Checkboxes & Radios", tabName = "tabPretty", icon = icon("circle-check")), + menuItem(text = "Awesome Checkboxes & Radios", tabName = "tabAwesome", icon = icon("square-check")), menuItem(text = "checkboxGroup Buttons", tabName = "tabcheckButtons", icon = icon("square")), menuItem(text = "radio Buttons", tabName = "tabradioButtons", icon = icon("circle")), menuItem(text = "materialSwitch", tabName = "tabMaterialSwitch", icon = icon("toggle-off")), menuItem(text = "pickerInput", tabName = "tabPickerInput", icon = icon("caret-down")), - menuItem(text = "sliderText", tabName = "tabSliderText", icon = icon("sliders-h")), - menuItem(text = "progressBar", tabName = "tabProgressBars", icon = icon("tasks")), + menuItem(text = "sliderText", tabName = "tabSliderText", icon = icon("sliders")), + menuItem(text = "progressBar", tabName = "tabProgressBars", icon = icon("list-check")), menuItem(text = "bttn", tabName = "tabBttn", icon = icon("square")), - menuItem(text = "dropdowns & sweetalert", tabName = "tabOtherStuff", icon = icon("plus-circle")) + menuItem(text = "dropdowns & sweetalert", tabName = "tabOtherStuff", icon = icon("circle-plus")) ) ) @@ -180,8 +180,8 @@ body <- dashboardBody( args = list( inputId = ID(.shinyWidgetGalleryId), label = "Click search icon to update or hit 'Enter'", placeholder = "A placeholder", - btnSearch = icon("search"), - btnReset = icon("times"), + btnSearch = icon("magnifying-glass"), + btnReset = icon("xmark"), width = "100%" ) ) @@ -431,7 +431,7 @@ body <- dashboardBody( args = list(inputId = ID(.shinyWidgetGalleryId), label_on = "Yes!", icon_on = icon("check"), status_on = "info", status_off = "warning", - label_off = "No..", icon_off = icon("times")) + label_off = "No..", icon_off = icon("xmark")) ) ) , @@ -483,7 +483,7 @@ body <- dashboardBody( .shinyWidgetGalleryFuns$widget_wrapper( fun = prettyCheckboxGroup, args = list(inputId = ID(.shinyWidgetGalleryId), label = "Choose:", choices = c("Click me !", "Me !", "Or me !"), - icon = icon("check-square"), status = "primary", outline = TRUE, animation = "jelly") + icon = icon("square-check"), status = "primary", outline = TRUE, animation = "jelly") ) ) , @@ -774,7 +774,7 @@ body <- dashboardBody( fun = checkboxGroupButtons, args = list( inputId = ID(.shinyWidgetGalleryId), label = "Label", choices = c("A", "B", "C", "D"), status = "primary", - checkIcon = list(yes = icon("ok", lib = "glyphicon"), no = icon("remove", lib = "glyphicon")) + checkIcon = list(yes = icon("ok", lib = "glyphicon"), no = icon("xmark", lib = "glyphicon")) ) ) ) @@ -926,7 +926,7 @@ body <- dashboardBody( fun = radioGroupButtons, args = list( inputId = ID(.shinyWidgetGalleryId), label = "Label", choices = c("A", "B", "C", "D"), status = "primary", - checkIcon = list(yes = icon("ok", lib = "glyphicon"), no = icon("remove", lib = "glyphicon")) + checkIcon = list(yes = icon("ok", lib = "glyphicon"), no = icon("xmark", lib = "glyphicon")) ) ) ) @@ -1569,7 +1569,7 @@ body <- dashboardBody( title = NULL, .shinyWidgetGalleryFuns$widget_wrapper( fun = actionBttn, - args = list(inputId = ID(.shinyWidgetGalleryId), label = "bordered", style = "bordered", color = "success", icon = icon("sliders-h")) + args = list(inputId = ID(.shinyWidgetGalleryId), label = "bordered", style = "bordered", color = "success", icon = icon("sliders")) ), footer = NULL ), @@ -1630,7 +1630,7 @@ body <- dashboardBody( selectInput(inputId = 'xcol', label = 'X Variable', choices = names(iris)), selectInput(inputId = 'ycol', label = 'Y Variable', choices = names(iris), selected = names(iris)[[2]]), sliderInput(inputId = 'clusters', label = 'Cluster count', value = 3, min = 1, max = 9), - circle = TRUE, status = "danger", icon = icon("cog"), width = "300px", + circle = TRUE, status = "danger", icon = icon("gear"), width = "300px", tooltip = tooltipOptions(title = "Click to see inputs !") ), plotOutput(outputId = 'plot1'), @@ -1652,7 +1652,7 @@ body <- dashboardBody( pickerInput(inputId = 'xcol2', label = 'X Variable', choices = names(iris), options = list(`style` = "btn-info")), pickerInput(inputId = 'ycol2', label = 'Y Variable', choices = names(iris), selected = names(iris)[[2]], options = list(`style` = "btn-warning")), sliderInput(inputId = 'clusters2', label = 'Cluster count', value = 3, min = 1, max = 9), - style = "unite", icon = icon("cog"), status = "danger", width = "300px", + style = "unite", icon = icon("gear"), status = "danger", width = "300px", animate = animateOptions(enter = animations$fading_entrances$fadeInLeftBig, exit = animations$fading_exits$fadeOutRightBig) ), plotOutput(outputId = 'plot2'), diff --git a/tests/testthat/test-bsplus.R b/tests/testthat/test-bsplus.R index aae52739..678f7b93 100644 --- a/tests/testthat/test-bsplus.R +++ b/tests/testthat/test-bsplus.R @@ -31,8 +31,8 @@ test_that("Search Input", { tag_searchInput <- searchInput( inputId = "search", label = "Enter your text", placeholder = "A placeholder", - btnSearch = shiny::icon("search"), - btnReset = shiny::icon("remove"), + btnSearch = shiny::icon("magnifying-glass"), + btnReset = shiny::icon("xmark"), width = "450px" ) diff --git a/tests/testthat/test-checkboxGroupButtons.R b/tests/testthat/test-checkboxGroupButtons.R index 7edc884f..f54cd397 100644 --- a/tests/testthat/test-checkboxGroupButtons.R +++ b/tests/testthat/test-checkboxGroupButtons.R @@ -144,15 +144,15 @@ test_that("Icons button", { inputId = "Id036", label = "Choose a graph :", choiceNames = list( - shiny::icon("cog"), - shiny::icon("cogs") + shiny::icon("gear"), + shiny::icon("gears") ), choiceValues = c("A", "B"), justified = TRUE ) cbtag <- as.character(cbtag) - expect_true(grepl(pattern = as.character(shiny::icon("cog")), x = cbtag)) - expect_true(grepl(pattern = as.character(shiny::icon("cogs")), x = cbtag)) + expect_true(grepl(pattern = as.character(shiny::icon("gear")), x = cbtag)) + expect_true(grepl(pattern = as.character(shiny::icon("gears")), x = cbtag)) }) @@ -178,7 +178,7 @@ test_that("Icons check / uncheck", { label = "Label", choices = c("A", "B", "C", "D"), status = "primary", checkIcon = list(yes = shiny::icon("ok", lib = "glyphicon"), - no = shiny::icon("remove", lib = "glyphicon")) + no = shiny::icon("xmark", lib = "glyphicon")) ) cbtag <- as.character(cbtag) expect_true(grepl(pattern = "check-btn-icon-no", x = cbtag)) diff --git a/tests/testthat/test-dropdown.R b/tests/testthat/test-dropdown.R index 88fb88d7..564293f0 100644 --- a/tests/testthat/test-dropdown.R +++ b/tests/testthat/test-dropdown.R @@ -6,7 +6,7 @@ test_that("Default", { tagdrop <- dropdown( "Content goes here", - style = "unite", icon = shiny::icon("cog"), status = "danger", width = "300px", + style = "unite", icon = shiny::icon("gear"), status = "danger", width = "300px", animate = animateOptions( enter = animations$fading_entrances$fadeInLeftBig, exit = animations$fading_exits$fadeOutRightBig @@ -20,7 +20,7 @@ test_that("inputId", { tagdrop <- dropdown( "Content goes here", - style = "default", icon = shiny::icon("cog"), status = "danger", width = "300px", + style = "default", icon = shiny::icon("gear"), status = "danger", width = "300px", inputId = "MYID" ) expect_identical(tagdrop$attribs$id, "sw-drop-MYID") diff --git a/tests/testthat/test-dropdownButton.R b/tests/testthat/test-dropdownButton.R index d41aeb8e..a140c6e5 100644 --- a/tests/testthat/test-dropdownButton.R +++ b/tests/testthat/test-dropdownButton.R @@ -6,7 +6,7 @@ test_that("Default", { tagdropBtn <- dropdownButton( "Your contents goes here ! You can pass several elements", - circle = TRUE, status = "danger", icon = shiny::icon("cog"), width = "300px", + circle = TRUE, status = "danger", icon = shiny::icon("gear"), width = "300px", tooltip = tooltipOptions(title = "Click to see inputs !") ) @@ -18,7 +18,7 @@ test_that("InputId", { tagdropBtn <- dropdownButton( "Your contents goes here ! You can pass several elements", inputId = "MYID", - circle = FALSE, status = "danger", icon = shiny::icon("cog"), width = "300px" + circle = FALSE, status = "danger", icon = shiny::icon("gear"), width = "300px" ) expect_identical(tagdropBtn$attribs$id, "MYID_state") diff --git a/tests/testthat/test-radioGroupButtons.R b/tests/testthat/test-radioGroupButtons.R index c7c38804..9469ef3f 100644 --- a/tests/testthat/test-radioGroupButtons.R +++ b/tests/testthat/test-radioGroupButtons.R @@ -144,15 +144,15 @@ test_that("Icons button", { inputId = "Id036", label = "Choose a graph :", choiceNames = list( - shiny::icon("cog"), - shiny::icon("cogs") + shiny::icon("gear"), + shiny::icon("gears") ), choiceValues = c("A", "B"), justified = TRUE ) rtag <- as.character(rtag) - expect_true(grepl(pattern = as.character(shiny::icon("cog")), x = rtag)) - expect_true(grepl(pattern = as.character(shiny::icon("cogs")), x = rtag)) + expect_true(grepl(pattern = as.character(shiny::icon("gear")), x = rtag)) + expect_true(grepl(pattern = as.character(shiny::icon("gears")), x = rtag)) }) @@ -178,7 +178,7 @@ test_that("Icons check / uncheck", { label = "Label", choices = c("A", "B", "C", "D"), status = "primary", checkIcon = list(yes = shiny::icon("ok", lib = "glyphicon"), - no = shiny::icon("remove", lib = "glyphicon")) + no = shiny::icon("xmark", lib = "glyphicon")) ) rtag <- as.character(rtag) expect_true(grepl(pattern = "radio-btn-icon-no", x = rtag)) diff --git a/tests/testthat/test-vertical-tab.R b/tests/testthat/test-vertical-tab.R index 5604efb4..e0c98050 100644 --- a/tests/testthat/test-vertical-tab.R +++ b/tests/testthat/test-vertical-tab.R @@ -5,7 +5,7 @@ test_that("verticalTabPanel works", { tag <- verticalTabsetPanel( verticalTabPanel( - title = "Title 1", icon = shiny::icon("home", "fa-2x"), + title = "Title 1", icon = shiny::icon("house", "fa-2x"), "Content panel 1" ), verticalTabPanel( @@ -30,7 +30,7 @@ test_that("verticalTabPanel (with args) works", { menuSide = "right", selected = "Title 2", verticalTabPanel( - title = "Title 1", icon = shiny::icon("home", "fa-2x"), + title = "Title 1", icon = shiny::icon("house", "fa-2x"), "Content panel 1" ), verticalTabPanel(