Skip to content

Commit 167d18b

Browse files
Mahmud0808Mahmud0808
authored
Merge pull request #155 from Mahmud0808/master
Merge master into fdroid
2 parents 850176b + 2173d07 commit 167d18b

File tree

83 files changed

+1896
-681
lines changed

Some content is hidden

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

83 files changed

+1896
-681
lines changed

‎.github/workflows/crowdin_download.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,24 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v4
2222

23+
- name: Generate translators table
24+
id: "translators"
25+
uses: andrii-bodnar/action-crowdin-contributors@v2
26+
with:
27+
contributors_per_line: 6
28+
max_contributors: 500
29+
image_size: 32
30+
min_words_contributed: 1
31+
files: ./docs/translators.md
32+
crowdin_project_link: 'https://crowdin.com/project/ColorBlendr'
33+
env:
34+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
35+
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
36+
37+
- name: Save translators in assets
38+
run:
39+
printf '%s\n' '${{ steps.translators.outputs.json_report }}' > ./app/src/main/assets/translators.json
40+
2341
- name: Download translations
2442
uses: crowdin/github-action@v1
2543
with:

‎.github/workflows/fetch_contributors.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Fetch Contributors
2+
3+
on:
4+
pull_request: # This will run the workflow on pull request events
5+
types:
6+
- closed
7+
workflow_dispatch: # This will run the workflow on manual trigger
8+
9+
permissions:
10+
contents: write
11+
12+
jobs:
13+
contrib-readme-job:
14+
name: Fetch and update contributors list
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Fetch contributors list
22+
uses: akhilmhdh/[email protected]
23+
with:
24+
image_size: 100
25+
readme_path: "docs/contributors.md"
26+
collaborators: all
27+
columns_per_row: 6
28+
commit_message: "Update contributors.md"
29+
committer_username: "Mahmud0808"
30+
committer_email: "[email protected]"
31+
pr_title_on_protected: "Update contributors list"
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
34+
35+
- name: Save contributors in assets
36+
if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true
37+
run: |
38+
printf '%s\n' $(curl "https://api.github.com/repos/Mahmud0808/ColorBlendr/contributors") > ./app/src/main/assets/contributors.json
39+
40+
- name: Commit changes and push
41+
uses: github-actions-x/[email protected]
42+
with:
43+
github-token: ${{ secrets.GH_TOKEN }}
44+
push-branch: 'master'
45+
commit-message: 'ci: update contributors.json'
46+
force-add: 'true'
47+
files: app/src/main/assets/contributors.json
48+
name: Mahmud0808
49+
email: [email protected]
50+
rebase: 'true'

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,4 @@ Elevate your creativity with effortless material customization. Instantly tweak
9595

