Skip to content

Commit 53ffa7e

Browse files
ful1e5ful1e5
committed
Merge branch 'dev'
2 parents b1d5eca + 0ff94f5 commit 53ffa7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+766
-497
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,14 @@
1-
<!--
2-
Please make sure you are familiar with and follow the instructions in the
3-
contributing guidelines (found in the CONTRIBUTING.md file).
4-
5-
Please fill out the information below to expedite the review and (hopefully)
6-
merge of your pull request!
7-
-->
8-
91
## What kind of change does this PR introduce?
102

113
<!-- Is it a Bug fix, feature, docs update, ... -->
124

13-
## What is the current behavior?
14-
15-
<!-- You can also link to an open issue here -->
16-
17-
## What is the new behavior?
18-
19-
<!-- if this is a feature change -->
20-
21-
## What steps did you take to test this? This is required before I can merge, make sure to test the flow you've updated.
22-
23-
1. Step A
24-
2. Step B
25-
3. Step C
26-
275
## Checklist
286

29-
<!-- Have you done all of these things? -->
30-
<!-- add "N/A" to the end of each line that's irrelevant to your changes -->
31-
<!-- to check an item, place an "x" in the box like so: "- [x] Documentation" -->
32-
337
- [ ] Documentation
348
- [ ] Testing <!-- We can only merge the PR if this is checked -->
359
- [ ] Ready to be merged
3610
<!-- In your opinion, is this ready to be merged as soon as it's reviewed? -->
3711
- [ ] Added myself to contributors table
3812
<!-- this is optional, see the contributing guidelines for instructions -->
3913

40-
<!-- feel free to add additional comments -->
4114
<!-- Thank you for contributing! -->

‎.github/workflows/build.yml‎

Lines changed: 88 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,93 @@
11
name: build
22

33
on:
4-
push:
5-
paths-ignore:
6-
- "**.md"
7-
- "**.bbcode"
8-
- LICENSE
9-
branches: [main, dev]
10-
pull_request:
11-
paths-ignore:
12-
- "**.md"
13-
- "**.bbcode"
14-
- LICENSE
15-
branches: [main]
4+
push:
5+
paths-ignore:
6+
- "**.md"
7+
- "**.bbcode"
8+
- LICENSE
9+
branches: [main, dev]
10+
pull_request:
11+
paths-ignore:
12+
- "**.md"
13+
- "**.bbcode"
14+
- LICENSE
15+
branches: [main]
1616

