From e483038b6c6451b6f50b73c20419f9884d748595 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Sat, 18 Mar 2023 15:50:50 +0530 Subject: [PATCH] feat: Add A13 per-app language preference compatibility with the existing language chooser --- .../retromusic/extensions/extensions.kt | 4 +- app/src/main/AndroidManifest.xml | 11 +++++ .../code/name/monkey/retromusic/Constants.kt | 1 + .../retromusic/LanguageContextWrapper.kt | 25 ----------- .../activities/base/AbsThemeActivity.kt | 24 +++++----- .../activities/bugreport/model/DeviceInfo.kt | 3 +- .../settings/OtherSettingsFragment.kt | 18 +++++++- .../retromusic/glide/RetroMusicGlideModule.kt | 8 +++- .../monkey/retromusic/util/PreferenceUtil.kt | 15 ++++++- app/src/main/res/xml/locales_config.xml | 45 +++++++++++++++++++ .../retromusic/extensions/extensions.kt | 4 +- 11 files changed, 113 insertions(+), 45 deletions(-) delete mode 100644 app/src/main/java/code/name/monkey/retromusic/LanguageContextWrapper.kt create mode 100644 app/src/main/res/xml/locales_config.xml diff --git a/app/src/fdroid/java/code/name/monkey/retromusic/extensions/extensions.kt b/app/src/fdroid/java/code/name/monkey/retromusic/extensions/extensions.kt index 1dc3ae58f..dffaedfa4 100644 --- a/app/src/fdroid/java/code/name/monkey/retromusic/extensions/extensions.kt +++ b/app/src/fdroid/java/code/name/monkey/retromusic/extensions/extensions.kt @@ -8,8 +8,8 @@ import androidx.fragment.app.FragmentActivity fun Context.setUpMediaRouteButton(menu: Menu) {} -fun FragmentActivity.installLanguageAndRecreate(code: String) { - recreate() +fun FragmentActivity.installLanguageAndRecreate(code: String, onInstallComplete: () -> Unit) { + onInstallComplete() } fun Context.goToProVersion() {} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c9c99e633..e35633fe0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -39,6 +39,7 @@ android:enableOnBackInvokedCallback="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:localeConfig="@xml/locales_config" android:requestLegacyExternalStorage="true" android:restoreAnyVersion="true" android:roundIcon="@mipmap/ic_launcher_round" @@ -328,6 +329,16 @@ + + + + +