diff --git a/app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt b/app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt index e3ba1cd38..15e5fe7ea 100644 --- a/app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt +++ b/app/src/main/java/helium314/keyboard/settings/dialogs/LayoutEditDialog.kt @@ -54,7 +54,6 @@ fun LayoutEditDialog( || isNameValid(LayoutUtilsCustom.getCustomLayoutName(displayNameValue.text)) ) - val keyboardHeight = WindowInsets.ime.getBottom(LocalDensity.current) TextInputDialog( onDismissRequest = { job?.cancel() @@ -85,10 +84,10 @@ fun LayoutEditDialog( job?.cancel() if (!valid) { job = scope.launch { - delay(3000) val message = Log.getLog(10) .lastOrNull { it.tag == "LayoutUtilsCustom" }?.message ?.split("\n")?.take(2)?.joinToString("\n") + delay(3000) Toast.makeText(ctx, ctx.getString(R.string.layout_error, message), Toast.LENGTH_LONG).show() } } diff --git a/app/src/main/java/helium314/keyboard/settings/preferences/LayoutEditPreference.kt b/app/src/main/java/helium314/keyboard/settings/preferences/LayoutEditPreference.kt deleted file mode 100644 index 3e46e0806..000000000 --- a/app/src/main/java/helium314/keyboard/settings/preferences/LayoutEditPreference.kt +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-only -package helium314.keyboard.settings.preferences -/* -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.runtime.setValue -import androidx.compose.ui.platform.LocalContext -import helium314.keyboard.latin.utils.CUSTOM_LAYOUT_PREFIX -import helium314.keyboard.latin.utils.getCustomLayoutFiles -import helium314.keyboard.settings.Setting -import helium314.keyboard.settings.dialogs.LayoutEditDialog -import helium314.keyboard.settings.dialogs.ListPickerDialog -import java.io.File - -@Composable -fun LayoutEditPreference( - setting: Setting, - items: List, - getItemName: @Composable (String) -> String, - getDefaultLayout: @Composable (String?) -> String?, -) { - var showDialog by rememberSaveable { mutableStateOf(false) } - val ctx = LocalContext.current - var layout: String? by rememberSaveable { mutableStateOf(null) } - Preference( - name = setting.title, - onClick = { showDialog = true } - ) - if (showDialog) { - ListPickerDialog( - onDismissRequest = { showDialog = false }, - showRadioButtons = false, - confirmImmediately = true, - items = items, - getItemName = getItemName, - onItemSelected = { layout = it }, - title = { Text(setting.title) } - ) - } - if (layout != null) { - val customLayoutName = getCustomLayoutFiles(ctx).firstOrNull { - if (layout!!.startsWith(CUSTOM_LAYOUT_PREFIX)) - it.name.startsWith("$layout.") - else it.name.startsWith("$CUSTOM_LAYOUT_PREFIX$layout.") - }?.name - // todo: never set originalLayout null if custom layout file does not exist! - val originalLayout = if (customLayoutName != null) null - else getDefaultLayout(layout)?.let { ctx.assets.open("layouts" + File.separator + it).reader().readText() } - LayoutEditDialog( - layoutName = customLayoutName ?: "$CUSTOM_LAYOUT_PREFIX$layout.", - startContent = originalLayout, - displayName = getItemName(layout!!), - onDismissRequest = { layout = null } - ) - } -} -*/ \ No newline at end of file