diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ad55208..a04b61b6 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
+ ./gradlew asD --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
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/app/build.gradle b/app/build.gradle
index a2984305..de0d74ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,17 +27,6 @@ android {
keyPassword System.getenv('KEY_PASSWORD')
}
}
- signingConfigs {
- debug {
- storeFile rootProject.file('debug.keystore')
- }
- release {
- storeFile rootProject.file('release.keystore')
- storePassword System.getenv('KEYSTORE_PASSWORD')
- keyAlias System.getenv('KEY_ALIAS')
- keyPassword System.getenv('KEY_PASSWORD')
- }
- }
buildTypes {
debug {
minifyEnabled false
@@ -48,6 +37,7 @@ android {
minifyEnabled false
proguardFiles += 'proguard-rules.pro'
if (file('release.jks').exists()) {
+ signingConfig signingConfigs.release
}
}
}
@@ -64,4 +54,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
+}
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;
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!
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