diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 31865842..bcb607f2 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -42,19 +42,19 @@ jobs: run: chmod +x ./gradlew - name: Build with Gradle - run: ./gradlew assembleDebug -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.keystore -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} + run: ./gradlew assembleAlpha -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.keystore -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} - name: Upload a Build Artifact uses: actions/upload-artifact@v3.0.0 with: name: Dantotsu - path: "app/build/outputs/apk/debug/app-debug.apk" + path: "app/build/outputs/apk/alpha/app-alpha.apk" - name: Upload APK to Discord shell: bash run: | contentbody=$( jq -Rsa . <<< "${{ github.event.head_commit.message }}" ) - curl -F "payload_json={\"content\":\" Debug-Build: <@719439449423085569> **${{ env.VERSION }}**\n\n${contentbody:1:-1}\"}" -F "dantotsu_debug=@app/build/outputs/apk/debug/app-debug.apk" ${{ secrets.DISCORD_WEBHOOK }} + curl -F "payload_json={\"content\":\" Alpha-Build: <@719439449423085569> **${{ env.VERSION }}**\n\n${contentbody:1:-1}\"}" -F "dantotsu_debug=@app/build/outputs/apk/debug/app-debug.apk" ${{ secrets.DISCORD_WEBHOOK }} - name: Delete Old Pre-Releases id: delete-pre-releases diff --git a/app/alpha/output-metadata.json b/app/alpha/output-metadata.json new file mode 100644 index 00000000..5a29bff1 --- /dev/null +++ b/app/alpha/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "ani.dantotsu.alpha", + "variantName": "alpha", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 28450261, + "versionName": "2.1.0-alpha01", + "outputFile": "app-alpha.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 99fc516c..f3b11dd3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,13 +21,20 @@ android { minSdk 23 targetSdk 34 versionCode ((System.currentTimeMillis() / 60000).toInteger()) - versionName "2.1.0-beta01-iv1" + versionName "2.1.0" signingConfig signingConfigs.debug } buildTypes { + alpha { + applicationIdSuffix ".alpha" + versionNameSuffix "-alpha01" + manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher_alpha", icon_placeholder_round: "@mipmap/ic_launcher_alpha_round"] + debuggable System.getenv("CI") == null + } debug { applicationIdSuffix ".beta" + versionNameSuffix "-beta01" manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher_beta", icon_placeholder_round: "@mipmap/ic_launcher_beta_round"] debuggable System.getenv("CI") == null } diff --git a/app/google-services.json b/app/google-services.json index 7e54b99a..b53de23d 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -43,6 +43,25 @@ } } }, + { + "client_info": { + "mobilesdk_app_id": "1:1039200814590:android:40e14720ee97917e1aacaf", + "android_client_info": { + "package_name": "ani.dantotsu.alpha" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCiXo_q4S2ofA5oCztsoLnlDqJi3GtTJjY" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:1039200814590:android:40e14720ee97917e1aacaf", diff --git a/app/src/alpha/res/values/strings.xml b/app/src/alpha/res/values/strings.xml new file mode 100644 index 00000000..3c0d72af --- /dev/null +++ b/app/src/alpha/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Dantotsu α + \ No newline at end of file diff --git a/app/src/main/ic_launcher_alpha-playstore.png b/app/src/main/ic_launcher_alpha-playstore.png new file mode 100644 index 00000000..f04b4256 Binary files /dev/null and b/app/src/main/ic_launcher_alpha-playstore.png differ diff --git a/app/src/main/res/drawable/ic_launcher_alpha_background.xml b/app/src/main/res/drawable/ic_launcher_alpha_background.xml new file mode 100644 index 00000000..5ae4b658 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_alpha_background.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_alpha_foreground.xml b/app/src/main/res/drawable/ic_launcher_alpha_foreground.xml new file mode 100644 index 00000000..ec82069f --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_alpha_foreground.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_alpha.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_alpha.xml new file mode 100644 index 00000000..724fe763 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_alpha.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_alpha_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_alpha_round.xml new file mode 100644 index 00000000..724fe763 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_alpha_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_alpha.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_alpha.webp new file mode 100644 index 00000000..60e7cb50 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_alpha.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_alpha_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_alpha_round.webp new file mode 100644 index 00000000..60e7cb50 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_alpha_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_alpha.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_alpha.webp new file mode 100644 index 00000000..ce08a3c5 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_alpha.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_alpha_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_alpha_round.webp new file mode 100644 index 00000000..ce08a3c5 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_alpha_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_alpha.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_alpha.webp new file mode 100644 index 00000000..dd040e74 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_alpha.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_alpha_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_alpha_round.webp new file mode 100644 index 00000000..dd040e74 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_alpha_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_alpha.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_alpha.webp new file mode 100644 index 00000000..67a977fa Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_alpha.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_alpha_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_alpha_round.webp new file mode 100644 index 00000000..67a977fa Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_alpha_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_alpha.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_alpha.webp new file mode 100644 index 00000000..efefca1d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_alpha.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_alpha_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_alpha_round.webp new file mode 100644 index 00000000..efefca1d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_alpha_round.webp differ