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

make it compile again

Browse source
This commit is contained in:
Helium314 2025-02-01 08:43:04 +01:00
parent 5e7482085f
commit 12d411c294
7 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/helium314/keyboard/latin/LatinIME.java
View file

@ -73,7 +73,6 @@ import helium314.keyboard.latin.inputlogic.InputLogic;
import helium314.keyboard.latin.permissions.PermissionsManager; import helium314.keyboard.latin.permissions.PermissionsManager;
import helium314.keyboard.latin.personalization.PersonalizationHelper; import helium314.keyboard.latin.personalization.PersonalizationHelper;
import helium314.keyboard.latin.settings.Settings; import helium314.keyboard.latin.settings.Settings;
import helium314.keyboard.latin.settings.SettingsActivity;
import helium314.keyboard.latin.settings.SettingsValues; import helium314.keyboard.latin.settings.SettingsValues;
import helium314.keyboard.latin.suggestions.SuggestionStripView; import helium314.keyboard.latin.suggestions.SuggestionStripView;
import helium314.keyboard.latin.suggestions.SuggestionStripViewAccessor; import helium314.keyboard.latin.suggestions.SuggestionStripViewAccessor;
@ -89,8 +88,8 @@ import helium314.keyboard.latin.utils.StatsUtilsManager;
import helium314.keyboard.latin.utils.SubtypeLocaleUtils; import helium314.keyboard.latin.utils.SubtypeLocaleUtils;
import helium314.keyboard.latin.utils.SubtypeSettingsKt; import helium314.keyboard.latin.utils.SubtypeSettingsKt;
import helium314.keyboard.latin.utils.ViewLayoutUtils; import helium314.keyboard.latin.utils.ViewLayoutUtils;
import helium314.keyboard.settings.AllPrefsKt;
import helium314.keyboard.settings.SettingsActivity2; import helium314.keyboard.settings.SettingsActivity2;
import helium314.keyboard.settings.SettingsActivityKt;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@ -1983,9 +1982,9 @@ public class LatinIME extends InputMethodService implements
private void reloadIfNecessary() { private void reloadIfNecessary() {
// better do the reload when showing the keyboard next time, and not on settings change // better do the reload when showing the keyboard next time, and not on settings change
if (AllPrefsKt.themeChanged) { if (SettingsActivityKt.keyboardNeedsReload) {
mKeyboardSwitcher.forceUpdateKeyboardTheme(mDisplayContext); mKeyboardSwitcher.forceUpdateKeyboardTheme(mDisplayContext);
AllPrefsKt.themeChanged = false; SettingsActivityKt.keyboardNeedsReload = false;
} }
} }
} }

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

@ -146,4 +146,4 @@ class SettingsActivity2 : AppCompatActivity(), SharedPreferences.OnSharedPrefere
} }
@JvmField @JvmField
var needsKeyboardReload = false var keyboardNeedsReload = false

4
app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt
View file

