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

Move async utils to rboardcomponents, animated splashscreen icon, animation speed,interpolator #143

Merged
38 commits merged into from
Nov 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
18ea24d
Move async utils to rboardcomponents, animated splashscreen icon, ani…
AkosPaha01 Sep 18, 2022
22ac4b2
Add back app style below Android 10. Splash animation speed
AkosPaha01 Sep 19, 2022
b839a0a
Update HU Translation
AkosPaha01 Sep 20, 2022
462ff29
Update Android Studio
AkosPaha01 Sep 21, 2022
5bee5f5
Merge branch 'rCompatible' into rCompatible-Dev
AkosPaha01 Sep 24, 2022
9c8d770
Move async utils to rboardcomponents,
AkosPaha01 Sep 24, 2022
4746016
Update Libs
AkosPaha01 Oct 10, 2022
0c592a8
Add Debug apk for rCompatible (Test)
AkosPaha01 Oct 10, 2022
51e50ba
Add Debug apk for rCompatible Fix (Test)
AkosPaha01 Oct 10, 2022
5776700
Add Debug apk for rCompatible
AkosPaha01 Oct 10, 2022
351edda
Fix download link
AkosPaha01 Oct 10, 2022
f100ceb
Update gradle
AkosPaha01 Oct 10, 2022
26a0597
Fix Traditional Chinese and Simplified Chinese, Update Dependencies
AkosPaha01 Oct 28, 2022
7859d95
Update mathc
AkosPaha01 Oct 28, 2022
7f38416
Change font to google-sans-text
AkosPaha01 Oct 29, 2022
f491088
Force the app to Portrait mode
AkosPaha01 Oct 30, 2022
c8535df
Update Portuguese translation
DoctorStrange96 Nov 1, 2022
4e984cc
Fix Portuguese translation file
AkosPaha01 Nov 1, 2022
1ececee
Update Portuguese translation
AkosPaha01 Nov 1, 2022
eefe770
Update Portuguese & French translations, App style fix
AkosPaha01 Nov 1, 2022
a87fd5d
Update Workflow file
AkosPaha01 Nov 1, 2022
51a834c
Update pullRequest.yml
AkosPaha01 Nov 2, 2022
579071c
Merge pull request #152 from DerTyp7214/AkosPaha-patch-1
AkosPaha01 Nov 2, 2022
d58046e
Update README.md
AkosPaha01 Nov 2, 2022
e241525
Update pullRequest.yml
AkosPaha01 Nov 2, 2022
01ee7a2
Merge pull request #153 from DerTyp7214/AkosPaha-patch-1
AkosPaha01 Nov 2, 2022
46d8882
Update rboardcomponents
AkosPaha01 Nov 2, 2022
8f6eca6
Update Wrapper
AkosPaha01 Nov 2, 2022
c614dcc
Merge pull request #154 from DerTyp7214/rCompatible-Dev-pattch-1
AkosPaha01 Nov 2, 2022
a300f28
Update French Translation
AkosPaha01 Nov 2, 2022
ebb9da0
Update French Translation
AkosPaha01 Nov 2, 2022
19bd2cb
Update AGP
AkosPaha01 Nov 2, 2022
f988435
Merge branch 'rCompatible-Dev' into rCompatible-Dev-AGP
AkosPaha01 Nov 2, 2022
62a4ca6
Update AGP
AkosPaha01 Nov 2, 2022
0a54261
Navigation bar color change
AkosPaha01 Nov 2, 2022
5d7d564
Workflow
AkosPaha01 Nov 2, 2022
86b6a62
Update pullRequest.yml
AkosPaha01 Nov 2, 2022
f8c9a38
Merge pull request #157 from DerTyp7214/rComp-Navbar-fix
AkosPaha01 Nov 2, 2022
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
174 changes: 151 additions & 23 deletions .github/workflows/buildCi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3.0.2
uses: actions/checkout@v3.1.0
with:
submodules: recursive

- uses: nttld/setup-ndk@v1.0.6
- uses: nttld/setup-ndk@v1.2.0
with:
ndk-version: r24
ndk-version: r25b

- name: Get Commit Message
id: commitMessage
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.6.0
with:
distribution: temurin
java-version: 17

