From c877e5e4bca990947e1eeafc4bfbe9074381e070 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Sun, 26 Jan 2025 18:25:43 +0100 Subject: [PATCH] move screens to subfolder --- .../java/helium314/keyboard/settings/AllPrefs.kt | 2 ++ .../keyboard/settings/SettingsNavHost.kt | 3 +++ .../settings/{ => screens}/AboutScreen.kt | 13 +++++++++++-- .../settings/{ => screens}/MainSettingsScreen.kt | 7 ++++++- .../{ => screens}/TextCorrectionScreen.kt | 15 ++++++++++++++- 5 files changed, 36 insertions(+), 4 deletions(-) rename app/src/main/java/helium314/keyboard/settings/{ => screens}/AboutScreen.kt (93%) rename app/src/main/java/helium314/keyboard/settings/{ => screens}/MainSettingsScreen.kt (94%) rename app/src/main/java/helium314/keyboard/settings/{ => screens}/TextCorrectionScreen.kt (94%) diff --git a/app/src/main/java/helium314/keyboard/settings/AllPrefs.kt b/app/src/main/java/helium314/keyboard/settings/AllPrefs.kt index 2a0ad670..a82f270c 100644 --- a/app/src/main/java/helium314/keyboard/settings/AllPrefs.kt +++ b/app/src/main/java/helium314/keyboard/settings/AllPrefs.kt @@ -6,6 +6,8 @@ import android.content.ContextWrapper import androidx.activity.ComponentActivity import androidx.annotation.StringRes import androidx.compose.runtime.Composable +import helium314.keyboard.settings.screens.createAboutPrefs +import helium314.keyboard.settings.screens.createCorrectionPrefs class AllPrefs(context: Context) { private val list = createPrefDefs(context) diff --git a/app/src/main/java/helium314/keyboard/settings/SettingsNavHost.kt b/app/src/main/java/helium314/keyboard/settings/SettingsNavHost.kt index a2254c94..d69f7602 100644 --- a/app/src/main/java/helium314/keyboard/settings/SettingsNavHost.kt +++ b/app/src/main/java/helium314/keyboard/settings/SettingsNavHost.kt @@ -9,6 +9,9 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import helium314.keyboard.settings.screens.AboutScreen +import helium314.keyboard.settings.screens.MainSettingsScreen +import helium314.keyboard.settings.screens.TextCorrectionScreen @Composable fun SettingsNavHost( diff --git a/app/src/main/java/helium314/keyboard/settings/AboutScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/AboutScreen.kt similarity index 93% rename from app/src/main/java/helium314/keyboard/settings/AboutScreen.kt rename to app/src/main/java/helium314/keyboard/settings/screens/AboutScreen.kt index 19a8271d..bcc52951 100644 --- a/app/src/main/java/helium314/keyboard/settings/AboutScreen.kt +++ b/app/src/main/java/helium314/keyboard/settings/screens/AboutScreen.kt @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-only -package helium314.keyboard.settings +package helium314.keyboard.settings.screens import android.app.Activity import android.content.Context @@ -10,6 +10,7 @@ import android.widget.TextView import android.widget.Toast import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AlertDialog import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -27,6 +28,14 @@ import helium314.keyboard.latin.settings.DebugSettings import helium314.keyboard.latin.utils.DeviceProtectedUtils import helium314.keyboard.latin.utils.Log import helium314.keyboard.latin.utils.SpannableStringUtils +import helium314.keyboard.settings.AllPrefs +import helium314.keyboard.settings.NonSettingsPrefs +import helium314.keyboard.settings.PrefDef +import helium314.keyboard.settings.Preference +import helium314.keyboard.settings.SearchPrefScreen +import helium314.keyboard.settings.SettingsActivity2 +import helium314.keyboard.settings.Theme +import helium314.keyboard.settings.getActivity import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -100,7 +109,7 @@ fun createAboutPrefs(context: Context) = listOf( + ctx.getString(R.string.hidden_features_text) + "") val message = ctx.getString(R.string.hidden_features_message, link) val dialogMessage = SpannableStringUtils.fromHtml(message) - val builder = androidx.appcompat.app.AlertDialog.Builder(ctx) + val builder = AlertDialog.Builder(ctx) .setIcon(R.drawable.ic_settings_about_hidden_features) .setTitle(R.string.hidden_features_title) .setMessage(dialogMessage) diff --git a/app/src/main/java/helium314/keyboard/settings/MainSettingsScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/MainSettingsScreen.kt similarity index 94% rename from app/src/main/java/helium314/keyboard/settings/MainSettingsScreen.kt rename to app/src/main/java/helium314/keyboard/settings/screens/MainSettingsScreen.kt index 5cb2ed13..f395b202 100644 --- a/app/src/main/java/helium314/keyboard/settings/MainSettingsScreen.kt +++ b/app/src/main/java/helium314/keyboard/settings/screens/MainSettingsScreen.kt @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-only -package helium314.keyboard.settings +package helium314.keyboard.settings.screens import android.app.Activity import android.view.View @@ -25,6 +25,11 @@ import helium314.keyboard.latin.settings.LanguageSettingsFragment import helium314.keyboard.latin.settings.PreferencesSettingsFragment import helium314.keyboard.latin.settings.ToolbarSettingsFragment import helium314.keyboard.latin.utils.JniUtils +import helium314.keyboard.settings.Preference +import helium314.keyboard.settings.PreferenceCategory +import helium314.keyboard.settings.SearchPrefScreen +import helium314.keyboard.settings.Theme +import helium314.keyboard.settings.getActivity @Composable fun MainSettingsScreen( diff --git a/app/src/main/java/helium314/keyboard/settings/TextCorrectionScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt similarity index 94% rename from app/src/main/java/helium314/keyboard/settings/TextCorrectionScreen.kt rename to app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt index f59271ce..d520731a 100644 --- a/app/src/main/java/helium314/keyboard/settings/TextCorrectionScreen.kt +++ b/app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-only -package helium314.keyboard.settings +package helium314.keyboard.settings.screens import android.Manifest import android.content.Context @@ -25,6 +25,19 @@ import helium314.keyboard.latin.settings.Settings import helium314.keyboard.latin.settings.UserDictionaryListFragment import helium314.keyboard.latin.utils.DeviceProtectedUtils import helium314.keyboard.latin.utils.Log +import helium314.keyboard.settings.AllPrefs +import helium314.keyboard.settings.ConfirmationDialog +import helium314.keyboard.settings.ListPickerDialog +import helium314.keyboard.settings.NonSettingsPrefs +import helium314.keyboard.settings.PrefDef +import helium314.keyboard.settings.Preference +import helium314.keyboard.settings.PreferenceCategory +import helium314.keyboard.settings.SearchPrefScreen +import helium314.keyboard.settings.SettingsActivity2 +import helium314.keyboard.settings.SwitchPreference +import helium314.keyboard.settings.Theme +import helium314.keyboard.settings.getActivity +import helium314.keyboard.settings.themeChanged @Composable fun TextCorrectionScreen(