From 07793b11d666cc98eaa7603c3e952f2d0e09752a Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 00:26:28 +0600 Subject: [PATCH 001/153] Added a GitHub runner and uploads it to discord --- .github/workflows/beta.yml | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/beta.yml diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml new file mode 100644 index 00000000..9e8f3f3d --- /dev/null +++ b/.github/workflows/beta.yml @@ -0,0 +1,57 @@ +name: Build APK and Notify Discord + +on: + push: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repo + uses: actions/checkout@v3 + + - name: Set variables + run: | + VER=$(grep -E -o "versionName \".*\"" app/build.gradle | sed -e 's/versionName //g' | tr -d '"') + SHA=${{ github.sha }} + VERSION="$VER.${SHA:0:7}" + echo "Version $VERSION" + echo "VERSION=$VERSION" >> $GITHUB_ENV + + - name: Setup JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 17 + cache: gradle + + - name: Make gradlew executable + run: chmod +x ./gradlew + + - name: Build with Gradle + run: ./gradlew assembleDebug + + - name: Upload a Build Artifact + uses: actions/upload-artifact@v3.0.0 + with: + name: Dantotsu + path: "app/build/outputs/apk/debug/app-debug.apk" + + - name: Upload APK to Discord + shell: bash + run: | + contentbody=$( jq -Rsa . <<< "${{ github.event.head_commit.message }}" ) + curl -F "payload_json={\"content\":\" everyone **${{ 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 + uses: sgpublic/delete-release-action@master + with: + pre-release-drop: true + pre-release-keep-count: 3 + pre-release-drop-tag: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9a4ed7ad540518f3f765811a8af20baaebe7427e Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 00:36:52 +0600 Subject: [PATCH 002/153] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 5e3cf66b..94e231f7 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version" + classpath 'com.google.gms:google-services:3.0.0' classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version" } } From f81c566f1271b3275f7c8283c8ef3aaa9076447b Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 00:38:59 +0600 Subject: [PATCH 003/153] Update build.gradle --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 94e231f7..edbc4671 100644 --- a/build.gradle +++ b/build.gradle @@ -13,13 +13,12 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.1.4' - classpath 'com.google.gms:google-services:4.4.0' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version" - classpath 'com.google.gms:google-services:3.0.0' classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version" + classpath 'com.google.gms:google-services:4.4.0' } } From d11b37041588c07928c5a54a69f1df0b2d796d46 Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 01:04:43 +0600 Subject: [PATCH 004/153] Update build.gradle --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index edbc4671..98fc8223 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,6 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version" classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version" - classpath 'com.google.gms:google-services:4.4.0' } } From 2c24a56446e7e9d5c97c291dade92fb68ddd6b6b Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 01:09:21 +0600 Subject: [PATCH 005/153] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 98fc8223..edbc4671 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version" classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version" + classpath 'com.google.gms:google-services:4.4.0' } } From 88c4d1f8a73ca4046bc8e97132e2f24acb1eacc6 Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 01:15:42 +0600 Subject: [PATCH 006/153] Add files via upload --- app/src/debug/google-services.json | 964 +++++++++++++++++++++++++++++ 1 file changed, 964 insertions(+) create mode 100644 app/src/debug/google-services.json diff --git a/app/src/debug/google-services.json b/app/src/debug/google-services.json new file mode 100644 index 00000000..50f13865 --- /dev/null +++ b/app/src/debug/google-services.json @@ -0,0 +1,964 @@ +{ + "project_info": { + "project_id": "mockproject-1234", + "project_number": "123456789000", + "name": "FirebaseQuickstarts", + "firebase_url": "https://mockproject-1234.firebaseio.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.samples.quickstart.admobexample", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.samples.quickstart.admobexample", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.samples.quickstart.admobexample", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.quickstart.analytics", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.quickstart.analytics", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.quickstart.analytics", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.samples.quickstart.appindexing", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.samples.quickstart.appindexing", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.samples.quickstart.appindexing", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.quickstart.auth", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.quickstart.auth", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.quickstart.auth", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.samples.quickstart.config", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.samples.quickstart.config", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.samples.quickstart.config", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.samples.quickstart.crash", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.samples.quickstart.crash", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.samples.quickstart.crash", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.quickstart.database", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.quickstart.database", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.quickstart.database", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.quickstart.deeplinks", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.quickstart.deeplinks", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.quickstart.deeplinks", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.quickstart.invites", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.quickstart.invites", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.quickstart.invites", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.example.fireeats", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.example.fireeats", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.example.fireeats", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.quickstart.fcm", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.quickstart.fcm", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.quickstart.fcm", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "com.google.firebase.quickstart.perfmon", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.quickstart.perfmon", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.quickstart.perfmon", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.quickstart.firebasestorage", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.quickstart.firebasestorage", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.quickstart.firebasestorage", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.samples.quickstart.functions", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.samples.quickstart.functions", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.samples.quickstart.functions", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.samples.apps.mlkit", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.samples.apps.mlkit", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.samples.apps.mlkit", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.appdistributionquickstart", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.appdistributionquickstart", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.appdistributionquickstart", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", + "client_id": "android:com.google.firebase.fiamquickstart", + "client_type": 1, + "android_client_info": { + "package_name": "com.google.firebase.fiamquickstart", + "certificate_hash": [] + } + }, + "oauth_client": [ + { + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.google.firebase.fiamquickstart", + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" + } + }, + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "cloud_messaging_service": { + "status": 2, + "apns_config": [] + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "google_signin_service": { + "status": 2 + }, + "ads_service": { + "status": 2, + "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", + "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + } + } + } + ], + "client_info": [], + "ARTIFACT_VERSION": "1" +} From e2f02dc93cf29375b9c5b3be022b2161fc897ef9 Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 01:22:01 +0600 Subject: [PATCH 007/153] Add files via upload --- app/src/debug/google-services.json | 937 +---------------------------- 1 file changed, 20 insertions(+), 917 deletions(-) diff --git a/app/src/debug/google-services.json b/app/src/debug/google-services.json index 50f13865..7e54b99a 100644 --- a/app/src/debug/google-services.json +++ b/app/src/debug/google-services.json @@ -1,964 +1,67 @@ { "project_info": { - "project_id": "mockproject-1234", - "project_number": "123456789000", - "name": "FirebaseQuickstarts", - "firebase_url": "https://mockproject-1234.firebaseio.com" + "project_number": "1039200814590", + "project_id": "dantotsu-1e50f", + "storage_bucket": "dantotsu-1e50f.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.samples.quickstart.admobexample", - "client_type": 1, + "mobilesdk_app_id": "1:1039200814590:android:c372b8c1b92b825f1aacaf", "android_client_info": { - "package_name": "com.google.samples.quickstart.admobexample", - "certificate_hash": [] + "package_name": "ani.Dantotsu" } }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.samples.quickstart.admobexample", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + "current_key": "AIzaSyCiXo_q4S2ofA5oCztsoLnlDqJi3GtTJjY" } ], "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + "other_platform_oauth_client": [] } } }, { "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.quickstart.analytics", - "client_type": 1, + "mobilesdk_app_id": "1:1039200814590:android:40e14720ee97917e1aacaf", "android_client_info": { - "package_name": "com.google.firebase.quickstart.analytics", - "certificate_hash": [] + "package_name": "ani.dantotsu.beta" } }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.quickstart.analytics", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + "current_key": "AIzaSyCiXo_q4S2ofA5oCztsoLnlDqJi3GtTJjY" } ], "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + "other_platform_oauth_client": [] } } }, { "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.samples.quickstart.appindexing", - "client_type": 1, + "mobilesdk_app_id": "1:1039200814590:android:40e14720ee97917e1aacaf", "android_client_info": { - "package_name": "com.google.samples.quickstart.appindexing", - "certificate_hash": [] + "package_name": "ani.dantotsu" } }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.samples.quickstart.appindexing", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" + "current_key": "AIzaSyCiXo_q4S2ofA5oCztsoLnlDqJi3GtTJjY" } ], "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.quickstart.auth", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.quickstart.auth", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.quickstart.auth", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.samples.quickstart.config", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.samples.quickstart.config", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.samples.quickstart.config", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.samples.quickstart.crash", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.samples.quickstart.crash", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.samples.quickstart.crash", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.quickstart.database", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.quickstart.database", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.quickstart.database", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.quickstart.deeplinks", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.quickstart.deeplinks", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.quickstart.deeplinks", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.quickstart.invites", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.quickstart.invites", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.quickstart.invites", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.example.fireeats", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.example.fireeats", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.example.fireeats", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.quickstart.fcm", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.quickstart.fcm", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.quickstart.fcm", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "com.google.firebase.quickstart.perfmon", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.quickstart.perfmon", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.quickstart.perfmon", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.quickstart.firebasestorage", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.quickstart.firebasestorage", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.quickstart.firebasestorage", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.samples.quickstart.functions", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.samples.quickstart.functions", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.samples.quickstart.functions", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.samples.apps.mlkit", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.samples.apps.mlkit", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.samples.apps.mlkit", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.appdistributionquickstart", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.appdistributionquickstart", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.appdistributionquickstart", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", - "client_id": "android:com.google.firebase.fiamquickstart", - "client_type": 1, - "android_client_info": { - "package_name": "com.google.firebase.fiamquickstart", - "certificate_hash": [] - } - }, - "oauth_client": [ - { - "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.google.firebase.fiamquickstart", - "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" - } - }, - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "cloud_messaging_service": { - "status": 2, - "apns_config": [] - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "google_signin_service": { - "status": 2 - }, - "ads_service": { - "status": 2, - "test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111", - "test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712" + "other_platform_oauth_client": [] } } } ], - "client_info": [], - "ARTIFACT_VERSION": "1" -} + "configuration_version": "1" +} \ No newline at end of file From 85f03ece85536545bbb20f4d201e227c7610c785 Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 01:24:03 +0600 Subject: [PATCH 008/153] Add files via upload --- app/src/main/java/ani/dantotsu/others/DisabledReports.kt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 app/src/main/java/ani/dantotsu/others/DisabledReports.kt diff --git a/app/src/main/java/ani/dantotsu/others/DisabledReports.kt b/app/src/main/java/ani/dantotsu/others/DisabledReports.kt new file mode 100644 index 00000000..8dc4a0e4 --- /dev/null +++ b/app/src/main/java/ani/dantotsu/others/DisabledReports.kt @@ -0,0 +1,4 @@ +package ani.dantotsu.others + +const val DisabledReports = false +//Setting this to false, will allow sending crash reports to Dantotsu's Firebase Crashlytics \ No newline at end of file From 1d2ce6ccaafad247f9e345cbb9f330690d008cb3 Mon Sep 17 00:00:00 2001 From: rebel onion <87634197+rebelonion@users.noreply.github.com> Date: Sat, 9 Dec 2023 13:38:38 -0600 Subject: [PATCH 009/153] Delete app/src/debug/google-services.json --- app/src/debug/google-services.json | 67 ------------------------------ 1 file changed, 67 deletions(-) delete mode 100644 app/src/debug/google-services.json diff --git a/app/src/debug/google-services.json b/app/src/debug/google-services.json deleted file mode 100644 index 7e54b99a..00000000 --- a/app/src/debug/google-services.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "project_info": { - "project_number": "1039200814590", - "project_id": "dantotsu-1e50f", - "storage_bucket": "dantotsu-1e50f.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:1039200814590:android:c372b8c1b92b825f1aacaf", - "android_client_info": { - "package_name": "ani.Dantotsu" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyCiXo_q4S2ofA5oCztsoLnlDqJi3GtTJjY" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:1039200814590:android:40e14720ee97917e1aacaf", - "android_client_info": { - "package_name": "ani.dantotsu.beta" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyCiXo_q4S2ofA5oCztsoLnlDqJi3GtTJjY" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:1039200814590:android:40e14720ee97917e1aacaf", - "android_client_info": { - "package_name": "ani.dantotsu" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyCiXo_q4S2ofA5oCztsoLnlDqJi3GtTJjY" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file From bd48ff05eb804e3d032e633e91e54c97a096d191 Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 01:46:45 +0600 Subject: [PATCH 010/153] Delete build.gradle --- build.gradle | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 build.gradle diff --git a/build.gradle b/build.gradle deleted file mode 100644 index edbc4671..00000000 --- a/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -buildscript { - repositories { - google() - mavenCentral() - maven { url 'https://jitpack.io' } - } - ext { - kotlin_version = '1.9.10' - ksp_version = '1.9.10-1.0.13' - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version" - classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version" - classpath 'com.google.gms:google-services:4.4.0' - } -} - -tasks.register('clean', Delete) { - delete getLayout().getBuildDirectory() -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" - } -} From 133959a34e0646ed01eafe41811922818acaeb93 Mon Sep 17 00:00:00 2001 From: rebel onion <87634197+rebelonion@users.noreply.github.com> Date: Sat, 9 Dec 2023 13:47:35 -0600 Subject: [PATCH 011/153] target dev --- .github/workflows/beta.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 9e8f3f3d..ba36e72b 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - dev jobs: build: From 9eb29361dc360bbd8c8f0874bf3c2c378463d5b7 Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sun, 10 Dec 2023 01:49:06 +0600 Subject: [PATCH 012/153] Add files via upload --- build.gradle | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 build.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..6ffde722 --- /dev/null +++ b/build.gradle @@ -0,0 +1,33 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +buildscript { + repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } + } + ext { + kotlin_version = '1.9.10' + ksp_version = '1.9.10-1.0.13' + } + + dependencies { + classpath 'com.android.tools.build:gradle:8.2.0' + classpath 'com.google.gms:google-services:4.4.0' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" + classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version" + classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version" + } +} + +tasks.register('clean', Delete) { + delete getLayout().getBuildDirectory() +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" + } +} From e8f3d5525d5c51bc695ffa3db528f7144cac4d46 Mon Sep 17 00:00:00 2001 From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com> Date: Sat, 9 Dec 2023 14:04:18 -0600 Subject: [PATCH 013/153] Update AndroidManifest.xml --- app/src/main/AndroidManifest.xml | 121 +++++++++++++++++-------------- 1 file changed, 68 insertions(+), 53 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a77c0d31..cd7cec87 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,25 +17,22 @@ - - - + - - - + - - - + - - @@ -48,6 +45,7 @@ + tools:ignore="AllowBackup"> + + + + + + + + + android:exported="true"> + @@ -71,13 +81,11 @@ - - @@ -103,9 +111,9 @@ - + - - - + - + - + - - + + + - + android:exported="false" + android:theme="@android:style/Theme.Translucent.NoTitleBar" /> + android:exported="false" + android:theme="@android:style/Theme.Translucent.NoTitleBar" /> - + @@ -258,30 +266,37 @@ android:resource="@xml/provider_paths" /> - + - - + + + - - - - - - - - - + + From b6be7075b045d5f6196fe11542d55de5aa863621 Mon Sep 17 00:00:00 2001 From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com> Date: Sat, 9 Dec 2023 14:09:24 -0600 Subject: [PATCH 014/153] widget outline --- .../manga/mangareader/MangaReaderActivity.kt | 4 +- .../CurrentlyAiringRemoteViewsFactory.kt | 106 +++++++++++++++++ .../CurrentlyAiringRemoteViewsService.kt | 11 ++ .../dantotsu/widgets/CurrentlyAiringWidget.kt | 101 ++++++++++++++++ .../CurrentlyAiringWidgetConfigureActivity.kt | 111 ++++++++++++++++++ .../drawable-v21/app_widget_background.xml | 10 ++ .../app_widget_inner_view_background.xml | 10 ++ .../main/res/drawable/gradient_background.xml | 8 ++ .../main/res/drawable/ic_dantotsu_round.xml | 42 +++++++ .../res/layout/currently_airing_widget.xml | 57 +++++++++ .../currently_airing_widget_configure.xml | 28 +++++ .../layout/item_currently_airing_widget.xml | 42 +++++++ app/src/main/res/values-night-v31/themes.xml | 10 ++ app/src/main/res/values-v21/styles.xml | 14 +++ app/src/main/res/values-v31/styles.xml | 16 +++ app/src/main/res/values-v31/themes.xml | 11 ++ app/src/main/res/values/attrs.xml | 7 ++ app/src/main/res/values/colors.xml | 31 +++-- app/src/main/res/values/dimens.xml | 10 ++ app/src/main/res/values/strings.xml | 16 ++- app/src/main/res/values/styles.xml | 12 ++ app/src/main/res/values/themes.xml | 30 ++++- .../res/xml/currently_airing_widget_info.xml | 15 +++ 23 files changed, 681 insertions(+), 21 deletions(-) create mode 100644 app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringRemoteViewsFactory.kt create mode 100644 app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringRemoteViewsService.kt create mode 100644 app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringWidget.kt create mode 100644 app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringWidgetConfigureActivity.kt create mode 100644 app/src/main/res/drawable-v21/app_widget_background.xml create mode 100644 app/src/main/res/drawable-v21/app_widget_inner_view_background.xml create mode 100644 app/src/main/res/drawable/gradient_background.xml create mode 100644 app/src/main/res/drawable/ic_dantotsu_round.xml create mode 100644 app/src/main/res/layout/currently_airing_widget.xml create mode 100644 app/src/main/res/layout/currently_airing_widget_configure.xml create mode 100644 app/src/main/res/layout/item_currently_airing_widget.xml create mode 100644 app/src/main/res/values-night-v31/themes.xml create mode 100644 app/src/main/res/values-v21/styles.xml create mode 100644 app/src/main/res/values-v31/styles.xml create mode 100644 app/src/main/res/values-v31/themes.xml create mode 100644 app/src/main/res/values/attrs.xml create mode 100644 app/src/main/res/values/dimens.xml create mode 100644 app/src/main/res/values/styles.xml create mode 100644 app/src/main/res/xml/currently_airing_widget_info.xml diff --git a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt index 30fefb26..07e35584 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt @@ -795,7 +795,7 @@ class MangaReaderActivity : AppCompatActivity() { private fun progress(runnable: Runnable) { if (maxChapterPage - currentChapterPage <= 1 && Anilist.userid != null) { - if (showProgressDialog) { + if (showProgressDialog) { val dialogView = layoutInflater.inflate(R.layout.item_custom_dialog, null) val checkbox = dialogView.findViewById(R.id.dialog_checkbox) checkbox.text = getString(R.string.dont_ask_again, media.userPreferredName) @@ -810,7 +810,7 @@ class MangaReaderActivity : AppCompatActivity() { .setCancelable(false) .setPositiveButton(getString(R.string.yes)) { dialog, _ -> saveData("${media.id}_save_progress", true) - updateProgress( + updateProgress( media, MangaNameAdapter.findChapterNumber(media.manga!!.selectedChapter!!) .toString() diff --git a/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringRemoteViewsFactory.kt b/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringRemoteViewsFactory.kt new file mode 100644 index 00000000..9c0f2ceb --- /dev/null +++ b/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringRemoteViewsFactory.kt @@ -0,0 +1,106 @@ +package ani.dantotsu.widgets + +import android.content.Context +import android.content.Intent +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.net.Uri +import android.widget.RemoteViews +import android.widget.RemoteViewsService +import androidx.core.net.toUri +import ani.dantotsu.R +import ani.dantotsu.logger +import java.io.InputStream +import java.net.HttpURLConnection +import java.net.URL + +class CurrentlyAiringRemoteViewsFactory(private val context: Context, intent: Intent) : RemoteViewsService.RemoteViewsFactory { + private var widgetItems = mutableListOf() + + override fun onCreate() { + // 4 items for testing + widgetItems.clear() + logger("CurrentlyAiringRemoteViewsFactory onCreate") + widgetItems = List(4) { + WidgetItem("Show $it", "$it days $it hours $it minutes", "https://s4.anilist.co/file/anilistcdn/media/anime/cover/large/bx14741-alxqoP4yx6WF.jpg") + }.toMutableList() + } + + override fun onDataSetChanged() { + // 4 items for testing + logger("CurrentlyAiringRemoteViewsFactory onDataSetChanged") + widgetItems.clear() + widgetItems.add(WidgetItem("Show 1", "1 day 2 hours 3 minutes", "https://s4.anilist.co/file/anilistcdn/media/anime/cover/large/bx14741-alxqoP4yx6WF.jpg")) + widgetItems.add(WidgetItem("Show 2", "2 days 3 hours 4 minutes", "https://s4.anilist.co/file/anilistcdn/media/anime/cover/large/bx14741-alxqoP4yx6WF.jpg")) + widgetItems.add(WidgetItem("Show 3", "3 days 4 hours 5 minutes", "https://s4.anilist.co/file/anilistcdn/media/anime/cover/large/bx14741-alxqoP4yx6WF.jpg")) + widgetItems.add(WidgetItem("Show 4", "4 days 5 hours 6 minutes", "https://s4.anilist.co/file/anilistcdn/media/anime/cover/large/bx14741-alxqoP4yx6WF.jpg")) + widgetItems.add(WidgetItem("Show 5", "5 days 6 hours 7 minutes", "https://s4.anilist.co/file/anilistcdn/media/anime/cover/large/bx14741-alxqoP4yx6WF.jpg")) + } + + override fun onDestroy() { + widgetItems.clear() + } + + override fun getCount(): Int { + return widgetItems.size + } + + override fun getViewAt(position: Int): RemoteViews { + logger("CurrentlyAiringRemoteViewsFactory getViewAt") + val item = widgetItems[position] + val rv = RemoteViews(context.packageName, R.layout.item_currently_airing_widget).apply { + setTextViewText(R.id.text_show_title, item.title) + setTextViewText(R.id.text_show_countdown, item.countdown) + val bitmap = downloadImageAsBitmap(item.image) + //setImageViewUri(R.id.image_show_icon, Uri.parse(item.image)) + setImageViewBitmap(R.id.image_show_icon, bitmap) + } + + return rv + } + + private fun downloadImageAsBitmap(imageUrl: String): Bitmap? { + var bitmap: Bitmap? = null + var inputStream: InputStream? = null + var urlConnection: HttpURLConnection? = null + + try { + val url = URL(imageUrl) + urlConnection = url.openConnection() as HttpURLConnection + urlConnection.requestMethod = "GET" + urlConnection.connect() + + if (urlConnection.responseCode == HttpURLConnection.HTTP_OK) { + inputStream = urlConnection.inputStream + bitmap = BitmapFactory.decodeStream(inputStream) + } + } catch (e: Exception) { + e.printStackTrace() + // Handle the error according to your needs + } finally { + // Clean up resources + inputStream?.close() + urlConnection?.disconnect() + } + + return bitmap + } + + override fun getLoadingView(): RemoteViews { + return RemoteViews(context.packageName, R.layout.item_currently_airing_widget) + } + + override fun getViewTypeCount(): Int { + return 1 + } + + override fun getItemId(p0: Int): Long { + return p0.toLong() + } + + override fun hasStableIds(): Boolean { + return true + } +} + +data class WidgetItem(val title: String, val countdown: String, val image: String) \ No newline at end of file diff --git a/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringRemoteViewsService.kt b/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringRemoteViewsService.kt new file mode 100644 index 00000000..859570e4 --- /dev/null +++ b/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringRemoteViewsService.kt @@ -0,0 +1,11 @@ +package ani.dantotsu.widgets + +import android.content.Intent +import android.widget.RemoteViewsService +import ani.dantotsu.logger +class CurrentlyAiringRemoteViewsService : RemoteViewsService() { + override fun onGetViewFactory(intent: Intent): RemoteViewsFactory { + logger("CurrentlyAiringRemoteViewsFactory onGetViewFactory") + return CurrentlyAiringRemoteViewsFactory(applicationContext, intent) + } +} diff --git a/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringWidget.kt b/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringWidget.kt new file mode 100644 index 00000000..f9a868d6 --- /dev/null +++ b/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringWidget.kt @@ -0,0 +1,101 @@ +package ani.dantotsu.widgets + +import android.app.PendingIntent +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProvider +import android.content.Context +import android.content.Intent +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.drawable.Drawable +import android.graphics.drawable.GradientDrawable +import android.net.Uri +import android.widget.RemoteViews +import androidx.core.content.res.ResourcesCompat +import ani.dantotsu.R + +/** + * Implementation of App Widget functionality. + * App Widget Configuration implemented in [CurrentlyAiringWidgetConfigureActivity] + */ +class CurrentlyAiringWidget : AppWidgetProvider() { + override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) { + appWidgetIds.forEach { appWidgetId -> + val intent = Intent(context, CurrentlyAiringRemoteViewsService::class.java).apply { + putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) + data = Uri.parse(toUri(Intent.URI_INTENT_SCHEME)) + } + + val rv = RemoteViews(context.packageName, R.layout.currently_airing_widget).apply { + setRemoteAdapter(R.id.widgetListView, intent) + setEmptyView(R.id.widgetListView, R.id.empty_view) + } + + appWidgetManager.updateAppWidget(appWidgetId, rv) + } + super.onUpdate(context, appWidgetManager, appWidgetIds) + } + override fun onDeleted(context: Context, appWidgetIds: IntArray) { + // When the user deletes the widget, delete the preference associated with it. + for (appWidgetId in appWidgetIds) { + deleteTitlePref(context, appWidgetId) + } + super.onDeleted(context, appWidgetIds) + } + + override fun onEnabled(context: Context) { + super.onEnabled(context) + } + + override fun onDisabled(context: Context) { + super.onDisabled(context) + } + companion object { + fun updateAppWidget( + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetId: Int, + color: Int + ) { + // Create an intent to launch the configuration activity when the widget is clicked + val intent = Intent(context, CurrentlyAiringWidgetConfigureActivity::class.java) + val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) + + // Get the gradient drawable resource and update its start color with the user-selected color + val gradientDrawable = ResourcesCompat.getDrawable(context.resources, R.drawable.gradient_background, null) as GradientDrawable + gradientDrawable.colors = intArrayOf(color, Color.GRAY) // End color is gray. + + // Create the RemoteViews object and set the background + val views = RemoteViews(context.packageName, R.layout.currently_airing_widget).apply { + //setImageViewBitmap(R.id.backgroundView, convertDrawableToBitmap(gradientDrawable)) + //setOnClickPendingIntent(R.id.backgroundView, pendingIntent) + } + + // Instruct the widget manager to update the widget + appWidgetManager.updateAppWidget(appWidgetId, views) + } + + private fun convertDrawableToBitmap(drawable: Drawable): Bitmap { + val bitmap = Bitmap.createBitmap(100, 300, Bitmap.Config.ARGB_8888) + val canvas = Canvas(bitmap) + drawable.setBounds(0, 0, canvas.width, canvas.height) + drawable.draw(canvas) + return bitmap + } + } +} + +internal fun updateAppWidget( + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetId: Int +) { + val widgetText = loadTitlePref(context, appWidgetId) + // Construct the RemoteViews object + val views = RemoteViews(context.packageName, R.layout.currently_airing_widget) + views.setTextViewText(R.id.appwidget_text, widgetText) + + // Instruct the widget manager to update the widget + appWidgetManager.updateAppWidget(appWidgetId, views) +} \ No newline at end of file diff --git a/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringWidgetConfigureActivity.kt b/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringWidgetConfigureActivity.kt new file mode 100644 index 00000000..1bd85648 --- /dev/null +++ b/app/src/main/java/ani/dantotsu/widgets/CurrentlyAiringWidgetConfigureActivity.kt @@ -0,0 +1,111 @@ +package ani.dantotsu.widgets + +import android.app.Activity +import android.appwidget.AppWidgetManager +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.view.View +import android.widget.EditText +import ani.dantotsu.R +import ani.dantotsu.databinding.CurrentlyAiringWidgetConfigureBinding +import ani.dantotsu.others.LangSet +import ani.dantotsu.themes.ThemeManager + +/** + * The configuration screen for the [CurrentlyAiringWidget] AppWidget. + */ +class CurrentlyAiringWidgetConfigureActivity : Activity() { + private var appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID + private lateinit var appWidgetText: EditText + private var onClickListener = View.OnClickListener { + val context = this@CurrentlyAiringWidgetConfigureActivity + + // When the button is clicked, store the string locally + val widgetText = appWidgetText.text.toString() + saveTitlePref(context, appWidgetId, widgetText) + + // It is the responsibility of the configuration activity to update the app widget + val appWidgetManager = AppWidgetManager.getInstance(context) + //updateAppWidget(context, appWidgetManager, appWidgetId) + + + CurrentlyAiringWidget.updateAppWidget( + context, + appWidgetManager, + appWidgetId, + -1 + ) + + // Make sure we pass back the original appWidgetId + val resultValue = Intent() + resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) + setResult(RESULT_OK, resultValue) + finish() + } + private lateinit var binding: CurrentlyAiringWidgetConfigureBinding + + public override fun onCreate(icicle: Bundle?) { + LangSet.setLocale(this) + ThemeManager(this).applyTheme() + super.onCreate(icicle) + + // Set the result to CANCELED. This will cause the widget host to cancel + // out of the widget placement if the user presses the back button. + setResult(RESULT_CANCELED) + + binding = CurrentlyAiringWidgetConfigureBinding.inflate(layoutInflater) + setContentView(binding.root) + + appWidgetText = binding.appwidgetText as EditText + binding.addButton.setOnClickListener(onClickListener) + + // Find the widget id from the intent. + val intent = intent + val extras = intent.extras + if (extras != null) { + appWidgetId = extras.getInt( + AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID + ) + } + + // If this activity was started with an intent without an app widget ID, finish with an error. + if (appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) { + finish() + return + } + + appWidgetText.setText( + loadTitlePref( + this@CurrentlyAiringWidgetConfigureActivity, + appWidgetId + ) + ) + + } + +} + +private const val PREFS_NAME = "ani.dantotsu.parsers.CurrentlyAiringWidget" +private const val PREF_PREFIX_KEY = "appwidget_" + +// Write the prefix to the SharedPreferences object for this widget +internal fun saveTitlePref(context: Context, appWidgetId: Int, text: String) { + val prefs = context.getSharedPreferences(PREFS_NAME, 0).edit() + prefs.putString(PREF_PREFIX_KEY + appWidgetId, text) + prefs.apply() +} + +// Read the prefix from the SharedPreferences object for this widget. +// If there is no preference saved, get the default from a resource +internal fun loadTitlePref(context: Context, appWidgetId: Int): String { + val prefs = context.getSharedPreferences(PREFS_NAME, 0) + val titleValue = prefs.getString(PREF_PREFIX_KEY + appWidgetId, null) + return titleValue ?: context.getString(R.string.appwidget_text) +} + +internal fun deleteTitlePref(context: Context, appWidgetId: Int) { + val prefs = context.getSharedPreferences(PREFS_NAME, 0).edit() + prefs.remove(PREF_PREFIX_KEY + appWidgetId) + prefs.apply() +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/app_widget_background.xml b/app/src/main/res/drawable-v21/app_widget_background.xml new file mode 100644 index 00000000..785445c6 --- /dev/null +++ b/app/src/main/res/drawable-v21/app_widget_background.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml b/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml new file mode 100644 index 00000000..007e2872 --- /dev/null +++ b/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/gradient_background.xml b/app/src/main/res/drawable/gradient_background.xml new file mode 100644 index 00000000..20e9ffd6 --- /dev/null +++ b/app/src/main/res/drawable/gradient_background.xml @@ -0,0 +1,8 @@ + + + + diff --git a/app/src/main/res/drawable/ic_dantotsu_round.xml b/app/src/main/res/drawable/ic_dantotsu_round.xml new file mode 100644 index 00000000..5b43bb34 --- /dev/null +++ b/app/src/main/res/drawable/ic_dantotsu_round.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/currently_airing_widget.xml b/app/src/main/res/layout/currently_airing_widget.xml new file mode 100644 index 00000000..69d47e48 --- /dev/null +++ b/app/src/main/res/layout/currently_airing_widget.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/currently_airing_widget_configure.xml b/app/src/main/res/layout/currently_airing_widget_configure.xml new file mode 100644 index 00000000..af0b9d72 --- /dev/null +++ b/app/src/main/res/layout/currently_airing_widget_configure.xml @@ -0,0 +1,28 @@ + + + + + + + +