- name: Cache Gradle dependencies
uses: actions/cache@v3.0.5
uses: actions/cache@v3.0.11
if: ${{ false }}
with:
path: |
Expand All @@ -52,7 +52,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-

- name: Cache build cache
uses: actions/cache@v3.0.5
uses: actions/cache@v3.0.11
with:
path: |
${{ github.workspace }}/.ccache
Expand All @@ -73,7 +73,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.2.1
uses: gradle/gradle-build-action@v2.3.3
with:
gradle-version: wrapper
arguments: assembleDebug
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
run: mv app/build/outputs/apk/debug/app-debug-signed.apk app/build/outputs/apk/debug/app-debug.apk

- name: Upload Artifact
uses: actions/upload-artifact@v3.1.0
uses: actions/upload-artifact@v3.1.1
with:
name: Debug Artifact
path: app/build/outputs/apk/debug/app-debug.apk
Expand Down Expand Up @@ -147,30 +147,30 @@ jobs:
data: '{"to": "/topics/update-v3-debug","data": {"version": ${{ fromJson(steps.metadataJson.outputs.json).elements[0].versionCode }},"type": "update","notification": {"body": "Update available. ${{ steps.commitMessage.outputs.message }}","title": "Update"}}}'
buildRCompatible:
name: Build Ci APK from rCompatible
if: startsWith(github.ref, 'refs/heads/rCompatible')
if: github.ref == 'refs/heads/rCompatible'
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3.0.2
uses: actions/checkout@v3.1.0
with:
submodules: recursive

- uses: nttld/setup-ndk@v1.0.6
- uses: nttld/setup-ndk@v1.2.0
with:
ndk-version: r24
ndk-version: r25b

- name: Get Commit Message
id: commitMessage
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v3.4.1
uses: actions/setup-java@v3.6.0
with:
distribution: temurin
java-version: 17

- name: Cache Gradle dependencies
uses: actions/cache@v3.0.5
uses: actions/cache@v3.0.11
if: ${{ false }}
with:
path: |
Expand All @@ -181,7 +181,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-

- name: Cache build cache
uses: actions/cache@v3.0.5
uses: actions/cache@v3.0.11
with:
path: |
${{ github.workspace }}/.ccache
Expand All @@ -202,7 +202,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.2.1
uses: gradle/gradle-build-action@v2.3.3
with:
gradle-version: wrapper
arguments: assembleRelease
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk app/build/outputs/apk/release/app-release.apk

- name: Upload Artifact
uses: actions/upload-artifact@v3.1.0
uses: actions/upload-artifact@v3.1.1
with:
name: Debug Artifact
path: app/build/outputs/apk/release/app-release.apk
Expand Down Expand Up @@ -263,13 +263,9 @@ jobs:
app/build/outputs/apk/release/app-release.apk
app/build/outputs/apk/release/output-metadata.json

- name: Send Telegram message
if: steps.extract_branch.outputs.BRANCH_NAME == 'rCompatible-Dev'
run: "curl --location --request POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' --header 'Content-Type:application/json' --data-raw '{\"chat_id\":\"${{ secrets.TELEGRAM_CHANNEL_ID }}\",\"text\":\"**${{ steps.extract_branch.outputs.BRANCH_NAME }}**\\n\\ncommit: `${{ github.event.head_commit.message }}` [${{ github.event.head_commit.id }}](${{ github.event.head_commit.url }})\",\"parse_mode\":\"markdown\"}}'"

