From cef7e286cd5cbee47713b861ff9ca105b5989978 Mon Sep 17 00:00:00 2001
From: Aleksandras Kostarevas <aleks076@protonmail.com>
Date: Mon, 29 Jul 2024 20:45:25 +0300
Subject: [PATCH] Update some composition locals to not be static

---
 java/src/org/futo/inputmethod/latin/uix/UixManager.kt     | 3 ++-
 java/src/org/futo/inputmethod/latin/uix/settings/Hooks.kt | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/src/org/futo/inputmethod/latin/uix/UixManager.kt b/java/src/org/futo/inputmethod/latin/uix/UixManager.kt
index f9ef67ec9..6cdfea2b8 100644
--- a/java/src/org/futo/inputmethod/latin/uix/UixManager.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/UixManager.kt
@@ -44,6 +44,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.staticCompositionLocalOf
@@ -98,7 +99,7 @@ val LocalManager = staticCompositionLocalOf<KeyboardManagerForAction> {
     error("No LocalManager provided")
 }
 
-val LocalThemeProvider = staticCompositionLocalOf<DynamicThemeProvider> {
+val LocalThemeProvider = compositionLocalOf<DynamicThemeProvider> {
     error("No LocalThemeProvider provided")
 }
 
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/Hooks.kt b/java/src/org/futo/inputmethod/latin/uix/settings/Hooks.kt
index 5154eb745..0713111e1 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/Hooks.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/Hooks.kt
@@ -6,10 +6,10 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.edit
 import androidx.datastore.preferences.core.Preferences
@@ -28,7 +28,7 @@ class DataStoreCache(
     val currPreferences: Preferences
 )
 
-val LocalDataStoreCache = staticCompositionLocalOf<DataStoreCache?> {
+val LocalDataStoreCache = compositionLocalOf<DataStoreCache?> {
     null
 }