From 6229a66d011cdcf657d658eaf27046daad30246e Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Fri, 20 Nov 2020 06:42:16 +0700
Subject: [PATCH] Prepare to fix language changet

---
 app/src/main/java/com/kdt/mcgui/app/MineActivity.java      | 2 +-
 app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java    | 7 +++++++
 .../java/net/kdt/pojavlaunch/BaseLauncherActivity.java     | 2 +-
 .../java/net/kdt/pojavlaunch/CustomControlsActivity.java   | 2 +-
 .../main/java/net/kdt/pojavlaunch/FatalErrorActivity.java  | 2 +-
 .../main/java/net/kdt/pojavlaunch/LoggableActivity.java    | 2 +-
 .../main/java/net/kdt/pojavlaunch/PojavLoginActivity.java  | 4 ++--
 7 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java

diff --git a/app/src/main/java/com/kdt/mcgui/app/MineActivity.java b/app/src/main/java/com/kdt/mcgui/app/MineActivity.java
index 7778b64dc..8f8427ad8 100644
--- a/app/src/main/java/com/kdt/mcgui/app/MineActivity.java
+++ b/app/src/main/java/com/kdt/mcgui/app/MineActivity.java
@@ -10,7 +10,7 @@ import java.util.*;
 import android.content.*;
 import com.kdt.mcgui.*;
 
-public class MineActivity extends AppCompatActivity implements View.OnClickListener
+public class MineActivity extends BaseActivity implements View.OnClickListener
 {
 	private int topId = 150001;
 	private boolean showBeforeView = true;
diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
new file mode 100644
index 000000000..f5789074a
--- /dev/null
+++ b/app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
@@ -0,0 +1,7 @@
+package net.kdt.pojavlaunch;
+
+import android.support.v7.app.*;
+
+public class BaseActivity extends AppCompatActivity {
+    
+}
diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
index f55839255..89685c01b 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
@@ -5,7 +5,7 @@ import android.widget.*;
 import net.kdt.pojavlaunch.fragments.*;
 import net.kdt.pojavlaunch.tasks.*;
 
-public abstract class BaseLauncherActivity extends AppCompatActivity {
+public abstract class BaseLauncherActivity extends BaseActivity {
 	public Button mPlayButton;
 	public ConsoleFragment mConsoleView;
     public CrashFragment mCrashView;
diff --git a/app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java b/app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
index c2085a857..48883ba37 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
@@ -15,7 +15,7 @@ import net.kdt.pojavlaunch.*;
 import net.kdt.pojavlaunch.prefs.*;
 import net.kdt.pojavlaunch.customcontrols.*;
 
-public class CustomControlsActivity extends AppCompatActivity
+public class CustomControlsActivity extends BaseActivity
 {
 	private DrawerLayout drawerLayout;
     private NavigationView navDrawer;
diff --git a/app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java b/app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java
index 55ab689a8..2b8a89b0f 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java
@@ -7,7 +7,7 @@ import android.support.v7.app.*;
 import android.util.*;
 import android.support.v7.app.AlertDialog;
 
-public class FatalErrorActivity extends AppCompatActivity
+public class FatalErrorActivity extends BaseActivity
 {
 	public static void showError(Context ctx, String savePath, boolean storageAllow, /* boolean isFatalErr, */ Throwable th) {
 		Intent ferrorIntent = new Intent(ctx, FatalErrorActivity.class);
diff --git a/app/src/main/java/net/kdt/pojavlaunch/LoggableActivity.java b/app/src/main/java/net/kdt/pojavlaunch/LoggableActivity.java
index 0fb974de9..d5aac4ece 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/LoggableActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/LoggableActivity.java
@@ -2,7 +2,7 @@ package net.kdt.pojavlaunch;
 
 import android.support.v7.app.*;
 
-public abstract class LoggableActivity extends AppCompatActivity {
+public abstract class LoggableActivity extends BaseActivity {
     public void appendToLog(String text) {
         appendToLog(text, true);
     }
diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index ee20e9ded..4e94c5bd6 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -28,7 +28,7 @@ import org.apache.commons.io.*;
 import net.kdt.pojavlaunch.prefs.*;
 import org.lwjgl.glfw.*;
 
-public class PojavLoginActivity extends AppCompatActivity
+public class PojavLoginActivity extends BaseActivity
 // MineActivity
 {
     private Object mLockStoragePerm = new Object(),
@@ -295,7 +295,7 @@ public class PojavLoginActivity extends AppCompatActivity
         LauncherPreferences.PREF_LANGUAGE = locale.getLanguage();
         LauncherPreferences.DEFAULT_PREF.edit().putString("language", LauncherPreferences.PREF_LANGUAGE).commit();
         Locale.setDefault(locale);
-        Configuration config = new Configuration();
+        Configuration config = getResources().getConfiguration();
         config.setLocale(locale);
         // TODO replace deprecated
         getResources().updateConfiguration(config, getResources().getDisplayMetrics());