Skip to content

Commit 78f0dc8

Browse files
committed
merge branch dev
2 parents d39aca8 + 1fbacc2 commit 78f0dc8

19 files changed

+98
-8
lines changed

.DS_Store

4 KB
Binary file not shown.

DESCRIPTION

+7-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ Authors@R: c(
1010
person("Ahmad", "Hosseinpoor", , "[email protected]", role = "aut"),
1111
person("World Health Organization", , , "[email protected]", role = "cph")
1212
)
13-
Description: Functions for computing summary measures of health
14-
inequality.
13+
Description: Compute 21 summary measures of health inequality and its
14+
corresponding confidence intervals for ordered and non-ordered
15+
dimensions using disaggregated (grouped) data. Measures for ordered
16+
dimensions (i.e., Slope Index of Inequality) also accept individual
17+
and survey data.
1518
License: AGPL (>= 3)
16-
URL: https://github.com/WHOequity/healthequal, https://whoequity.github.io/healthequal/
19+
URL: https://github.com/WHOequity/healthequal,
20+
https://whoequity.github.io/healthequal/
1721
BugReports: https://github.com/WHOequity/healthequal/issues
1822
Depends:
1923
R (>= 3.5.0)

README.Rmd

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ output: github_document
33
---
44

55
<!-- badges: start -->
6-
76
[![R-CMD-check](https://github.com/WHOequity/healthequal/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/WHOequity/healthequal/actions/workflows/R-CMD-check.yaml)
8-
7+
[![CRAN status](https://www.r-pkg.org/badges/version/healthequal)](https://CRAN.R-project.org/package=healthequal)
8+
[![Project Status: Concept](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
9+
[![License: AGPL (>= 3)](https://img.shields.io/badge/License-AGPL%20%28%3E%3D%203%29-blue.svg)](https://choosealicense.com/licenses/agpl-3.0/)
910
<!-- badges: end -->
1011

1112
<!-- README.md is generated from README.Rmd. Please edit that file -->
@@ -21,7 +22,7 @@ knitr::opts_chunk$set(
2122
library(healthequal)
2223
```
2324

24-
# healthequal <a href='https://github.com/WHOequity/healthequal/'>
25+
# healthequal <a href="https://whoequity.github.io/healthequal/"><img src="man/figures/logo.png" align="right" height="139" alt="healthequal website" /></a>
2526

2627
The healthequal R package provides computational tools for calculating summary measures of health inequality.
2728

README.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22
<!-- badges: start -->
33

44
[![R-CMD-check](https://github.com/WHOequity/healthequal/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/WHOequity/healthequal/actions/workflows/R-CMD-check.yaml)
5-
5+
[![CRAN
6+
status](https://www.r-pkg.org/badges/version/healthequal)](https://CRAN.R-project.org/package=healthequal)
7+
[![Project Status:
8+
Concept](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
9+
[![License: AGPL (\>=
10+
3)](https://img.shields.io/badge/License-AGPL%20%28%3E%3D%203%29-blue.svg)](https://choosealicense.com/licenses/agpl-3.0/)
611
<!-- badges: end -->
12+
713
<!-- README.md is generated from README.Rmd. Please edit that file -->
814

9-
# healthequal <a href='https://github.com/WHOequity/healthequal/'>
15+
# healthequal <a href="https://whoequity.github.io/healthequal/"><img src="man/figures/logo.png" align="right" height="139" alt="healthequal website" /></a>
1016

1117
The healthequal R package provides computational tools for calculating
1218
summary measures of health inequality.

_pkgdown.yml

+38
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,42 @@
11
url: https://whoequity.github.io/healthequal/
22
template:
33
bootstrap: 5
4+
bslib:
5+
base_font: {google: "Roboto"}
6+
heading_font: {google: "Roboto Slab"}
7+
code_font: {google: "JetBrains Mono"}
48

9+
reference:
10+
- title: "Package data"
11+
contents:
12+
- data
13+
14+
- title: "Summary measures for ordered dimensions"
15+
contents:
16+
- aci
17+
- rci
18+
- sii
19+
- rii
20+
21+
- title: "Summary measures for non-ordered dimensions"
22+
contents:
23+
- bgv
24+
- bgsd
25+
- covar
26+
- d
27+
- idisu
28+
- idisw
29+
- mdbu
30+
- mdbw
31+
- mdmu
32+
- mdmw
33+
- mdru
34+
- mdrw
35+
- mld
36+
- r
37+
- ti
38+
39+
- title: "Summary measures for both ordered and non-ordered dimensions"
40+
contents:
41+
- par
42+
- paf

inst/WORDLIST

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ACI
2+
AGPL
23
Ahn
34
BGSD
45
BGV

inst/logo/background.png

53.2 KB
Loading

inst/logo/logo.R

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Create Hex Sticker
2+
library(showtext)
3+
library(hexSticker)
4+
5+
## Loading Google fonts (http://www.google.com/fonts)
6+
font_add_google("Inconsolata", "incon")
7+
## Automatically use showtext to render text for future devices
8+
showtext_auto()
9+
10+
sticker(
11+
# Subplot (image)
12+
subplot = "inst/figures/background.png", # Image name
13+
s_y = 1, # Position of the sub plot (y)
14+
s_x = 1.01, # Position of the sub plot (x)
15+
s_width = .85, # Width of the sub plot
16+
s_height=0.1, # Height of the sub plot
17+
# Font
18+
package = "healthequal", # Package name (will be printed on the sticker)
19+
p_size = 80, # Font size of the text
20+
p_y = 0.65, # Position of the font (y)
21+
p_x=1.05, # Position of the font (x)
22+
p_family = "incon", # Defines font
23+
p_color = "#008dc9",
24+
p_fontface = "bold",
25+
# Spotlight
26+
spotlight = TRUE, # Enables spotlight
27+
l_y=0.6, # Position of spotlight (y)
28+
l_x=1.03, # Position of spotlight (x)
29+
l_width = 10,
30+
l_height = 3,
31+
l_alpha = 0.9,
32+
# Sticker colors
33+
h_size = 1.2,
34+
h_fill = "#f5f5f5", # Color for background
35+
h_color = "#008dc9", # Color for borders
36+
# Resolution
37+
dpi=1200, # Sets DPI
38+
# Save
39+
filename="inst/logo/logo.png" # Sets file name and location where to store the sticker
40+
)

inst/logo/logo.png

171 KB
Loading

man/figures/logo.png

23.2 KB
Loading
9.71 KB
Loading
13 KB
Loading
15.7 KB
Loading
4.36 KB
Loading
5.79 KB
Loading

pkgdown/favicon/apple-touch-icon.png

15.7 KB
Loading

pkgdown/favicon/favicon-16x16.png

1.25 KB
Loading

pkgdown/favicon/favicon-32x32.png

2.31 KB
Loading

pkgdown/favicon/favicon.ico

14.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)