Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into fdroid #155

Merged
merged 35 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
97c197a
New Crowdin translations by GitHub Action
crowdin-bot Nov 3, 2024
e627972
Merge pull request #147 from Mahmud0808/localization
Mahmud0808 Nov 4, 2024
60fcfc7
New Crowdin translations by GitHub Action
crowdin-bot Nov 10, 2024
fc7ce28
Bump compileSdk to 35
Mahmud0808 Nov 11, 2024
7d0bab0
Bump AGP & dependencies
Mahmud0808 Nov 11, 2024
09dafc2
Merge pull request #148 from Mahmud0808/localization
Mahmud0808 Nov 11, 2024
c396e03
Enhance code clarity and fix annotations
Mahmud0808 Nov 13, 2024
50f7101
Dynamically parse contributors and translators
Mahmud0808 Nov 16, 2024
ce921e6
Update contributors.md
Mahmud0808 Nov 16, 2024
1ec953b
Fix workflow branch name
Mahmud0808 Nov 16, 2024
4c690aa
Update contributors.json
Mahmud0808 Nov 16, 2024
87251df
New Crowdin translations by GitHub Action
crowdin-bot Nov 16, 2024
f222715
Update README.md
Mahmud0808 Nov 16, 2024
c335cf5
Merge pull request #150 from Mahmud0808/localization
Mahmud0808 Nov 16, 2024
226bae7
Fix commit list url
Mahmud0808 Nov 16, 2024
27f3ed8
New Crowdin translations by GitHub Action
crowdin-bot Nov 24, 2024
9f92aa1
Merge pull request #151 from Mahmud0808/localization
Mahmud0808 Nov 24, 2024
0bbbf55
Update contributors.json
Mahmud0808 Nov 24, 2024
e4e722a
New Crowdin translations by GitHub Action
crowdin-bot Dec 1, 2024
27defb2
Merge pull request #153 from Mahmud0808/localization
Mahmud0808 Dec 4, 2024
8d43ad4
Update contributors.json
Mahmud0808 Dec 4, 2024
57f2e10
Refactor packages
Mahmud0808 Dec 4, 2024
d483c7e
Fix pixel launcher search bar color (closes #146)
Mahmud0808 Dec 4, 2024
261861a
Add todo for google app color
Mahmud0808 Dec 4, 2024
ec1ee2d
Change all accents if accurate shade is disabled
Mahmud0808 Dec 4, 2024
bb4bc32
Bump AGP
Mahmud0808 Dec 4, 2024
e518889
Revert "Add todo for google app color"
Mahmud0808 Dec 6, 2024
e047664
New Crowdin translations by GitHub Action
crowdin-bot Dec 8, 2024
d72b6de
Merge pull request #154 from Mahmud0808/localization
Mahmud0808 Dec 8, 2024
132186b
Update contributors.json
Mahmud0808 Dec 8, 2024
ea6f5b5
Improve updating live wallpaper colors
Mahmud0808 Dec 8, 2024
602744a
Merge remote-tracking branch 'origin/master'
Mahmud0808 Dec 8, 2024
c3e0a36
Update contributors.json
Mahmud0808 Dec 8, 2024
b7e1e2f
Update contributor workflow
Mahmud0808 Dec 8, 2024
2173d07
Bump version code
Mahmud0808 Dec 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/crowdin_download.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Generate translators table
id: "translators"
uses: andrii-bodnar/action-crowdin-contributors@v2
with:
contributors_per_line: 6
max_contributors: 500
image_size: 32
min_words_contributed: 1
files: ./docs/translators.md
crowdin_project_link: 'https://crowdin.com/project/ColorBlendr'
env:
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

- name: Save translators in assets
run:
printf '%s\n' '${{ steps.translators.outputs.json_report }}' > ./app/src/main/assets/translators.json

- name: Download translations
uses: crowdin/github-action@v1
with:
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/fetch_contributors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Fetch Contributors

on:
pull_request: # This will run the workflow on pull request events
types:
- closed
workflow_dispatch: # This will run the workflow on manual trigger

permissions:
contents: write

jobs:
contrib-readme-job:
name: Fetch and update contributors list
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Fetch contributors list
uses: akhilmhdh/[email protected]
with:
image_size: 100
readme_path: "docs/contributors.md"
collaborators: all
columns_per_row: 6
commit_message: "Update contributors.md"
committer_username: "Mahmud0808"
committer_email: "[email protected]"
pr_title_on_protected: "Update contributors list"
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

- name: Save contributors in assets
if: github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true
run: |
printf '%s\n' $(curl "https://api.github.com/repos/Mahmud0808/ColorBlendr/contributors") > ./app/src/main/assets/contributors.json

- name: Commit changes and push
uses: github-actions-x/[email protected]
with:
github-token: ${{ secrets.GH_TOKEN }}
push-branch: 'master'
commit-message: 'ci: update contributors.json'
force-add: 'true'
files: app/src/main/assets/contributors.json
name: Mahmud0808
email: [email protected]
rebase: 'true'
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,4 @@ Elevate your creativity with effortless material customization. Instantly tweak

- [@siavash79](https://github.com/siavash79) for helping me.
- [@fennifith](https://github.com/fennifith) for color picker.
- 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)... :)
6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ plugins {

android {
namespace = "com.drdisagree.colorblendr"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 31
targetSdk = 35
versionCode = 17
versionName = "v1.9"
versionCode = 18
versionName = "v1.10"
}

buildTypes {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.INTERNET" />

<queries>
<intent>
Expand Down
170 changes: 170 additions & 0 deletions app/src/main/assets/contributors.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
[
{
"login":
"Mahmud0808",
"id":
29881338,
"node_id":
"MDQ6VXNlcjI5ODgxMzM4",
"avatar_url":
"https://avatars.githubusercontent.com/u/29881338?v=4",
"gravatar_id":
"",
"url":
"https://api.github.com/users/Mahmud0808",
"html_url":
"https://github.com/Mahmud0808",
"followers_url":
"https://api.github.com/users/Mahmud0808/followers",
"following_url":
"https://api.github.com/users/Mahmud0808/following{/other_user}",
"gists_url":
"https://api.github.com/users/Mahmud0808/gists{/gist_id}",
"starred_url":
"https://api.github.com/users/Mahmud0808/starred{/owner}{/repo}",
"subscriptions_url":
"https://api.github.com/users/Mahmud0808/subscriptions",
"organizations_url":
"https://api.github.com/users/Mahmud0808/orgs",
"repos_url":
"https://api.github.com/users/Mahmud0808/repos",
"events_url":
"https://api.github.com/users/Mahmud0808/events{/privacy}",
"received_events_url":
"https://api.github.com/users/Mahmud0808/received_events",
"type":
"User",
"user_view_type":
"public",
"site_admin":
false,
"contributions":
459
},
{
"login":
"crowdin-bot",
"id":
58779643,
"node_id":
"MDQ6VXNlcjU4Nzc5NjQz",
"avatar_url":
"https://avatars.githubusercontent.com/u/58779643?v=4",
"gravatar_id":
"",
"url":
"https://api.github.com/users/crowdin-bot",
"html_url":
"https://github.com/crowdin-bot",
"followers_url":
"https://api.github.com/users/crowdin-bot/followers",
"following_url":
"https://api.github.com/users/crowdin-bot/following{/other_user}",
"gists_url":
"https://api.github.com/users/crowdin-bot/gists{/gist_id}",
"starred_url":
"https://api.github.com/users/crowdin-bot/starred{/owner}{/repo}",
"subscriptions_url":
"https://api.github.com/users/crowdin-bot/subscriptions",
"organizations_url":
"https://api.github.com/users/crowdin-bot/orgs",
"repos_url":
"https://api.github.com/users/crowdin-bot/repos",
"events_url":
"https://api.github.com/users/crowdin-bot/events{/privacy}",
"received_events_url":
"https://api.github.com/users/crowdin-bot/received_events",
"type":
"User",
"user_view_type":
"public",
"site_admin":
false,
"contributions":
43
},
{
"login":
"HiFIi",
"id":
7686387,
"node_id":
"MDQ6VXNlcjc2ODYzODc=",
"avatar_url":
"https://avatars.githubusercontent.com/u/7686387?v=4",
"gravatar_id":
"",
"url":
"https://api.github.com/users/HiFIi",
"html_url":
"https://github.com/HiFIi",
"followers_url":
"https://api.github.com/users/HiFIi/followers",
"following_url":
"https://api.github.com/users/HiFIi/following{/other_user}",
"gists_url":
"https://api.github.com/users/HiFIi/gists{/gist_id}",
"starred_url":
"https://api.github.com/users/HiFIi/starred{/owner}{/repo}",
"subscriptions_url":
"https://api.github.com/users/HiFIi/subscriptions",
"organizations_url":
"https://api.github.com/users/HiFIi/orgs",
"repos_url":
"https://api.github.com/users/HiFIi/repos",
"events_url":
"https://api.github.com/users/HiFIi/events{/privacy}",
"received_events_url":
"https://api.github.com/users/HiFIi/received_events",
"type":
"User",
"user_view_type":
"public",
"site_admin":
false,
"contributions":
2
},
{
"login":
"yurtpage",
"id":
155876573,
"node_id":
"U_kgDOCUp83Q",
"avatar_url":
"https://avatars.githubusercontent.com/u/155876573?v=4",
"gravatar_id":
"",
"url":
"https://api.github.com/users/yurtpage",
"html_url":
"https://github.com/yurtpage",
"followers_url":
"https://api.github.com/users/yurtpage/followers",
"following_url":
"https://api.github.com/users/yurtpage/following{/other_user}",
"gists_url":
"https://api.github.com/users/yurtpage/gists{/gist_id}",
"starred_url":
"https://api.github.com/users/yurtpage/starred{/owner}{/repo}",
"subscriptions_url":
"https://api.github.com/users/yurtpage/subscriptions",
"organizations_url":
"https://api.github.com/users/yurtpage/orgs",
"repos_url":
"https://api.github.com/users/yurtpage/repos",
"events_url":
"https://api.github.com/users/yurtpage/events{/privacy}",
"received_events_url":
"https://api.github.com/users/yurtpage/received_events",
"type":
"User",
"user_view_type":
"public",
"site_admin":
false,
"contributions":
1
}
]
Loading
Loading