Merge pull request #19 from s1204IT/master

自動リリースするファイル名の修正

.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

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'
-}
+}

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;

app/src/main/java/io/github/chipppppppppp/lime/SettingsActivity.java

@@ -17,15 +17,15 @@ 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 {
             SharedPreferences prefs;
             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);

app/src/main/res/layout/settings_activity.xml

@@ -19,11 +19,11 @@
         android:text="@string/switch_delete_ads" />
 
     <Switch
-        android:id="@+id/switch_redirect_web_view"
+        android:id="@+id/switch_redirect_webview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="@string/switch_redirect_web_view" />
+        android:text="@string/switch_redirect_webview" />
 
     <Switch
         android:id="@+id/switch_open_in_browser"

app/src/main/res/values-ja/strings.xml

@@ -9,7 +9,7 @@
     <!-- SettingsActivity -->
     <string name="switch_delete_voom">VOOM アイコンを削除</string>
     <string name="switch_delete_ads">広告を削除</string>
-    <string name="switch_redirect_web_view">Web View をカスタムタブにリダイレクト</string>
+    <string name="switch_redirect_webview">WebView をカスタムタブにリダイレクト</string>
     <string name="switch_open_in_browser">ブラウザで開く</string>
     <string name="module_not_enabled_title">エラー</string>
     <string name="module_not_enabled_text">モジュールが有効化されていません！</string>

app/src/main/res/values/strings.xml

@@ -26,7 +26,7 @@
     <!-- SettingsActivity -->
     <string name="switch_delete_voom">Delete the VOOM icon</string>
     <string name="switch_delete_ads">Delete ads</string>
-    <string name="switch_redirect_web_view">Redirect Web View to Custom Tabs</string>
+    <string name="switch_redirect_webview">Redirect WebView to Custom Tabs</string>
     <string name="switch_open_in_browser">Open in your browser</string>
     <string name="module_not_enabled_title">Error</string>
     <string name="module_not_enabled_text">Module not enabled!</string>