Skip to content

Commit 17f91fc

Browse files
Merge pull request #1172 from r-lib/add-sticker
Adding sticker
2 parents e987d7a + 4ec583d commit 17f91fc

21 files changed

+120
-123
lines changed

.Rbuildignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717
^doc$
1818
^docs$
1919
^gitsum$
20+
^hextools
2021
^inst/WORDLIST$
22+
^inst/hextools$
2123
^inst/hooks/.*$
24+
^pkgdown$
2225
^revdep$
2326
^tests/testmanual$
2427
^tic\.R$

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
.DS_Store
12
.RData
23
.Rhistory
34
.Rproj.user
45
.gitsum
56
Meta
67
R/scratch
8+
README.html
79
doc
810
docs
911
gitsum

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ default_language_version:
66

77
repos:
88
- repo: https://github.com/lorenzwalthert/precommit
9-
rev: v0.3.2.9019
9+
rev: v0.3.2.9027
1010
hooks:
1111
- id: style-files
1212
args:
@@ -34,9 +34,9 @@ repos:
3434
- id: roxygenize
3535
additional_dependencies:
3636
- r-lib/pkgapi
37-
- dplyr@1.1.2
38-
- roxygen2@7.2.3
39-
- rlang@1.1.0
37+
- dplyr
38+
- roxygen2
39+
- rlang
4040
- id: use-tidy-description
4141
- id: spell-check
4242
exclude: >
@@ -62,6 +62,7 @@ repos:
6262
.*\.Rds|
6363
.*\.sh|
6464
.*\.RData|
65+
.*\.png|
6566
.*-in_tree
6667
)$
6768
- id: readme-rmd-rendered

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Roxygen: list(markdown = TRUE, roclets = c( "rd", "namespace", "collate",
5252
if (rlang::is_installed("pkgapi")) "pkgapi::api_roclet" else {
5353
warning("Please install r-lib/pkgapi to make sure the file API is kept
5454
up to date"); NULL}))
55-
RoxygenNote: 7.2.3
55+
RoxygenNote: 7.3.0
5656
Config/testthat/edition: 3
5757
Config/testthat/parallel: true
5858
Collate:

R/styler-package.R

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
#' style_text("a%>%b; a", scope = "tokens")
1919
"_PACKAGE"
2020

21-
## usethis namespace: start
21+
## styler namespace: start
2222
#'
23-
#' @importFrom magrittr "%>%"
23+
#' @importFrom magrittr %>%
2424
#' @importFrom purrr compact partial flatten flatten_int flatten_chr
2525
#' @importFrom purrr map map_lgl map_int map_chr map2 map2_chr map_at pmap pwalk
26-
#' @importFrom rlang abort warn seq2 check_installed is_installed "%||%" set_names
26+
#' @importFrom rlang abort warn seq2 check_installed is_installed %||% set_names
2727
#' @importFrom vctrs vec_rbind vec_slice vec_split
28-
## usethis namespace: end
28+
#'
29+
## styler namespace: end
2930
NULL
3031

3132

R/transform-files.R

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,10 @@ transform_file <- function(path,
6868

6969
bullet <- if (is.na(changed)) {
7070
"warning"
71+
} else if (changed) {
72+
"info"
7173
} else {
72-
if (changed) {
73-
"info"
74-
} else {
75-
"tick"
76-
}
74+
"tick"
7775
}
7876

7977
if (!getOption("styler.quiet", FALSE)) {

README.Rmd

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ knitr::opts_chunk$set(
1515
)
1616
```
1717

18-
# styler
18+
# styler <img src="man/figures/logo.png" align="right" width="240" />
1919

2020
<!-- badges: start -->
2121

@@ -68,3 +68,9 @@ The following online docs are available:
6868
- [latest CRAN release](https://styler.r-lib.org).
6969

7070
- [GitHub development version](https://styler.r-lib.org/dev/).
71+
72+
## Acknowledgments
73+
74+
Hex sticker font is [Gayathri](https://fonts.google.com/specimen/Gayathri), and
75+
the image is taken from icon made by [Freepik](https://www.freepik.com) and
76+
available at [flaticon.com](https://www.flaticon.com/free-icon/suit).

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<!-- README.md is generated from README.Rmd. Please edit that file -->
33

4-
# styler
4+
# styler <img src="man/figures/logo.png" align="right" width="240" />
55

66
<!-- badges: start -->
77

@@ -53,3 +53,10 @@ The following online docs are available:
5353
- [latest CRAN release](https://styler.r-lib.org).
5454

5555
- [GitHub development version](https://styler.r-lib.org/dev/).
56+
57+
## Acknowledgments
58+
59+
Hex sticker font is
60+
[Gayathri](https://fonts.google.com/specimen/Gayathri), and the image is
61+
taken from icon made by [Freepik](https://www.freepik.com) and available
62+
at [flaticon.com](https://www.flaticon.com/free-icon/suit).

0 commit comments

Comments
 (0)