Implement Android N new language flow

DaxiaK · May 15, 2017 · 16ec156 · 16ec156
1 parent 25685b6
commit 16ec156
Show file tree

Hide file tree

Showing 15 changed files with 218 additions and 46 deletions.
diff --git a/app/src/main/java/com/kiminonawa/mydiary/backup/BackupActivity.java b/app/src/main/java/com/kiminonawa/mydiary/backup/BackupActivity.java
@@ -1,6 +1,7 @@
 package com.kiminonawa.mydiary.backup;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -14,6 +15,8 @@
 
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.main.MainActivity;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.gui.MyDiaryButton;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
@@ -88,6 +91,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
         }
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
 
     @Override
     public void onClick(View v) {

diff --git a/app/src/main/java/com/kiminonawa/mydiary/backup/DirectoryPickerActivity.java b/app/src/main/java/com/kiminonawa/mydiary/backup/DirectoryPickerActivity.java
@@ -1,7 +1,10 @@
 package com.kiminonawa.mydiary.backup;
 
+import android.content.Context;
 import android.os.Environment;
 
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
@@ -38,6 +41,12 @@ protected AbstractFilePickerFragment<File> getFragment(
         return currentFragment;
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     /**
      * Override the back-button.
      */

diff --git a/app/src/main/java/com/kiminonawa/mydiary/contacts/ContactsActivity.java b/app/src/main/java/com/kiminonawa/mydiary/contacts/ContactsActivity.java
@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.contacts;
 
+import android.content.Context;
 import android.database.Cursor;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
@@ -14,6 +15,8 @@
 
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.db.DBManager;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.SPFManager;
 import com.kiminonawa.mydiary.shared.ThemeManager;
 import com.kiminonawa.mydiary.shared.gui.LetterComparator;
@@ -127,6 +130,11 @@ protected void onCreate(Bundle savedInstanceState) {
         initTopicAdapter();
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
     private void initLanguageStr() {
         EN = Locale.ENGLISH.getLanguage();
         JA = Locale.JAPANESE.getLanguage();

diff --git a/app/src/main/java/com/kiminonawa/mydiary/entries/DiaryActivity.java b/app/src/main/java/com/kiminonawa/mydiary/entries/DiaryActivity.java
@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.entries;
 
+import android.content.Context;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -26,6 +27,8 @@
 import com.kiminonawa.mydiary.entries.diary.item.IDairyRow;
 import com.kiminonawa.mydiary.entries.entries.EntriesEntity;
 import com.kiminonawa.mydiary.entries.entries.EntriesFragment;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.ThemeManager;
 import com.kiminonawa.mydiary.shared.statusbar.ChinaPhoneHelper;
 
@@ -121,6 +124,11 @@ protected void onStop() {
         mGoogleApiClient.disconnect();
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
 
     /**
      *

diff --git a/app/src/main/java/com/kiminonawa/mydiary/entries/photo/PhotoDetailViewerActivity.java b/app/src/main/java/com/kiminonawa/mydiary/entries/photo/PhotoDetailViewerActivity.java
@@ -1,6 +1,7 @@
 package com.kiminonawa.mydiary.entries.photo;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
@@ -12,6 +13,8 @@
 import android.widget.Toast;
 
 import com.kiminonawa.mydiary.R;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.ScreenHelper;
 
 import java.util.ArrayList;
@@ -71,6 +74,12 @@ public void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void setStatusBarColor() {
         Window window = getWindow();

diff --git a/app/src/main/java/com/kiminonawa/mydiary/entries/photo/PhotoOverviewActivity.java b/app/src/main/java/com/kiminonawa/mydiary/entries/photo/PhotoOverviewActivity.java
@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.entries.photo;
 
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -12,6 +13,8 @@
 
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.shared.FileManager;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -71,6 +74,12 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     private void loadDiaryImageData(long topicId, long diaryId) {
         FileManager diaryRoot = new FileManager(PhotoOverviewActivity.this, DIARY_ROOT_DIR);
         File topicRootFile;

diff --git a/app/src/main/java/com/kiminonawa/mydiary/init/InitActivity.java b/app/src/main/java/com/kiminonawa/mydiary/init/InitActivity.java
@@ -1,6 +1,7 @@
 package com.kiminonawa.mydiary.init;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -11,6 +12,8 @@
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.main.MainActivity;
 import com.kiminonawa.mydiary.security.PasswordActivity;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.MyDiaryApplication;
 import com.kiminonawa.mydiary.shared.SPFManager;
 
@@ -52,6 +55,11 @@ protected void onPause() {
         initHandler.removeCallbacksAndMessages(null);
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
 
     @Override
     public void onInitCompiled(boolean showReleaseNote) {

diff --git a/app/src/main/java/com/kiminonawa/mydiary/main/AboutActivity.java b/app/src/main/java/com/kiminonawa/mydiary/main/AboutActivity.java
@@ -1,10 +1,13 @@
 package com.kiminonawa.mydiary.main;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 
 import com.kiminonawa.mydiary.R;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.statusbar.ChinaPhoneHelper;
 
 /**
@@ -75,6 +78,12 @@ public void onCreate(Bundle savedInstanceState) {
         ((TextView) findViewById(R.id.TV_about_text)).setText(license.toString());
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     public class LicenseObj {
 
         public final static int MIT = 0;

diff --git a/app/src/main/java/com/kiminonawa/mydiary/main/MainActivity.java b/app/src/main/java/com/kiminonawa/mydiary/main/MainActivity.java
@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.main;
 
+import android.content.Context;
 import android.database.Cursor;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
@@ -34,6 +35,8 @@
 import com.kiminonawa.mydiary.main.topic.Memo;
 import com.kiminonawa.mydiary.oobe.CustomViewTarget;
 import com.kiminonawa.mydiary.shared.FileManager;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.SPFManager;
 import com.kiminonawa.mydiary.shared.ThemeManager;
 import com.kiminonawa.mydiary.shared.gui.MyDiaryButton;
@@ -188,6 +191,12 @@ public void onDestroy() {
         super.onDestroy();
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     @Override
     public void onBackPressed() {
         if (!isExit) {

diff --git a/app/src/main/java/com/kiminonawa/mydiary/memo/MemoActivity.java b/app/src/main/java/com/kiminonawa/mydiary/memo/MemoActivity.java
@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.memo;
 
+import android.content.Context;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
@@ -13,6 +14,8 @@
 
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.db.DBManager;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.ThemeManager;
 import com.kiminonawa.mydiary.shared.ViewTools;
 import com.kiminonawa.mydiary.shared.statusbar.ChinaPhoneHelper;
@@ -109,6 +112,12 @@ public void onClick(View v) {
         initTopicAdapter();
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     private void loadMemo(boolean openDB) {
         memoList.clear();
         if (openDB) {

diff --git a/app/src/main/java/com/kiminonawa/mydiary/security/PasswordActivity.java b/app/src/main/java/com/kiminonawa/mydiary/security/PasswordActivity.java
@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.security;
 
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
@@ -13,6 +14,8 @@
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.main.MainActivity;
 import com.kiminonawa.mydiary.shared.Encryption;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.MyDiaryApplication;
 import com.kiminonawa.mydiary.shared.SPFManager;
 import com.kiminonawa.mydiary.shared.ThemeManager;
@@ -123,6 +126,12 @@ public void onClick(View v) {
         initUI();
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     private void initUI() {
         IV_password_number_1.requestFocus();
         switch (currentMode) {

diff --git a/app/src/main/java/com/kiminonawa/mydiary/setting/SettingActivity.java b/app/src/main/java/com/kiminonawa/mydiary/setting/SettingActivity.java
@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.setting;
 
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.ColorDrawable;
@@ -17,6 +18,8 @@
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.shared.ColorTools;
 import com.kiminonawa.mydiary.shared.FileManager;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.OldVersionHelper;
 import com.kiminonawa.mydiary.shared.PermissionHelper;
 import com.kiminonawa.mydiary.shared.SPFManager;
@@ -136,6 +139,12 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     @Override
     public void onRequestPermissionsResult(int requestCode,
                                            String permissions[], int[] grantResults) {