From 996b025d1efd619e3fd919119d4ee1cba5ee5287 Mon Sep 17 00:00:00 2001 From: sspanak Date: Mon, 3 Mar 2025 13:35:18 +0200 Subject: [PATCH] code cleanup --- .../sspanak/tt9/ime/modes/predictions/Predictions.java | 1 - .../tt9/ime/modes/predictions/SyllablePredictions.java | 1 - .../sspanak/tt9/preferences/PreferencesActivity.java | 2 +- .../tt9/preferences/screens/hotkeys/HotkeysScreen.java | 2 +- .../java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java | 7 +++---- .../java/io/github/sspanak/tt9/util/SystemSettings.java | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/Predictions.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/Predictions.java index 415a257d..e1456051 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/Predictions.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/Predictions.java @@ -120,5 +120,4 @@ abstract public class Predictions { abstract public void onAccept(String word, String sequence); abstract protected boolean isRetryAllowed(); abstract protected void onDbWords(ArrayList dbWords, boolean retryAllowed); - abstract protected ArrayList generateWordVariations(String baseWord); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/SyllablePredictions.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/SyllablePredictions.java index 57ea0f82..6d4ad686 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/SyllablePredictions.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/predictions/SyllablePredictions.java @@ -83,7 +83,6 @@ public class SyllablePredictions extends Predictions { } - @Override protected ArrayList generateWordVariations(String baseWord) { baseWord = baseWord == null ? "" : baseWord; ArrayList variants = new ArrayList<>(); diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java b/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java index d39c9535..1392c8bc 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/PreferencesActivity.java @@ -41,7 +41,7 @@ public class PreferencesActivity extends ActivityWithNavigation implements Prefe /** * onBackPressed() is deprecated, so calling the onBackPressed() on the Fragments is now more complicated. */ - @NonNull public OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) { + @NonNull public final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) { @Override public void handleOnBackPressed() { Fragment previousFragment = getSupportFragmentManager().findFragmentById(R.id.preferences_container); diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/HotkeysScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/HotkeysScreen.java index fb38d228..663652e9 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/HotkeysScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/hotkeys/HotkeysScreen.java @@ -11,7 +11,7 @@ import io.github.sspanak.tt9.preferences.settings.SettingsStore; public class HotkeysScreen extends BaseScreenFragment { public static final String NAME = "Hotkeys"; - @NonNull static HashMap hotkeys = new HashMap<>(); + @NonNull static final HashMap hotkeys = new HashMap<>(); public HotkeysScreen() { init(); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java index 7c7b0560..cf963ac8 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/BaseMainLayout.java @@ -65,7 +65,8 @@ abstract class BaseMainLayout { protected WindowInsets onApplyInsets(@NonNull View v, @NonNull WindowInsets windowInsets) { if (DeviceInfo.AT_LEAST_ANDROID_15) { - return preventEdgeToEdge(v, windowInsets); + preventEdgeToEdge(v, windowInsets); + return WindowInsets.CONSUMED; } else { return windowInsets; } @@ -77,7 +78,7 @@ abstract class BaseMainLayout { * the bottom of the View will be cut off by the system navigation bar. */ @RequiresApi(api = Build.VERSION_CODES.VANILLA_ICE_CREAM) - protected WindowInsets preventEdgeToEdge(@NonNull View v, @NonNull WindowInsets windowInsets) { + protected void preventEdgeToEdge(@NonNull View v, @NonNull WindowInsets windowInsets) { Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()); v.setPadding(insets.left, 0, insets.right, insets.bottom); @@ -90,8 +91,6 @@ abstract class BaseMainLayout { e2ePaddingBottomPortrait = insets.bottom; } } - - return WindowInsets.CONSUMED; } diff --git a/app/src/main/java/io/github/sspanak/tt9/util/SystemSettings.java b/app/src/main/java/io/github/sspanak/tt9/util/SystemSettings.java index bf27547e..c50e06e9 100644 --- a/app/src/main/java/io/github/sspanak/tt9/util/SystemSettings.java +++ b/app/src/main/java/io/github/sspanak/tt9/util/SystemSettings.java @@ -75,7 +75,7 @@ public class SystemSettings { /** * Even though the background changes automatically on Android 15, thanks to edge-to-edge, * the text/icon color remains the device default. This function allows us to change it. - * @see : the only working solution. + * @see: the only working solution. */ public static void setNavigationBarDarkTheme(@Nullable Window window, boolean dark) { if (!DeviceInfo.AT_LEAST_ANDROID_11) {