From 78056b230cb49c670dfd5dabcefaa6ffda72f995 Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 15:55:57 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E5=90=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ad55208..06c92252 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,21 +81,23 @@ jobs: export KEY_ALIAS="${{ secrets.KEY_ALIAS }}" export KEY_PASSWORD="${{ secrets.KEY_PASSWORD }}" ./gradlew aR --no-daemon + cp -f app/build/outputs/apk/release/app-release.apk ${{ env.repo }}-${{ env.version }}.apk else ./gradlew assemble --no-daemon fi - name: Upload APK uses: actions/upload-artifact@v4 + if: github..event.inputs.release != 'true' with: name: ${{ env.repo }}(${{ env.version }}@${{ env.commit }}) - path: app/build/outputs/apk/**/app-*.apk + path: app/build/outputs/apk/debug/app-debug.apk - name: Release uses: softprops/action-gh-release@v1 if: github.event.inputs.release == 'true' with: tag_name: ${{ env.version }} - draft: true + draft: false prerelease: false - files: app/build/outputs/apk/release/app-release.apk + files: ${{ env.repo }}-${{ env.version }}.apk From 678854ca52d92473a3e23a00323907fe8fd40358 Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 15:56:47 +0900 Subject: [PATCH 2/9] Fix typo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 06c92252..65c390a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: - name: Upload APK uses: actions/upload-artifact@v4 - if: github..event.inputs.release != 'true' + if: github.event.inputs.release != 'true' with: name: ${{ env.repo }}(${{ env.version }}@${{ env.commit }}) path: app/build/outputs/apk/debug/app-debug.apk From 543df4495b629bd25ad179b54f5215f1fb0f047a Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 16:01:58 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=E7=AB=B6=E5=90=88=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chipppppppppp#3 --- app/build.gradle | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a2984305..c3471b5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,12 +28,9 @@ android { } } signingConfigs { - debug { - storeFile rootProject.file('debug.keystore') - } release { - storeFile rootProject.file('release.keystore') - storePassword System.getenv('KEYSTORE_PASSWORD') + storeFile rootProject.file('release.jks') + storePassword System.getenv('STORE_PASSWORD') keyAlias System.getenv('KEY_ALIAS') keyPassword System.getenv('KEY_PASSWORD') } @@ -48,6 +45,7 @@ android { minifyEnabled false proguardFiles += 'proguard-rules.pro' if (file('release.jks').exists()) { + signingConfig signingConfigs.release } } } @@ -64,4 +62,4 @@ dependencies { implementation 'androidx.browser:browser:1.5.0' compileOnly 'de.robv.android.xposed:api:82' compileOnly 'de.robv.android.xposed:api:82:sources' -} \ No newline at end of file +} From d7db6a7ea236d9437b939ca14149cf1aa0d105dc Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 16:02:30 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E9=87=8D=E8=A4=87=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=82=8B=E5=AE=A3=E8=A8=80=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c3471b5c..de0d74ba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,14 +27,6 @@ android { keyPassword System.getenv('KEY_PASSWORD') } } - signingConfigs { - release { - storeFile rootProject.file('release.jks') - storePassword System.getenv('STORE_PASSWORD') - keyAlias System.getenv('KEY_ALIAS') - keyPassword System.getenv('KEY_PASSWORD') - } - } buildTypes { debug { minifyEnabled false From b29d2d84635c39a174310ff027055056d857d449 Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 16:09:35 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=E9=80=9A=E5=B8=B8=E6=99=82=E3=81=AFdebug?= =?UTF-8?q?=E3=83=90=E3=83=AA=E3=82=A2=E3=83=B3=E3=83=88=E3=81=AE=E3=81=BF?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65c390a1..03dc4342 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,7 @@ jobs: ./gradlew aR --no-daemon cp -f app/build/outputs/apk/release/app-release.apk ${{ env.repo }}-${{ env.version }}.apk else - ./gradlew assemble --no-daemon + ./gradlew assembleDebug --no-daemon fi - name: Upload APK From 346ef282f3c9487b729585e1d562233c99fdcb6a Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 16:11:28 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.gitignore | 5 ----- build.gradle | 4 ---- 2 files changed, 9 deletions(-) delete mode 100644 app/.gitignore delete mode 100644 build.gradle diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 6bf1ef21..00000000 --- a/app/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/build - -/release -/src/androidTest -/src/test \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 7ffeefa8..00000000 --- a/build.gradle +++ /dev/null @@ -1,4 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -plugins { - id 'com.android.application' version '8.1.0' apply false -} \ No newline at end of file From 85106135c124fb71ca7fdf6691b0ce100f0add13 Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 16:13:17 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=E7=9C=81=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03dc4342..a04b61b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,7 @@ jobs: ./gradlew aR --no-daemon cp -f app/build/outputs/apk/release/app-release.apk ${{ env.repo }}-${{ env.version }}.apk else - ./gradlew assembleDebug --no-daemon + ./gradlew asD --no-daemon fi - name: Upload APK From cf7aaec2cb0af5a1ebafca2ed714fca6db0fa883 Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 16:15:20 +0900 Subject: [PATCH 8/9] =?UTF-8?q?WebView=20=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/github/chipppppppppp/lime/SettingsActivity.java | 6 +++--- app/src/main/res/layout/settings_activity.xml | 4 ++-- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/github/chipppppppppp/lime/SettingsActivity.java b/app/src/main/java/io/github/chipppppppppp/lime/SettingsActivity.java index 268797f7..0a4680f5 100644 --- a/app/src/main/java/io/github/chipppppppppp/lime/SettingsActivity.java +++ b/app/src/main/java/io/github/chipppppppppp/lime/SettingsActivity.java @@ -17,7 +17,7 @@ protected void onCreate(Bundle savedInstanceState) { Switch switchDeleteVoom = findViewById(R.id.switch_delete_voom); Switch switchDeleteAds = findViewById(R.id.switch_delete_ads); - Switch switchRedirectWebView = findViewById(R.id.switch_redirect_web_view); + Switch switchRedirectWebView = findViewById(R.id.switch_redirect_webview); Switch switchOpenInBrowser = findViewById(R.id.switch_open_in_browser); try { @@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) { prefs = getSharedPreferences("settings", MODE_WORLD_READABLE); switchDeleteVoom.setChecked(prefs.getBoolean("delete_voom", true)); switchDeleteAds.setChecked(prefs.getBoolean("delete_ads", true)); - switchRedirectWebView.setChecked(prefs.getBoolean("redirect_web_view", true)); + switchRedirectWebView.setChecked(prefs.getBoolean("redirect_webview", true)); switchOpenInBrowser.setChecked(prefs.getBoolean("open_in_browser", false)); switchDeleteVoom.setOnCheckedChangeListener((buttonView, isChecked) -> { @@ -37,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) { }); switchRedirectWebView.setOnCheckedChangeListener((buttonView, isChecked) -> { - prefs.edit().putBoolean("redirect_web_view", isChecked).apply(); + prefs.edit().putBoolean("redirect_webview", isChecked).apply(); if (isChecked) switchOpenInBrowser.setEnabled(true); else { switchOpenInBrowser.setEnabled(false); diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml index ca484c6e..16a80b45 100644 --- a/app/src/main/res/layout/settings_activity.xml +++ b/app/src/main/res/layout/settings_activity.xml @@ -19,11 +19,11 @@ android:text="@string/switch_delete_ads" /> + android:text="@string/switch_redirect_webview" /> VOOM アイコンを削除 広告を削除 - Web View をカスタムタブにリダイレクト + WebView をカスタムタブにリダイレクト ブラウザで開く エラー モジュールが有効化されていません！ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 964ed41a..bd01e548 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,7 +26,7 @@ Delete the VOOM icon Delete ads - Redirect Web View to Custom Tabs + Redirect WebView to Custom Tabs Open in your browser Error Module not enabled! From 8da356f16b9185698fcc38de5395d521ab25eed6 Mon Sep 17 00:00:00 2001 From: Syuugo Date: Sat, 20 Jan 2024 16:31:44 +0900 Subject: [PATCH 9/9] Fix typo --- app/src/main/java/io/github/chipppppppppp/lime/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/github/chipppppppppp/lime/Main.java b/app/src/main/java/io/github/chipppppppppp/lime/Main.java index ef7de0d9..b45f4534 100644 --- a/app/src/main/java/io/github/chipppppppppp/lime/Main.java +++ b/app/src/main/java/io/github/chipppppppppp/lime/Main.java @@ -23,7 +23,7 @@ public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lparam) throws Thr prefs.reload(); boolean deleteVoom = prefs.getBoolean("delete_voom", true); boolean deleteAds = prefs.getBoolean("delete_ads", true); - boolean redirectWebView = prefs.getBoolean("redirect_web_view", true); + boolean redirectWebView = prefs.getBoolean("redirect_webview", true); boolean openInBrowser = prefs.getBoolean("open_in_browser", false); Class hookTarget;