|
@@ -110,6 +110,7 @@ import com.vpn.fastestvpnservice.constants.smartConnect
|
|
import com.vpn.fastestvpnservice.customItems.ServerSpecificItem
|
|
import com.vpn.fastestvpnservice.customItems.ServerSpecificItem
|
|
import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
|
|
import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
|
|
import com.vpn.fastestvpnservice.screens.isSearchModelInitialized
|
|
import com.vpn.fastestvpnservice.screens.isSearchModelInitialized
|
|
|
|
+import com.vpn.fastestvpnservice.screens.isSplashModelInitialized
|
|
import com.vpn.fastestvpnservice.screens.searchListViewModelSplash
|
|
import com.vpn.fastestvpnservice.screens.searchListViewModelSplash
|
|
import com.vpn.fastestvpnservice.screens.serverListViewModelSplash
|
|
import com.vpn.fastestvpnservice.screens.serverListViewModelSplash
|
|
import com.vpn.fastestvpnservice.screens.splashViewModelSplash
|
|
import com.vpn.fastestvpnservice.screens.splashViewModelSplash
|
|
@@ -1085,6 +1086,12 @@ fun SelectLanguage(
|
|
val basePreferenceHelper = BasePreferenceHelper(context)
|
|
val basePreferenceHelper = BasePreferenceHelper(context)
|
|
var selectedLanguage by remember { mutableStateOf(basePreferenceHelper.getLanguage()) }
|
|
var selectedLanguage by remember { mutableStateOf(basePreferenceHelper.getLanguage()) }
|
|
|
|
|
|
|
|
+ if (!isSplashModelInitialized) {
|
|
|
|
+ splashViewModelSplash = viewModel {
|
|
|
|
+ SplashViewModel(context)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
Row(
|
|
Row(
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
.fillMaxWidth()
|
|
.fillMaxWidth()
|
|
@@ -1203,7 +1210,8 @@ fun SelectLanguage(
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
|
context.getSystemService(LocaleManager::class.java).applicationLocales =
|
|
context.getSystemService(LocaleManager::class.java).applicationLocales =
|
|
LocaleList.forLanguageTags(language.code)
|
|
LocaleList.forLanguageTags(language.code)
|
|
- } else {
|
|
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
AppCompatDelegate.setApplicationLocales(
|
|
AppCompatDelegate.setApplicationLocales(
|
|
LocaleListCompat.forLanguageTags(
|
|
LocaleListCompat.forLanguageTags(
|
|
language.code
|
|
language.code
|
|
@@ -1217,6 +1225,8 @@ fun SelectLanguage(
|
|
)
|
|
)
|
|
changeLanguage(context.getString(R.string.settings))
|
|
changeLanguage(context.getString(R.string.settings))
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ splashViewModelSplash.serverDataApi()
|
|
isLanguageSheetOpen = false
|
|
isLanguageSheetOpen = false
|
|
},
|
|
},
|
|
)
|
|
)
|
|
@@ -1255,6 +1265,8 @@ fun SelectLanguage(
|
|
)
|
|
)
|
|
changeLanguage(context.getString(R.string.settings))
|
|
changeLanguage(context.getString(R.string.settings))
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ splashViewModelSplash.serverDataApi()
|
|
isLanguageSheetOpen = false
|
|
isLanguageSheetOpen = false
|
|
},
|
|
},
|
|
colors = RadioButtonDefaults.colors(
|
|
colors = RadioButtonDefaults.colors(
|