优化跟随系统语种的处理逻辑

优化监听系统语种变化实现方式
删除 Android 13 localeConfig 适配

Author: getActivity

HelpDoc.md

@@ -209,11 +209,9 @@ public final class MainActivity extends Activity {
     @NonNull
     public static Map<String, String> generateLanguageRequestHeader() {
         Map<String, String> map = new HashMap<>(1);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            // Android 13 上面语种失效的问题解决方案
-            // https://developer.android.google.cn/about/versions/13/features/app-languages?hl=zh-cn#consider-header
-            map.put("Accept-Language", String.valueOf(MultiLanguages.getAppLanguage()));
-        }
+        // Android 13 上面语种失效的问题解决方案
+        // https://developer.android.google.cn/about/versions/13/features/app-languages?hl=zh-cn#consider-header
+        map.put("Accept-Language", String.valueOf(MultiLanguages.getAppLanguage()));
         return map;
     }
 }

README.md

@@ -2,7 +2,7 @@
 
 * 项目地址：[Github](https://github.com/getActivity/MultiLanguages)
 
-* 可以扫码下载 Demo 进行演示或者测试，如果扫码下载不了的，[点击此处可直接下载](https://github.com/getActivity/MultiLanguages/releases/download/9.0/MultiLanguages.apk)
+* 可以扫码下载 Demo 进行演示或者测试，如果扫码下载不了的，[点击此处可直接下载](https://github.com/getActivity/MultiLanguages/releases/download/9.2/MultiLanguages.apk)
 
 ![](picture/demo_code.png)
 
@@ -37,7 +37,7 @@ dependencyResolutionManagement {
 ```groovy
 dependencies {
     // 语种切换框架：https://github.com/getActivity/MultiLanguages
-    implementation 'com.github.getActivity:MultiLanguages:9.0'
+    implementation 'com.github.getActivity:MultiLanguages:9.2'
 }
 ```
 
@@ -120,9 +120,6 @@ MultiLanguages.updateAppLanguage(Resources resources);
 
 // 设置默认的语种（越早设置越好）
 MultiLanguages.setDefaultLanguage(Locale locale);
-
-// 获取语种系统设置界面（Android 13 及以上才有的）
-Intent intent = MultiLanguages.getLanguageSettingIntent();
 ```
 
 #### 语种变化监听器

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.hjq.language.demo"
         minSdkVersion 16
         targetSdkVersion 34
-        versionCode 90
-        versionName "9.0"
+        versionCode 902
+        versionName "9.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -78,7 +78,7 @@ dependencies {
     implementation 'com.github.getActivity:TitleBar:10.5'
 
     // 吐司框架：https://github.com/getActivity/Toaster
-    implementation 'com.github.getActivity:Toaster:12.5'
+    implementation 'com.github.getActivity:Toaster:12.6'
 
     // 内存泄漏检测：https://github.com/square/leakcanary
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'

app/src/main/AndroidManifest.xml

@@ -10,7 +10,6 @@
         android:name=".AppApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:localeConfig="@xml/locales_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme"

app/src/main/java/com/hjq/language/demo/MainActivity.java

@@ -180,11 +180,9 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
     @NonNull
     public static Map<String, String> generateLanguageRequestHeader() {
         Map<String, String> map = new HashMap<>(1);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            // Android 13 上面语种失效的问题解决方案
-            // https://developer.android.google.cn/about/versions/13/features/app-languages?hl=zh-cn#consider-header
-            map.put("Accept-Language", String.valueOf(MultiLanguages.getAppLanguage()));
-        }
+        // Android 13 上面语种失效的问题解决方案
+        // https://developer.android.google.cn/about/versions/13/features/app-languages?hl=zh-cn#consider-header
+        map.put("Accept-Language", String.valueOf(MultiLanguages.getAppLanguage()));
         return map;
     }
 }

app/src/main/res/xml/locales_config.xml

@@ -5,8 +5,8 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionCode 90
-        versionName "9.0"
+        versionCode 902
+        versionName "9.2"
     }
 
     android.libraryVariants.configureEach { variant ->

library/build.gradle

@@ -1 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest package="com.hjq.language" />

library/src/main/AndroidManifest.xml

@@ -0,0 +1,41 @@
+package com.hjq.language;
+
+import android.app.Application;
+import android.content.ComponentCallbacks;
+import android.content.res.Configuration;
+
+/**
+ *    author : Android 轮子哥
+ *    github : https://github.com/getActivity/MultiLanguages
+ *    time   : 2019/05/06
+ *    desc   : 手机配置变化监听
+ */
+final class ConfigurationObserver implements ComponentCallbacks {
+
+    /**
+     * 注册系统语种变化监听
+     */
+    static void register(Application application) {
+        ConfigurationObserver configurationObserver = new ConfigurationObserver();
+        application.registerComponentCallbacks(configurationObserver);
+    }
+
+    /**
+     * 手机的配置发生了变化
+     */
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        if (newConfig == null) {
+            return;
+        }
+        // 如果当前是跟随系统语种，就则不往下执行
+        if (MultiLanguages.isSystemLanguage(MultiLanguages.getApplication())) {
+            return;
+        }
+        // 更新 Application 的配置，否则会出现横竖屏切换之后 Application 的 orientation 没有随之变化的问题
+        LanguagesUtils.updateConfigurationChanged(MultiLanguages.getApplication(), newConfig);
+    }
+
+    @Override
+    public void onLowMemory() {}
+}

library/src/main/java/com/hjq/language/ConfigurationObserver.java

@@ -1,9 +1,7 @@
 package com.hjq.language;
 
-import android.app.LocaleManager;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.text.TextUtils;
 import java.util.Locale;
 
@@ -44,6 +42,7 @@ static Locale readAppLanguageSetting(Context context) {
 
         String language = getSharedPreferences(context).getString(KEY_LANGUAGE, "");
         String country = getSharedPreferences(context).getString(KEY_COUNTRY, "");
+
         if (!TextUtils.isEmpty(language)) {
             sCurrentLocale = new Locale(language, country);
             return sCurrentLocale;
@@ -54,18 +53,6 @@ static Locale readAppLanguageSetting(Context context) {
             return sCurrentLocale;
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            // 读取用户在《设置 > 系统 > 语言和输入法 > 应用语言》设置的语种
-            LocaleManager localeManager = context.getSystemService(LocaleManager.class);
-            if (localeManager != null) {
-                sCurrentLocale = localeManager.getApplicationLocales().get(0);
-                // 如果用户没用设置过，则获取到为 null
-                if (sCurrentLocale != null) {
-                    return sCurrentLocale;
-                }
-            }
-        }
-
         sCurrentLocale = LanguagesUtils.getLocale(context);
 
         return sCurrentLocale;
@@ -100,6 +87,7 @@ public static boolean isSystemLanguage(Context context) {
         if (sDefaultLocale != null) {
             return false;
         }
+
         String language = getSharedPreferences(context).getString(KEY_LANGUAGE, "");
         return TextUtils.isEmpty(language);
     }

library/src/main/java/com/hjq/language/LanguagesConfig.java

@@ -2,8 +2,6 @@
 
 import android.app.LocaleManager;
 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
@@ -124,22 +122,4 @@ static Resources getLanguageResources(Context context, Locale locale) {
         }
         return new Resources(context.getAssets(), context.getResources().getDisplayMetrics(), config);
     }
-
-    /**
-     * 判断这个意图的 Activity 是否存在
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    static boolean areActivityIntent(Context context, Intent intent) {
-        if (intent == null) {
-            return false;
-        }
-        // 这里为什么不用 Intent.resolveActivity(intent) != null 来判断呢？
-        // 这是因为在 OPPO R7 Plus （Android 5.0）会出现误判，明明没有这个 Activity，却返回了 ComponentName 对象
-        PackageManager packageManager = context.getPackageManager();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            return !packageManager.queryIntentActivities(intent,
-                PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY)).isEmpty();
-        }
-        return !packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).isEmpty();
-    }
 }