@ -29,7 +29,7 @@ import helium314.keyboard.settings.SettingsDestination
import helium314.keyboard.settings.SliderPreference import helium314.keyboard.settings.SliderPreference
import helium314.keyboard.settings.SwitchPreference import helium314.keyboard.settings.SwitchPreference
import helium314.keyboard.settings.Theme import helium314.keyboard.settings.Theme
import helium314.keyboard.settings.needsKeyboardReload import helium314.keyboard.settings.keyboardNeedsReload
@Composable @Composable
fun AdvancedSettingsScreen( fun AdvancedSettingsScreen(
@ -229,7 +229,7 @@ fun createAdvancedPrefs(context: Context) = listOf(
else -> "version unknown" else -> "version unknown"
} }
}, },
onValueChanged = { needsKeyboardReload = true } onValueChanged = { keyboardNeedsReload = true }
) )
}, },
PrefDef(context, Settings.PREF_URL_DETECTION, R.string.url_detection_title, R.string.url_detection_summary) { PrefDef(context, Settings.PREF_URL_DETECTION, R.string.url_detection_title, R.string.url_detection_summary) {

4
app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt
View file

@ -22,7 +22,7 @@ import helium314.keyboard.settings.SearchPrefScreen
import helium314.keyboard.settings.SettingsActivity2 import helium314.keyboard.settings.SettingsActivity2
import helium314.keyboard.settings.SwitchPreference import helium314.keyboard.settings.SwitchPreference
import helium314.keyboard.settings.Theme import helium314.keyboard.settings.Theme
import helium314.keyboard.settings.needsKeyboardReload import helium314.keyboard.settings.keyboardNeedsReload
@Composable @Composable
fun DebugScreen( fun DebugScreen(
@ -63,7 +63,7 @@ fun createDebugPrefs(context: Context) = listOf(
} }
}, },
PrefDef(context, DebugSettings.PREF_SHOW_SUGGESTION_INFOS, R.string.prefs_show_suggestion_infos) { def -> PrefDef(context, DebugSettings.PREF_SHOW_SUGGESTION_INFOS, R.string.prefs_show_suggestion_infos) { def ->
SwitchPreference(def, false) { needsKeyboardReload = true } SwitchPreference(def, false) { keyboardNeedsReload = true }
}, },
PrefDef(context, DebugSettings.PREF_FORCE_NON_DISTINCT_MULTITOUCH, R.string.prefs_force_non_distinct_multitouch) { def -> PrefDef(context, DebugSettings.PREF_FORCE_NON_DISTINCT_MULTITOUCH, R.string.prefs_force_non_distinct_multitouch) { def ->
SwitchPreference(def, false) { needsRestart = true } SwitchPreference(def, false) { needsRestart = true }

6
app/src/main/java/helium314/keyboard/settings/screens/GestureTypingScreen.kt
View file

@ -20,7 +20,7 @@ import helium314.keyboard.settings.SettingsActivity2
import helium314.keyboard.settings.SliderPreference import helium314.keyboard.settings.SliderPreference
import helium314.keyboard.settings.SwitchPreference import helium314.keyboard.settings.SwitchPreference
import helium314.keyboard.settings.Theme import helium314.keyboard.settings.Theme
import helium314.keyboard.settings.needsKeyboardReload import helium314.keyboard.settings.keyboardNeedsReload
@Composable @Composable
fun GestureTypingScreen( fun GestureTypingScreen(
@ -74,7 +74,7 @@ fun createGestureTypingPrefs(context: Context) = listOf(
SwitchPreference( SwitchPreference(
def = it, def = it,
default = true default = true
) { needsKeyboardReload = true } ) { keyboardNeedsReload = true }
}, },
PrefDef(context, Settings.PREF_GESTURE_SPACE_AWARE, R.string.gesture_space_aware, R.string.gesture_space_aware_summary) { PrefDef(context, Settings.PREF_GESTURE_SPACE_AWARE, R.string.gesture_space_aware, R.string.gesture_space_aware_summary) {
SwitchPreference( SwitchPreference(
@ -106,7 +106,7 @@ fun createGestureTypingPrefs(context: Context) = listOf(
range = 100f..1900f, range = 100f..1900f,
description = { stringResource(R.string.abbreviation_unit_milliseconds, (it + 100).toString()) }, description = { stringResource(R.string.abbreviation_unit_milliseconds, (it + 100).toString()) },
// todo: 50 ms steps? // todo: 50 ms steps?
) { needsKeyboardReload = true } ) { keyboardNeedsReload = true }
}, },
) )

4
app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt
View file

@ -37,7 +37,7 @@ import helium314.keyboard.settings.SettingsActivity2
import helium314.keyboard.settings.SwitchPreference import helium314.keyboard.settings.SwitchPreference
import helium314.keyboard.settings.Theme import helium314.keyboard.settings.Theme
import helium314.keyboard.settings.dialogs.ConfirmationDialog import helium314.keyboard.settings.dialogs.ConfirmationDialog
import helium314.keyboard.settings.needsKeyboardReload import helium314.keyboard.settings.keyboardNeedsReload
@Composable @Composable
fun TextCorrectionScreen( fun TextCorrectionScreen(
@ -204,7 +204,7 @@ fun createCorrectionPrefs(context: Context) = listOf(
R.string.bigram_prediction, R.string.bigram_prediction,
R.string.bigram_prediction_summary R.string.bigram_prediction_summary
) { ) {
SwitchPreference(it, true) { needsKeyboardReload = true } SwitchPreference(it, true) { keyboardNeedsReload = true }
}, },
PrefDef(context, PrefDef(context,
Settings.PREF_CENTER_SUGGESTION_TEXT_TO_ENTER, Settings.PREF_CENTER_SUGGESTION_TEXT_TO_ENTER,

12
app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt
View file

@ -32,6 +32,7 @@ import helium314.keyboard.latin.utils.defaultClipboardToolbarPref
import helium314.keyboard.latin.utils.defaultPinnedToolbarPref import helium314.keyboard.latin.utils.defaultPinnedToolbarPref
import helium314.keyboard.latin.utils.defaultToolbarPref import helium314.keyboard.latin.utils.defaultToolbarPref
import helium314.keyboard.latin.utils.getStringResourceOrName import helium314.keyboard.latin.utils.getStringResourceOrName
import helium314.keyboard.latin.utils.prefs
import helium314.keyboard.settings.AllPrefs import helium314.keyboard.settings.AllPrefs
import helium314.keyboard.settings.NonSettingsPrefs import helium314.keyboard.settings.NonSettingsPrefs
import helium314.keyboard.settings.PrefDef import helium314.keyboard.settings.PrefDef
@ -42,8 +43,7 @@ import helium314.keyboard.settings.SwitchPreference
import helium314.keyboard.settings.Theme import helium314.keyboard.settings.Theme
import helium314.keyboard.settings.dialogs.ReorderDialog import helium314.keyboard.settings.dialogs.ReorderDialog
import helium314.keyboard.settings.dialogs.ToolbarKeysCustomizer import helium314.keyboard.settings.dialogs.ToolbarKeysCustomizer
import helium314.keyboard.settings.prefs import helium314.keyboard.settings.keyboardNeedsReload
import helium314.keyboard.settings.needsKeyboardReload
@Composable @Composable
fun ToolbarScreen( fun ToolbarScreen(
@ -123,7 +123,7 @@ fun createToolbarPrefs(context: Context) = listOf(
SwitchPreference( SwitchPreference(
def, def,
false, false,
) { needsKeyboardReload = true } ) { keyboardNeedsReload = true }
}, },
PrefDef(context, Settings.PREF_AUTO_SHOW_TOOLBAR, R.string.auto_show_toolbar, R.string.auto_show_toolbar_summary) { def -> PrefDef(context, Settings.PREF_AUTO_SHOW_TOOLBAR, R.string.auto_show_toolbar, R.string.auto_show_toolbar_summary) { def ->
SwitchPreference( SwitchPreference(
@ -145,8 +145,6 @@ fun createToolbarPrefs(context: Context) = listOf(
} }
) )
private class KeyAndState(var name: String, var state: Boolean)
@Composable @Composable
fun ToolbarKeyReorderDialog( fun ToolbarKeyReorderDialog(
prefKey: String, prefKey: String,
@ -164,7 +162,7 @@ fun ToolbarKeyReorderDialog(
onConfirmed = { reorderedItems -> onConfirmed = { reorderedItems ->
val value = reorderedItems.joinToString(";") { it.name + "," + it.state } val value = reorderedItems.joinToString(";") { it.name + "," + it.state }
prefs.edit().putString(prefKey, value).apply() prefs.edit().putString(prefKey, value).apply()
needsKeyboardReload = true keyboardNeedsReload = true
}, },
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
items = items, items = items,
@ -185,6 +183,8 @@ fun ToolbarKeyReorderDialog(
) )
} }
private class KeyAndState(var name: String, var state: Boolean)
@Preview @Preview
@Composable @Composable
private fun Preview() { private fun Preview() {