fix: move pref props from top-level to class fields

This commit is contained in:
Akash Yadav
2024-03-29 15:48:48 +05:30
parent 108cb00cb8
commit 765d81b77b
56 changed files with 1105 additions and 1073 deletions
@@ -37,7 +37,7 @@ import com.itsaky.androidide.lsp.models.CompletionItemKind.INTERFACE
import com.itsaky.androidide.lsp.models.CompletionItemKind.METHOD
import com.itsaky.androidide.lsp.models.MemberCompletionData
import com.itsaky.androidide.lsp.models.MethodCompletionData
import com.itsaky.androidide.preferences.internal.useCustomFont
import com.itsaky.androidide.preferences.internal.EditorPreferences
import com.itsaky.androidide.resources.R.string.msg_api_info_deprecated
import com.itsaky.androidide.resources.R.string.msg_api_info_removed
import com.itsaky.androidide.resources.R.string.msg_api_info_since
@@ -85,7 +85,8 @@ class CompletionListAdapter : EditorCompletionAdapter() {
binding.completionLabel.text = label
binding.completionType.text = type
binding.completionDetail.text = desc
binding.completionIconText.setTypeface(customOrJBMono(useCustomFont), Typeface.BOLD)
binding.completionIconText.setTypeface(customOrJBMono(EditorPreferences.useCustomFont),
Typeface.BOLD)
if (desc.isEmpty()) {
binding.completionDetail.visibility = View.GONE
}
@@ -21,8 +21,7 @@ import com.itsaky.androidide.editor.api.IEditor
import com.itsaky.androidide.editor.ui.IDECompletionPublisher
import com.itsaky.androidide.lookup.Lookup
import com.itsaky.androidide.lsp.api.ILanguageServer
import com.itsaky.androidide.preferences.internal.tabSize
import com.itsaky.androidide.preferences.internal.useSoftTab
import com.itsaky.androidide.preferences.internal.EditorPreferences
import com.itsaky.androidide.progress.ICancelChecker
import io.github.rosemoe.sora.lang.Language
import io.github.rosemoe.sora.lang.completion.CompletionCancelledException
@@ -46,7 +45,7 @@ abstract class IDELanguage : Language {
get() = null
open fun getTabSize(): Int {
return tabSize
return EditorPreferences.tabSize
}
@Throws(CompletionCancelledException::class)
@@ -99,7 +98,7 @@ abstract class IDELanguage : Language {
}
override fun useTab(): Boolean {
return !useSoftTab
return !EditorPreferences.useSoftTab
}
override fun getFormatter(): Formatter {
@@ -20,8 +20,7 @@ package com.itsaky.androidide.editor.schemes
import android.content.Context
import androidx.annotation.WorkerThread
import com.itsaky.androidide.eventbus.events.editor.ColorSchemeInvalidatedEvent
import com.itsaky.androidide.preferences.internal.DEFAULT_COLOR_SCHEME
import com.itsaky.androidide.preferences.internal.colorScheme
import com.itsaky.androidide.preferences.internal.EditorPreferences
import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE
import com.itsaky.androidide.utils.Environment
import com.itsaky.androidide.utils.isSystemInDarkMode
@@ -61,7 +60,7 @@ object IDEColorSchemeProvider {
*/
private var defaultScheme: IDEColorScheme? = null
get() {
return field ?: getColorScheme(DEFAULT_COLOR_SCHEME).also { scheme ->
return field ?: getColorScheme(EditorPreferences.DEFAULT_COLOR_SCHEME).also { scheme ->
field = scheme
isDefaultSchemeLoaded = scheme != null
}
@@ -75,7 +74,7 @@ object IDEColorSchemeProvider {
*/
private var currentScheme: IDEColorScheme? = null
get() {
return field ?: getColorScheme(colorScheme).also { scheme ->
return field ?: getColorScheme(EditorPreferences.colorScheme).also { scheme ->
field = scheme
isCurrentSchemeLoaded = scheme != null
}
@@ -99,7 +98,8 @@ object IDEColorSchemeProvider {
scheme.darkVariant?.load()
scheme
} catch (err: Exception) {
log.error("An error occurred while loading color scheme '{}'", colorScheme, err)
log.error("An error occurred while loading color scheme '{}'", EditorPreferences.colorScheme,
err)
null
}
}
@@ -63,8 +63,7 @@ import com.itsaky.androidide.lsp.models.SignatureHelp
import com.itsaky.androidide.lsp.models.SignatureHelpParams
import com.itsaky.androidide.models.Position
import com.itsaky.androidide.models.Range
import com.itsaky.androidide.preferences.internal.tabSize
import com.itsaky.androidide.preferences.internal.visiblePasswordFlag
import com.itsaky.androidide.preferences.internal.EditorPreferences
import com.itsaky.androidide.progress.ICancelChecker
import com.itsaky.androidide.syntax.colorschemes.DynamicColorScheme
import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE
@@ -187,7 +186,7 @@ open class IDEEditor @JvmOverloads constructor(
*/
fun createInputTypeFlags(): Int {
var flags = EditorInfo.TYPE_CLASS_TEXT or EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE or EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS
if (visiblePasswordFlag) {
if (EditorPreferences.visiblePasswordFlag) {
flags = flags or EditorInfo.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
}
return flags
@@ -438,7 +437,7 @@ open class IDEEditor @JvmOverloads constructor(
}
override fun getTabWidth(): Int {
return tabSize
return EditorPreferences.tabSize
}
override fun beginSearchMode() {