9696
- [@siavash79](https://github.com/siavash79) for helping me.
9797
- [@fennifith](https://github.com/fennifith) for color picker.
98+
- And everyone who [contributed](https://github.com/Mahmud0808/ColorBlendr/blob/master/docs/contributors.md) and [translated](https://github.com/Mahmud0808/ColorBlendr/blob/master/docs/translators.md)... :)

‎app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ plugins {
88

99
android {
1010
namespace = "com.drdisagree.colorblendr"
11-
compileSdk = 34
11+
compileSdk = 35
1212

1313
defaultConfig {
1414
minSdk = 31
1515
targetSdk = 35
16-
versionCode = 17
17-
versionName = "v1.9"
16+
versionCode = 18
17+
versionName = "v1.10"
1818
}
1919

2020
buildTypes {

‎app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
android:name="android.permission.QUERY_ALL_PACKAGES"
2424
tools:ignore="QueryAllPackagesPermission" />
2525
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
26+
<uses-permission android:name="android.permission.INTERNET" />
2627

2728
<queries>
2829
<intent>

‎app/src/main/assets/contributors.json

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
[
2+
{
3+
"login":
4+
"Mahmud0808",
5+
"id":
6+
29881338,
7+
"node_id":
8+
"MDQ6VXNlcjI5ODgxMzM4",
9+
"avatar_url":
10+
"https://avatars.githubusercontent.com/u/29881338?v=4",
11+
"gravatar_id":
12+
"",
13+
"url":
14+
"https://api.github.com/users/Mahmud0808",
15+
"html_url":
16+
"https://github.com/Mahmud0808",
17+
"followers_url":
18+
"https://api.github.com/users/Mahmud0808/followers",
19+
"following_url":
20+
"https://api.github.com/users/Mahmud0808/following{/other_user}",
21+
"gists_url":
22+
"https://api.github.com/users/Mahmud0808/gists{/gist_id}",
23+
"starred_url":
24+
"https://api.github.com/users/Mahmud0808/starred{/owner}{/repo}",
25+
"subscriptions_url":
26+
"https://api.github.com/users/Mahmud0808/subscriptions",
27+
"organizations_url":
28+
"https://api.github.com/users/Mahmud0808/orgs",
29+
"repos_url":
30+
"https://api.github.com/users/Mahmud0808/repos",
31+
"events_url":
32+
"https://api.github.com/users/Mahmud0808/events{/privacy}",
33+
"received_events_url":
34+
"https://api.github.com/users/Mahmud0808/received_events",
35+
"type":
36+
"User",
37+
"user_view_type":
38+
"public",
39+
"site_admin":
40+
false,
41+
"contributions":
42+
459
43+
},
44+
{
45+
"login":
46+
"crowdin-bot",
47+
"id":
48+
58779643,
49+
"node_id":
50+
"MDQ6VXNlcjU4Nzc5NjQz",
51+
"avatar_url":
52+
"https://avatars.githubusercontent.com/u/58779643?v=4",
53+
"gravatar_id":
54+
"",
55+
"url":
56+
"https://api.github.com/users/crowdin-bot",
57+
"html_url":
58+
"https://github.com/crowdin-bot",
59+
"followers_url":
60+
"https://api.github.com/users/crowdin-bot/followers",
61+
"following_url":
62+
"https://api.github.com/users/crowdin-bot/following{/other_user}",
63+
"gists_url":
64+
"https://api.github.com/users/crowdin-bot/gists{/gist_id}",
65+
"starred_url":
66+
"https://api.github.com/users/crowdin-bot/starred{/owner}{/repo}",
67+
"subscriptions_url":
68+
"https://api.github.com/users/crowdin-bot/subscriptions",
69+
"organizations_url":
70+
"https://api.github.com/users/crowdin-bot/orgs",
71+
"repos_url":
72+
"https://api.github.com/users/crowdin-bot/repos",
73+
"events_url":
74+
"https://api.github.com/users/crowdin-bot/events{/privacy}",
75+
"received_events_url":
76+
"https://api.github.com/users/crowdin-bot/received_events",
77+
"type":
78+
"User",
79+
"user_view_type":
80+
"public",
81+
"site_admin":
82+
false,
83+
"contributions":
84+
43
85+
},
86+
{
87+
"login":
88+
"HiFIi",
89+
"id":
90+
7686387,
91+
"node_id":
92+
"MDQ6VXNlcjc2ODYzODc=",
93+
"avatar_url":
94+
"https://avatars.githubusercontent.com/u/7686387?v=4",
95+
"gravatar_id":
96+
"",
97+
"url":
98+
"https://api.github.com/users/HiFIi",
99+
"html_url":
100+
"https://github.com/HiFIi",
101+
"followers_url":
102+
"https://api.github.com/users/HiFIi/followers",
103+
"following_url":
104+
"https://api.github.com/users/HiFIi/following{/other_user}",
105+
"gists_url":
106+
"https://api.github.com/users/HiFIi/gists{/gist_id}",
107+
"starred_url":
108+
"https://api.github.com/users/HiFIi/starred{/owner}{/repo}",
109+
"subscriptions_url":
110+
"https://api.github.com/users/HiFIi/subscriptions",
111+
"organizations_url":
112+
"https://api.github.com/users/HiFIi/orgs",
113+
"repos_url":
114+
"https://api.github.com/users/HiFIi/repos",
115+
"events_url":
116+
"https://api.github.com/users/HiFIi/events{/privacy}",
117+
"received_events_url":
118+
"https://api.github.com/users/HiFIi/received_events",
119+
"type":
120+
"User",
121+
"user_view_type":
122+
"public",
123+
"site_admin":
124+
false,
125+
"contributions":
126+
2
127+
},
128+
{
129+
"login":
130+
"yurtpage",
131+
"id":
132+
155876573,
133+
"node_id":
134+
"U_kgDOCUp83Q",
135+
"avatar_url":
136+
"https://avatars.githubusercontent.com/u/155876573?v=4",
137+
"gravatar_id":
138+
"",
139+
"url":
140+
"https://api.github.com/users/yurtpage",
141+
"html_url":
142+
"https://github.com/yurtpage",
143+
"followers_url":
144+
"https://api.github.com/users/yurtpage/followers",
145+
"following_url":
146+
"https://api.github.com/users/yurtpage/following{/other_user}",
147+
"gists_url":
148+
"https://api.github.com/users/yurtpage/gists{/gist_id}",
149+
"starred_url":
150+
"https://api.github.com/users/yurtpage/starred{/owner}{/repo}",
151+
"subscriptions_url":
152+
"https://api.github.com/users/yurtpage/subscriptions",
153+
"organizations_url":
154+
"https://api.github.com/users/yurtpage/orgs",
155+
"repos_url":
156+
"https://api.github.com/users/yurtpage/repos",
157+
"events_url":
158+
"https://api.github.com/users/yurtpage/events{/privacy}",
159+
"received_events_url":
160+
"https://api.github.com/users/yurtpage/received_events",
161+
"type":
162+
"User",
163+
"user_view_type":
164+
"public",
165+
"site_admin":
166+
false,
167+
"contributions":
168+
1
169+
}
170+
]

0 commit comments

Comments
 (0)