diff --git a/app/build.gradle b/app/build.gradle index 6a4d6ac..fbfd71c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.zane.smapiinstaller" minSdkVersion 19 targetSdkVersion 28 - versionCode 18 - versionName "1.3.4" + versionCode 20 + versionName "1.3.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true @@ -34,6 +34,16 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + bundle { + language { + // Specifies that the app bundle should not support + // configuration APKs for language resources. These + // resources are instead packaged with each base and + // dynamic feature APK. + enableSplit = false + } + } } greendao { diff --git a/app/src/main/assets/mods/custom-localization.zip b/app/src/main/assets/mods/custom-localization.zip index be2dc18..20adb3d 100644 Binary files a/app/src/main/assets/mods/custom-localization.zip and b/app/src/main/assets/mods/custom-localization.zip differ diff --git a/app/src/main/assets/mods/virtual-keyboard.zip b/app/src/main/assets/mods/virtual-keyboard.zip index d6524f1..aed6ba4 100644 Binary files a/app/src/main/assets/mods/virtual-keyboard.zip and b/app/src/main/assets/mods/virtual-keyboard.zip differ diff --git a/app/src/main/java/com/zane/smapiinstaller/MainActivity.java b/app/src/main/java/com/zane/smapiinstaller/MainActivity.java index 505bdbb..c542942 100644 --- a/app/src/main/java/com/zane/smapiinstaller/MainActivity.java +++ b/app/src/main/java/com/zane/smapiinstaller/MainActivity.java @@ -21,7 +21,6 @@ import com.zane.smapiinstaller.entity.AppConfig; import com.zane.smapiinstaller.entity.AppConfigDao; import com.zane.smapiinstaller.entity.DaoSession; import com.zane.smapiinstaller.entity.FrameworkConfig; -import com.zane.smapiinstaller.logic.CommonLogic; import com.zane.smapiinstaller.logic.ConfigManager; import com.zane.smapiinstaller.logic.GameLauncher; import com.zane.smapiinstaller.utils.DialogUtils; @@ -33,16 +32,15 @@ import java.io.File; import java.util.Locale; import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; +import androidx.drawerlayout.widget.DrawerLayout; import androidx.navigation.NavController; import androidx.navigation.Navigation; import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.NavigationUI; - -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; diff --git a/app/src/main/java/com/zane/smapiinstaller/constant/ManifestPatchConstants.java b/app/src/main/java/com/zane/smapiinstaller/constant/ManifestPatchConstants.java index e57f0b7..3dc8f5a 100644 --- a/app/src/main/java/com/zane/smapiinstaller/constant/ManifestPatchConstants.java +++ b/app/src/main/java/com/zane/smapiinstaller/constant/ManifestPatchConstants.java @@ -6,4 +6,5 @@ public class ManifestPatchConstants { public static final String PATTERN_MAIN_ACTIVITY = ".MainActivity"; public static final String PATTERN_VERSION_CODE = "versionCode"; + public static final CharSequence APP_PACKAGE_NAME = "com.chucklefish.stardewvalley"; } diff --git a/app/src/main/java/com/zane/smapiinstaller/logic/ApkPatcher.java b/app/src/main/java/com/zane/smapiinstaller/logic/ApkPatcher.java index 6ab6e17..d779301 100644 --- a/app/src/main/java/com/zane/smapiinstaller/logic/ApkPatcher.java +++ b/app/src/main/java/com/zane/smapiinstaller/logic/ApkPatcher.java @@ -169,6 +169,9 @@ public class ApkPatcher { if (strObj.contains(packageName.get())) { attr.obj = strObj.replace(packageName.get(), Constants.TARGET_PACKAGE_NAME); } + else if(strObj.contains(ManifestPatchConstants.APP_PACKAGE_NAME)){ + attr.obj = strObj.replace(ManifestPatchConstants.APP_PACKAGE_NAME, Constants.TARGET_PACKAGE_NAME); + } case "name": if (strObj.contains(ManifestPatchConstants.PATTERN_MAIN_ACTIVITY)) { attr.obj = strObj.replaceFirst("\\w+\\.MainActivity", "md5723872fa9a204f7f942686e9ed9d0b7d.SMainActivity");