1717
jobs:
18-
build:
19-
runs-on: ubuntu-latest
20-
steps:
21-
- uses: actions/checkout@v2
22-
- name: Install build dependencies (apt)
23-
run: sudo apt install -y libx11-dev libxcursor-dev libpng-dev
24-
continue-on-error: false
25-
- name: Get yarn cache directory path
26-
id: yarn-cache-dir-path
27-
run: echo "::set-output name=dir::$(yarn cache dir)"
28-
- name: Caching yarn packages
29-
uses: actions/cache@v2
30-
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
31-
with:
32-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
33-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
34-
restore-keys: |
35-
${{ runner.os }}-yarn-
36-
- name: Set Up NodeJS 12.x
37-
uses: actions/setup-node@v1
38-
with:
39-
node-version: "12.x"
40-
- name: Caching pip packages
41-
uses: actions/cache@v2
42-
id: pip-cache # use this to check for `cache-hit` (`steps.pip-cache.outputs.cache-hit != 'true'`)
43-
with:
44-
path: ~/.cache/pip
45-
key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
46-
restore-keys: |
47-
${{ runner.os }}-pip-
48-
- name: Set up Python 3.8
49-
uses: actions/setup-python@v2
50-
with:
51-
python-version: "3.8"
52-
- name: Generating `macOSBigSur` Cursor Theme
53-
run: make
54-
continue-on-error: false
55-
- name: Compressing UNIX theme
56-
run: tar -cvzf macOSBigSur.tar.gz themes/macOSBigSur
57-
- name: Uploading `bitmaps` artifact
58-
uses: actions/upload-artifact@v2
59-
with:
60-
name: bitmaps
61-
path: bitmaps/*
62-
- name: Uploading `macOSBigSur` UNIX Theme artifact
63-
uses: actions/upload-artifact@v2
64-
with:
65-
name: macOSBigSur
66-
path: macOSBigSur.tar.gz
67-
- name: Uploading `macOSBigSur` Windows Theme artifact
68-
uses: actions/upload-artifact@v2
69-
with:
70-
name: macOSBigSur_Windows
71-
path: themes/macOSBigSur_Windows/*
18+
build:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v2
22+
- name: Install build dependencies (apt)
23+
run: sudo apt install -y libx11-dev libxcursor-dev libpng-dev
24+
continue-on-error: false
25+
- name: Get yarn cache directory path
26+
id: yarn-cache-dir-path
27+
run: echo "::set-output name=dir::$(yarn cache dir)"
28+
- name: Caching yarn packages
29+
uses: actions/cache@v2
30+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
31+
with:
32+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
33+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
34+
restore-keys: |
35+
${{ runner.os }}-yarn-
36+
37+
- name: Set Up NodeJS 12.x
38+
uses: actions/setup-node@v1
39+
with:
40+
node-version: "12.x"
41+
42+
- name: Caching pip packages
43+
uses: actions/cache@v2
44+
id: pip-cache # use this to check for `cache-hit` (`steps.pip-cache.outputs.cache-hit != 'true'`)
45+
with:
46+
path: ~/.cache/pip
47+
key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
48+
restore-keys: |
49+
${{ runner.os }}-pip-
50+
51+
- name: Set up Python 3.8
52+
uses: actions/setup-python@v2
53+
with:
54+
python-version: "3.8"
55+
56+
- name: Generating `macOSBigSur` Cursor Theme
57+
run: make
58+
continue-on-error: false
59+
60+
- name: Compressing UNIX theme
61+
run: |
62+
tar -cvzf macOSBigSur.tar.gz themes/macOSBigSur
63+
tar -cvzf macOSBigSur-White.tar.gz themes/macOSBigSur-White
64+
65+
- name: Uploading `bitmaps` artifact
66+
uses: actions/upload-artifact@v2
67+
with:
68+
name: bitmaps
69+
path: bitmaps/*
70+
71+
- name: Uploading `macOSBigSur` UNIX Theme artifact
72+
uses: actions/upload-artifact@v2
73+
with:
74+
name: macOSBigSur
75+
path: macOSBigSur.tar.gz
76+
77+
- name: Uploading `macOSBigSur-White` UNIX Theme artifact
78+
uses: actions/upload-artifact@v2
79+
with:
80+
name: macOSBigSur-White
81+
path: macOSBigSur-White.tar.gz
82+
83+
- name: Uploading `macOSBigSur` Windows Theme artifact
84+
uses: actions/upload-artifact@v2
85+
with:
86+
name: macOSBigSur-Windows
87+
path: themes/macOSBigSur-Windows/*
88+
89+
- name: Uploading `macOSBigSur-White` Windows Theme artifact
90+
uses: actions/upload-artifact@v2
91+
with:
92+
name: macOSBigSur-White-Windows
93+
path: themes/macOSBigSur-White-Windows/*

‎CHANGELOG.md‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [unreleased]
99

10+
## [v1.2.0] - 25 Aug 2021
11+
12+
### Added
13+
14+
- Dark branding
15+
- Multiple config supports inside bitmapper
16+
- `macOSBigSur-White` CI added inside `build.yml`
17+
18+
### Changed
19+
20+
- Drop shadow removed from `plus.svg`
21+
- Key colors added inside `.svg` files
22+
- `builder/src` configured as dynamic comment and theme-name
23+
- `builder/Makefile` updated
24+
- `Makefile` with macOSBigSur-White cursor theme
25+
- `PULL_REQUEST_TEMPLATE.md` template updated
26+
1027
## [v1.1.6] - 13 Aug 2021
1128

1229
### Added
@@ -212,7 +229,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
212229
- Logo and badges
213230
- CI/CD Pipelines
214231

215-
[unreleased]: https://github.com/ful1e5/apple_cursor/compare/v1.1.6...main
232+
[unreleased]: https://github.com/ful1e5/apple_cursor/compare/v1.2.0...main
233+
[v1.2.0]: https://github.com/ful1e5/apple_cursor/compare/v1.1.6...v1.2.0
216234
[v1.1.6]: https://github.com/ful1e5/apple_cursor/compare/v1.1.5...v1.1.6
217235
[v1.1.5]: https://github.com/ful1e5/apple_cursor/compare/v1.1.4...v1.1.5
218236
[v1.1.4]: https://github.com/ful1e5/apple_cursor/compare/v1.1.3...v1.1.4

‎Makefile‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ windows: clean render bitmaps
1919

2020

2121
# Installation
22-
theme := macOSBigSur
23-
src := ./themes/$(theme)
22+
src := ./themes/
2423

2524
local := ~/.icons
2625
local_dest := $(local)/$(theme)
@@ -31,35 +30,42 @@ root_dest := $(root)/$(theme)
3130
.ONESHELL:
3231
SHELL:=/bin/bash
3332

33+
3434
install: $(src)
3535
@if [[ $EUID -ne 0 ]]; then
36-
@echo "> Installing '$(theme)' cursors inside $(local)/..."
36+
@echo "> Installing 'macOSBigSur' cursors inside $(local)/..."
3737
@mkdir -p $(local)
38-
@cp -r $(src) $(local_dest) && echo "> Installed!"
38+
@cp -r ./themes/macOSBigSur $(local_dest)
39+
@cp -r ./themes/macOSBigSur-White $(local_dest) && echo "> Installed!"
3940
@else
40-
@echo "> Installing '$(theme)' cursors inside $(root)/..."
41+
@echo "> Installing 'macOSBigSur' cursors inside $(root)/..."
4142
@mkdir -p $(root)
42-
@sudo cp -r $(src) $(root_dest) && echo "> Installed!"
43+
@sudo cp -r ./themes/macOSBigSur $(root_dest)
44+
@sudo cp -r ./themes/macOSBigSur-White $(root_dest) && echo "> Installed!"
4345
@fi
4446

4547
uninstall:
4648
@if [[ $EUID -ne 0 ]]; then
47-
@echo "> Removing '$(local_dest)'..."
48-
@rm -rf $(local_dest)
49+
@echo "> Removing 'macOSBigSur' from '$(local)'..."
50+
@rm -rf $(local)/macOSBigSur
51+
@rm -rf $(local)/macOSBigSur-White
4952
@else
50-
@echo "> Removing '$(root_dest)'..."
51-
@sudo rm -rf $(root_dest)
53+
@echo "> Removing 'macOSBigSur' from '$(root)'..."
54+
@rm -rf $(root)/macOSBigSur
55+
@rm -rf $(root)/macOSBigSur-White
5256
@fi
5357

5458
reinstall: uninstall install
5559

60+
# generates binaries
5661
BIN_DIR = ../bin
62+
THEMES = White
5763
prepare: bitmaps themes
58-
# Bitmaps
5964
@rm -rf bin && mkdir bin
6065
@cd bitmaps && zip -r $(BIN_DIR)/bitmaps.zip * && cd ..
61-
# Themes
6266
@cd themes
6367
@tar -czvf $(BIN_DIR)/macOSBigSur.tar.gz macOSBigSur
64-
@zip -r $(BIN_DIR)/macOSBigSur_Windows.zip macOSBigSur_Windows
68+
@zip -r $(BIN_DIR)/macOSBigSur-Windows.zip macOSBigSur-Windows
69+
@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/macOSBigSur-$(theme).tar.gz macOSBigSur-$(theme);)
70+
@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/macOSBigSur-$(theme)-Windows.zip macOSBigSur-$(theme)-Windows;)
6571
@cd ..

‎README.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- Branding -->
22
<p align="center">
3-
<img src="https://i.imgur.com/GVLFmwF.png" width="120" alt="macOS Big Sur" />
3+
<img src="https://imgur.com/pWbaCpA.png" width="120" alt="macOSBigSur" />
44
</p>
55

66
<p align="center">
@@ -134,11 +134,16 @@ sudo mv macOSBigSur /usr/share/icons/
134134
<!-- Preview -->
135135

136136
<p align="center">
137-
<img title="macOS Big Sur" src="https://imgur.com/7QYBFiK.png">
137+
<img title="macOSBigSur" src="https://imgur.com/JWdEEmD.png">
138138
</br>
139139
<sub>macOSBigSur Cursors 🍎</sub>
140140
</p>
141141

142+
<p align="center">
143+
<img title="macOSBigSur White" src="https://imgur.com/isFs6UM.png">
144+
</br>
145+
<sub>macOSBigSur White Cursors 🍎</sub>
146+
</p>
142147
<!-- Build Dependencies -->
143148

144149
# Dependencies

‎bitmapper/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "apple_cursor_bitmapper",
3-
"version": "1.1.6",
3+
"version": "1.2.0",
44
"main": "index.js",
55
"scripts": {
66
"render": "yarn ts-node src/index.ts"

‎bitmapper/src/config.ts‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
1-
import path from "path";
2-
import { readdirSync, existsSync } from "fs";
1+
import { Colors } from "./core/types";
32

4-
// Directory resolve
5-
const projectRoot = path.resolve(__dirname, "../../");
6-
7-
const outDir = path.resolve(projectRoot, "bitmaps");
8-
const staticSvgDir = path.resolve(projectRoot, "svg", "static");
9-
const animatedSvgDir = path.resolve(projectRoot, "svg", "animated");
10-
11-
// Generate a svg list
12-
if (!existsSync(staticSvgDir) || !existsSync(animatedSvgDir)) {
13-
throw new Error("svg directory not found");
3+
interface Config {
4+
themeName: string;
5+
color: Colors;
146
}
157

16-
const staticCursors = readdirSync(staticSvgDir).map((f) =>
17-
path.resolve(staticSvgDir, f)
18-
);
19-
const animatedCursors = readdirSync(animatedSvgDir).map((f) =>
20-
path.resolve(animatedSvgDir, f)
21-
);
8+
const black = "#000000";
9+
const white = "#FFFFFF";
10+
11+
const config: Config[] = [
12+
{
13+
themeName: "macOSBigSur",
14+
color: {
15+
base: black,
16+
outline: white,
17+
},
18+
},
19+
{
20+
themeName: "macOSBigSur-White",
21+
color: {
22+
base: white,
23+
outline: black,
24+
},
25+
},
26+
];
2227

23-
export { staticCursors, animatedCursors, outDir };
28+
export { config };

0 commit comments

Comments
 (0)