From a2016ce6d8bef4bbdbc4f82f32a980ce1d344f6a Mon Sep 17 00:00:00 2001 From: Mengchou97 Date: Sat, 6 Jun 2026 23:26:53 +0700 Subject: [PATCH] following PR suggestion on whitespace changes and revert --- .../com/keyman/android/SystemKeyboard.java | 11 ++- .../com/tavultesoft/kmapro/MainActivity.java | 29 +++----- .../res/layout/fragment_select_language.xml | 19 +++-- .../KMAPro/kMAPro/src/main/res/menu/main.xml | 73 +------------------ .../src/main/res/values-night/styles.xml | 4 - .../kMAPro/src/main/res/values/strings.xml | 3 + 6 files changed, 27 insertions(+), 112 deletions(-) diff --git a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java index 456b4bea23..5306b0ce32 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java +++ b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java @@ -1,3 +1,7 @@ +/** + * Copyright (C) 2017 SIL International. All rights reserved. + */ + package com.keyman.android; import com.keyman.engine.util.DownloadFileUtils; @@ -36,12 +40,7 @@ import android.content.Intent; import io.sentry.android.core.SentryAndroid; import io.sentry.Sentry; - - /** - * Copyright (C) 2017 SIL International. All rights reserved. - */ - - public class SystemKeyboard extends InputMethodService implements OnKeyboardEventListener { +public class SystemKeyboard extends InputMethodService implements OnKeyboardEventListener { private static View inputView = null; private KMHardwareKeyboardInterpreter interpreter = null; diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java index e23b86375e..ba12970725 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java @@ -97,8 +97,6 @@ import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsControllerCompat; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.drawerlayout.widget.DrawerLayout; - import androidx.core.content.ContextCompat; import android.provider.Settings; @@ -125,15 +123,10 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; import android.widget.Toast; +import androidx.core.view.GravityCompat; import android.view.Gravity; import android.view.inputmethod.InputMethodManager; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.appcompat.app.ActionBarDrawerToggle; -import com.google.android.material.navigation.NavigationView; -import androidx.core.content.ContextCompat; -import androidx.core.view.GravityCompat; -import android.view.MenuItem; import androidx.appcompat.widget.AppCompatCheckBox; import io.sentry.android.core.SentryAndroid; @@ -187,7 +180,6 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene AppCompatDelegate.setDefaultNightMode(savedMode); getDelegate().applyDayNight(); super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); context = this; checkSendCrashReport(); @@ -255,14 +247,6 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene setSupportActionBar(toolbar); getSupportActionBar().setTitle(null); - getSupportActionBar().setDisplayUseLogoEnabled(true); - getSupportActionBar().setDisplayShowHomeEnabled(true); - getSupportActionBar().setDisplayShowTitleEnabled(true); - getSupportActionBar().setLogo(R.drawable.keyman_logo); - - getSupportActionBar().setDisplayUseLogoEnabled(false); - getSupportActionBar().setDisplayShowHomeEnabled(false); - getSupportActionBar().setDisplayUseLogoEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); getSupportActionBar().setLogo(R.drawable.keyman_logo_mode); @@ -404,6 +388,10 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene return; } else { ClipData userdata = returnIntent.getClipData(); + if (userdata == null) { + checkGetStarted(); + return; + } int len = userdata.getItemCount(); for (int i = 0; i < len; i++) { Uri fileUri = userdata.getItemAt(i).getUri(); @@ -554,7 +542,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene SharedPreferences.Editor editor = prefs.edit(); editor.putString(userTextKey, textView.getText().toString()); editor.putInt(userTextSizeKey, textSize); - editor.commit(); + editor.apply(); } @Override @@ -1353,6 +1341,8 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene openThemeDialog(); } else if (id == R.id.nav_about_current_keyboard || id == R.id.nav_help_active_keyboard) { showCurrentKeyboardSettings(); + } else { + return false; } return true; @@ -1774,7 +1764,6 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene if (progressDialog != null && progressDialog.isShowing()) { progressDialog.dismiss(); } - ; progressDialog = null; } @@ -1931,4 +1920,4 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene outStream.flush(); outStream.close(); } -} +} \ No newline at end of file diff --git a/android/KMAPro/kMAPro/src/main/res/layout/fragment_select_language.xml b/android/KMAPro/kMAPro/src/main/res/layout/fragment_select_language.xml index e06f78593b..dfa5d5f532 100644 --- a/android/KMAPro/kMAPro/src/main/res/layout/fragment_select_language.xml +++ b/android/KMAPro/kMAPro/src/main/res/layout/fragment_select_language.xml @@ -1,15 +1,14 @@ - - + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".SelectLanguageFragment" > + + diff --git a/android/KMAPro/kMAPro/src/main/res/menu/main.xml b/android/KMAPro/kMAPro/src/main/res/menu/main.xml index 9202c14e1c..6a74a945f5 100644 --- a/android/KMAPro/kMAPro/src/main/res/menu/main.xml +++ b/android/KMAPro/kMAPro/src/main/res/menu/main.xml @@ -4,81 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/KMAPro/kMAPro/src/main/res/values-night/styles.xml b/android/KMAPro/kMAPro/src/main/res/values-night/styles.xml index 66b83e54cc..3667b18a9f 100644 --- a/android/KMAPro/kMAPro/src/main/res/values-night/styles.xml +++ b/android/KMAPro/kMAPro/src/main/res/values-night/styles.xml @@ -43,10 +43,6 @@ #424242 - - - - diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml index ce8a9cd7e5..066daa5c0a 100644 --- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml +++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml @@ -309,4 +309,7 @@ Unable to launch web browser + + + Menu