luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-20 14:19:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid issues with prefChanged not changing

Browse source
This commit is contained in:
Helium314 2025-03-31 16:27:16 +02:00
parent 3dbd9c6ed9
commit 8247366bdd
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt
View file

@ -53,6 +53,7 @@ import java.util.zip.ZipOutputStream
class SettingsActivity : ComponentActivity(), SharedPreferences.OnSharedPreferenceChangeListener { class SettingsActivity : ComponentActivity(), SharedPreferences.OnSharedPreferenceChangeListener {
private val prefs by lazy { this.prefs() } private val prefs by lazy { this.prefs() }
val prefChanged = MutableStateFlow(0) // simple counter, as the only relevant information is that something changed val prefChanged = MutableStateFlow(0) // simple counter, as the only relevant information is that something changed
fun prefChanged() = prefChanged.value++
private val dictUriFlow = MutableStateFlow<Uri?>(null) private val dictUriFlow = MutableStateFlow<Uri?>(null)
private val cachedDictionaryFile by lazy { File(this.cacheDir.path + File.separator + "temp_dict") } private val cachedDictionaryFile by lazy { File(this.cacheDir.path + File.separator + "temp_dict") }
private val crashReportFiles = MutableStateFlow<List<File>>(emptyList()) private val crashReportFiles = MutableStateFlow<List<File>>(emptyList())
@ -236,6 +237,6 @@ class SettingsActivity : ComponentActivity(), SharedPreferences.OnSharedPreferen
} }
override fun onSharedPreferenceChanged(prefereces: SharedPreferences?, key: String?) { override fun onSharedPreferenceChanged(prefereces: SharedPreferences?, key: String?) {
prefChanged.value++ prefChanged()
} }
} }

2
app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt
View file

@ -77,7 +77,7 @@ fun LayoutEditDialog(
LayoutUtilsCustom.getLayoutFile(newLayoutName, layoutType, ctx).writeText(it) LayoutUtilsCustom.getLayoutFile(newLayoutName, layoutType, ctx).writeText(it)
LayoutUtilsCustom.onLayoutFileChanged() LayoutUtilsCustom.onLayoutFileChanged()
onEdited(newLayoutName) onEdited(newLayoutName)
(ctx.getActivity() as? SettingsActivity)?.prefChanged?.value = 555 (ctx.getActivity() as? SettingsActivity)?.prefChanged()
KeyboardSwitcher.getInstance().setThemeNeedsReload() KeyboardSwitcher.getInstance().setThemeNeedsReload()
}, },
confirmButtonText = stringResource(R.string.save), confirmButtonText = stringResource(R.string.save),

2
app/src/main/java/helium314/keyboard/settings/preferences/BackupRestorePreference.kt
View file

@ -168,7 +168,7 @@ fun BackupRestorePreference(setting: Setting) {
val newDictBroadcast = Intent(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION) val newDictBroadcast = Intent(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION)
ctx.getActivity()?.sendBroadcast(newDictBroadcast) ctx.getActivity()?.sendBroadcast(newDictBroadcast)
LayoutUtilsCustom.onLayoutFileChanged() LayoutUtilsCustom.onLayoutFileChanged()
(ctx.getActivity() as? SettingsActivity)?.prefChanged?.value = 210 // for settings reload (ctx.getActivity() as? SettingsActivity)?.prefChanged()
KeyboardSwitcher.getInstance().setThemeNeedsReload() KeyboardSwitcher.getInstance().setThemeNeedsReload()
} }
Preference(name = setting.title, onClick = { showDialog = true }) Preference(name = setting.title, onClick = { showDialog = true })

2
app/src/main/java/helium314/keyboard/settings/screens/SubtypeScreen.kt
View file

@ -391,7 +391,7 @@ private fun MainLayoutRow(
if (it == currentSubtype.mainLayoutName()) if (it == currentSubtype.mainLayoutName())
setCurrentSubtype(currentSubtype.withoutLayout(LayoutType.MAIN)) setCurrentSubtype(currentSubtype.withoutLayout(LayoutType.MAIN))
LayoutUtilsCustom.deleteLayout(it, LayoutType.MAIN, ctx) LayoutUtilsCustom.deleteLayout(it, LayoutType.MAIN, ctx)
(ctx.getActivity() as? SettingsActivity)?.prefChanged?.value = 1234 (ctx.getActivity() as? SettingsActivity)?.prefChanged()
} }
) )
} }