Merge pull request #28 from s1204IT/master

APKサイズの削減

README.md

@@ -1,11 +1,11 @@
 # <img src="app/src/main/ic_launcher-playstore.png" width="60px"> LIME: Adkiller for LINE
 
-[![Latest Release](https://img.shields.io/github/v/release/Chipppppppppp/LIME?label=latest)](https://github.com/Chipppppppppp/LIME/releases)
-[![License](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/Chipppppppppp/LIME/blob/master/LICENSE)
+[![Latest Release](https://img.shields.io/github/v/release/Chipppppppppp/LIME?label=latest)](//github.com/Chipppppppppp/LIME/releases/latest)
+[![License](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
 ## 概要
 
-This is an Xposed Module to clean LINE.
+This is an Xposed Module to clean [**LINE**](//line.me). 
 
 LINE を掃除する Xposed Module です。
 
@@ -19,12 +19,14 @@ LINE を掃除する Xposed Module です。
 
 ## 機能
 
-- 画面下部の VOOM・ウォレットアイコンの削除
+- 画面下部の \[VOOM]・\[ウォレット]アイコンの削除
 - 広告の削除
-- WebView (アプリ内ブラウザ) をデフォルトブラウザにリダイレクト
+- WebView (アプリ内ブラウザ) を規定のブラウザにリダイレクト
 
 ## 既知の問題
 
 - 稀にホームタブの広告の場所に余白が残る
 
+## 問題の報告
+
 新たなバグや修正方法を見つけた場合は、[報告](//github.com/Chipppppppppp/LIME/issues/new/choose)をお願いします。

app/build.gradle

@@ -8,6 +8,7 @@ android {
 
     defaultConfig {
         minSdk 24
+        //noinspection OldTargetApi
         targetSdk 33
         versionCode 3
         versionName "1.2"
@@ -30,11 +31,13 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
+            multiDexEnabled false
             proguardFiles += 'proguard-rules.pro'
             signingConfig signingConfigs.android
         }
         release {
             minifyEnabled false
+            multiDexEnabled false
             proguardFiles += 'proguard-rules.pro'
             if (file('release.jks').exists()) {
                 signingConfig signingConfigs.release
@@ -48,10 +51,8 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'androidx.browser:browser:1.5.0'
+    //noinspection GradleCompatible
+    implementation 'com.android.support:customtabs:27.0.1'
     compileOnly 'de.robv.android.xposed:api:82'
     compileOnly 'de.robv.android.xposed:api:82:sources'
 }

app/src/main/AndroidManifest.xml

@@ -6,9 +6,10 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:theme="@style/Theme.LIME">
+        android:theme="@android:style/Theme.DeviceDefault">
         <activity
             android:name=".SettingsActivity"
+            android:clearTaskOnLaunch="true"
             android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -4,10 +4,10 @@
 import android.content.Intent;
 import android.graphics.Canvas;
 import android.net.Uri;
+import android.support.customtabs.CustomTabsIntent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
-import androidx.browser.customtabs.CustomTabsIntent;
 
 import de.robv.android.xposed.IXposedHookLoadPackage;
 import de.robv.android.xposed.XC_MethodHook;

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

@@ -1,14 +1,14 @@
 package io.github.chipppppppppp.lime;
 
-import android.content.Context;
-import android.os.Bundle;
+import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
-import androidx.appcompat.app.AppCompatActivity;
-import android.widget.Switch;
 import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.widget.Switch;
 
-public class SettingsActivity extends AppCompatActivity {
+public class SettingsActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -84,10 +84,10 @@ private void showModuleNotEnabledAlert(Context context) {
                 .setPositiveButton(context.getString(R.string.dialog_positive), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        finish();
+                        finishAndRemoveTask();
                     }
                 })
                 .setCancelable(false)
                 .show();
     }
-}
+}

app/src/main/res/xml/root_preferences.xml

@@ -1,34 +1,32 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory app:title="@string/messages_header">
+    <PreferenceCategory android:title="@string/messages_header">
 
         <EditTextPreference
-            app:key="signature"
-            app:title="@string/signature_title"
-            app:useSimpleSummaryProvider="true" />
+            android:key="signature"
+            android:title="@string/signature_title" />
 
         <ListPreference
-            app:defaultValue="reply"
-            app:entries="@array/reply_entries"
-            app:entryValues="@array/reply_values"
-            app:key="reply"
-            app:title="@string/reply_title"
-            app:useSimpleSummaryProvider="true" />
+            android:defaultValue="reply"
+            android:entries="@array/reply_entries"
+            android:entryValues="@array/reply_values"
+            android:key="reply"
+            android:title="@string/reply_title" />
 
     </PreferenceCategory>
 
-    <PreferenceCategory app:title="@string/sync_header">
+    <PreferenceCategory android:title="@string/sync_header">
 
         <SwitchPreferenceCompat
-            app:key="sync"
-            app:title="@string/sync_title" />
+            android:key="sync"
+            android:title="@string/sync_title" />
 
         <SwitchPreferenceCompat
-            app:dependency="sync"
-            app:key="attachment"
-            app:summaryOff="@string/attachment_summary_off"
-            app:summaryOn="@string/attachment_summary_on"
-            app:title="@string/attachment_title" />
+            android:dependency="sync"
+            android:key="attachment"
+            android:summaryOff="@string/attachment_summary_off"
+            android:summaryOn="@string/attachment_summary_on"
+            android:title="@string/attachment_title" />
 
     </PreferenceCategory>
 

gradle.properties

@@ -7,10 +7,6 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library

settings.gradle

@@ -2,10 +2,9 @@ pluginManagement {
     repositories {
         google()
         mavenCentral()
-        gradlePluginPortal()
     }
     plugins {
-        id 'com.android.application' version '8.1.0' apply false
+        id 'com.android.application' version '8.1.4' apply false
     }
 }
 dependencyResolutionManagement {