- name: Send Telegram message
if: steps.extract_branch.outputs.BRANCH_NAME == 'rCompatible'
run: "curl --location --request POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' --header 'Content-Type:application/json' --data-raw '{\"chat_id\":\"${{ secrets.TELEGRAM_CHANNEL_ID }}\",\"text\":\"**${{ steps.extract_branch.outputs.BRANCH_NAME }}**\\n\\ncommit: `${{ github.event.head_commit.message }}` [${{ github.event.head_commit.id }}](${{ github.event.head_commit.url }})\",\"parse_mode\":\"markdown\",\"reply_markup\":{\"inline_keyboard\":[[{\"text\":\"Download A6+\",\"url\":\"https://github.com/DerTyp7214/RboardThemeManagerV3/releases/download/latest-rCompatible/app-release.apk\"}]]}}'"
run: "curl --location --request POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' --header 'Content-Type:application/json' --data-raw '{\"chat_id\":\"${{ secrets.TELEGRAM_CHANNEL_ID }}\",\"text\":\"**${{ steps.extract_branch.outputs.BRANCH_NAME }}**\\n\\ncommit: `${{ github.event.head_commit.message }}` [${{ github.event.head_commit.id }}](${{ github.event.head_commit.url }})\",\"parse_mode\":\"markdown\",\"reply_markup\":{\"inline_keyboard\":[[{\"text\":\"Download A6+ Release\",\"url\":\"https://github.com/DerTyp7214/RboardThemeManagerV3/releases/download/latest-rCompatible/app-release.apk\"}]]}}'"

- name: Send Telegram message
if: steps.extract_branch.outputs.BRANCH_NAME == 'rCompatible'
Expand All @@ -282,4 +278,136 @@ jobs:
url: 'https://fcm.googleapis.com/fcm/send'
method: 'POST'
customHeaders: '{"Authorization":"key=${{ secrets.FCM_KEY }}"}'
data: '{"to": "/topics/update-v3-r-release","data": {"version": ${{ fromJson(steps.metadataJson.outputs.json).elements[0].versionCode }},"type": "update","notification": {"body": "Update available. ${{ steps.commitMessage.outputs.message }}","title": "Update"}}}'
data: '{"to": "/topics/update-v3-r-release","data": {"version": ${{ fromJson(steps.metadataJson.outputs.json).elements[0].versionCode }},"type": "update","notification": {"body": "Update available. ${{ steps.commitMessage.outputs.message }}","title": "Update"}}}'

buildRCompatible-Dev:
name: Build Ci APK from rCompatible-Dev
if: startsWith(github.ref, 'refs/heads/rCompatible-Dev')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3.1.0
with:
submodules: recursive

- uses: nttld/setup-ndk@v1.2.0
with:
ndk-version: r25b

- name: Get Commit Message
id: commitMessage
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v3.6.0
with:
distribution: temurin
java-version: 17

- name: Cache Gradle dependencies
uses: actions/cache@v3.0.11
if: ${{ false }}
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
!~/.gradle/caches/build-cache-*
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
restore-keys: ${{ runner.os }}-gradle-

- name: Cache build cache
uses: actions/cache@v3.0.11
with:
path: |
${{ github.workspace }}/.ccache
~/.gradle/caches/build-cache-*
key: ${{ runner.os }}-build-cache-${{ github.sha }}
restore-keys: ${{ runner.os }}-build-cache-

- name: Extract branch name
shell: bash
run: echo "::set-output name=BRANCH_NAME::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
id: extract_branch

- name: File Permissions
run: chmod +x gradlew

- name: Accept Preview SDK License
run: echo -n -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > /usr/local/lib/android/sdk/licenses/android-sdk-preview-license

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.3.3
with:
gradle-version: wrapper
arguments: assembleDebug

- name: Get JSON
id: metadataJson
run: |
content=`cat app/build/outputs/apk/debug/output-metadata.json`
content="${content//'%'/'%25'}"
content="${content//$'\n'/'%0A'}"
content="${content//$'\r'/'%0D'}"
echo "::set-output name=json::$content"


- name: Sign artifact
id: signArtifact
uses: r0adkll/sign-android-release@v1
with:
releaseDirectory: app/build/outputs/apk/debug
alias: ${{ secrets.KEYALIAS }}
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
BUILD_TOOLS_VERSION: "33.0.0"

- name: Rename APK
run: mv app/build/outputs/apk/debug/app-debug-signed.apk app/build/outputs/apk/debug/app-debug.apk

- name: Upload Artifact
uses: actions/upload-artifact@v3.1.1
with:
name: Debug Artifact
path: app/build/outputs/apk/debug/app-debug.apk

- name: Create new Release
if: steps.extract_branch.outputs.BRANCH_NAME == 'rCompatible-Dev'
id: create_release
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
automatic_release_tag: ${{ fromJson(steps.metadataJson.outputs.json).elements[0].versionName }}-rCompatible-debug
prerelease: true
title: Rboard Manager Development ${{ fromJson(steps.metadataJson.outputs.json).elements[0].versionName }}
files: |
app/build/outputs/apk/debug/app-debug.apk
app/build/outputs/apk/debug/output-metadata.json

- name: Create new Release
if: steps.extract_branch.outputs.BRANCH_NAME == 'rCompatible-Dev'
id: create_latest_release
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
automatic_release_tag: latest-rCompatible-debug
prerelease: true
title: Rboard Manager Development ${{ fromJson(steps.metadataJson.outputs.json).elements[0].versionName }}
files: |
app/build/outputs/apk/debug/app-debug.apk
app/build/outputs/apk/debug/output-metadata.json

- name: Send Telegram message
if: steps.extract_branch.outputs.BRANCH_NAME == 'rCompatible-Dev'
run: "curl --location --request POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' --header 'Content-Type:application/json' --data-raw '{\"chat_id\":\"${{ secrets.TELEGRAM_CHANNEL_ID }}\",\"text\":\"**${{ steps.extract_branch.outputs.BRANCH_NAME }}**\\n\\ncommit: `${{ github.event.head_commit.message }}` [${{ github.event.head_commit.id }}](${{ github.event.head_commit.url }})\",\"parse_mode\":\"markdown\",\"reply_markup\":{\"inline_keyboard\":[[{\"text\":\"Download A6+ Debug\",\"url\":\"https://github.com/DerTyp7214/RboardThemeManagerV3/releases/download/latest-rCompatible-debug/app-debug.apk\"}]]}}'"

- name: Send Notification
if: steps.extract_branch.outputs.BRANCH_NAME == 'rCompatible-Dev'
uses: fjogeleit/http-request-action@master
with:
url: 'https://fcm.googleapis.com/fcm/send'
method: 'POST'
customHeaders: '{"Authorization":"key=${{ secrets.FCM_KEY }}"}'
data: '{"to": "/topics/update-v3-r-debug","data": {"version": ${{ fromJson(steps.metadataJson.outputs.json).elements[0].versionCode }},"type": "update","notification": {"body": "Update available. ${{ steps.commitMessage.outputs.message }}","title": "Update"}}}'
14 changes: 7 additions & 7 deletions .github/workflows/buildPro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3.0.2
uses: actions/checkout@v3.1.0
with:
submodules: recursive

- uses: nttld/setup-ndk@v1
- uses: nttld/setup-ndk@v1.2.0
with:
ndk-version: r23
ndk-version: r25b

- name: Get Commit Message
id: commitMessage
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v3.4.1
uses: actions/cache@v3.0.11
with:
distribution: temurin
java-version: 17

- name: Cache Gradle dependencies
uses: actions/cache@v2
uses: actions/cache@v3.0.11
with:
path: |
~/.gradle/caches
Expand All @@ -54,7 +54,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.2.1
uses: gradle/gradle-build-action@v2.3.3
with:
gradle-version: wrapper
arguments: assemblePro
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
run: mv app/build/outputs/apk/pro/app-pro-unsigned-signed.apk app/build/outputs/apk/pro/app-pro.apk

- name: Upload Artifact
uses: actions/upload-artifact@v3.1.0
uses: actions/upload-artifact@v3.1.1
with:
name: Release Artifact
path: app/build/outputs/apk/pro/app-pro.apk
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/createPullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3.0.2
uses: actions/checkout@v3.1.0
with:
submodules: recursive
fetch-depth: 0
Expand All @@ -21,7 +21,7 @@ jobs:
mkdir -p .tmp
curl -LsS https://raw.githubusercontent.com/DerTyp7214/DerTyp7214/main/PULL_REQUEST_TEMPLATE.md -o .tmp/PULL_REQUEST_TEMPLATE.md
- name: Create Pull Request
uses: devops-infra/action-pull-request@v0.4.2
uses: devops-infra/action-pull-request@v0.5.1
with:
github_token: ${{ secrets.REPO_SCOPED_TOKEN }}
template: .tmp/PULL_REQUEST_TEMPLATE.md
Expand Down
Loading