Merge pull request #2 from RaXorX/max_master

Max master

Author: RaXorX

README.md

@@ -1,3 +1,16 @@
+## Patches from Pulya Max ##
+Removed signature check on main thread
+
+Added ctrl+backspace hotkey
+
+Fixed switch-case: constant expression required error. 
+
+Fixed build in Android Studio 2024. 
+
+(For multiply lanuages) Force english when modifier keys pressed. 
+
+Settings Tab Hack(Tab enters DNS server writed in code)
+
 ## Overview ##
 
 **WARNING:** *This is a rather ancient project that was originally developed back in 2011 based on the Android 2.3 (Gingerbread) AOSP keyboard. While it still works as-is for many users, it would need some major rewrites to work with newer APIs, and some features such as language switching or popup keys don't work right on modern Android systems. I'm not currently planning on significant updates, and it's possible that it will stop working on modern devices or will no longer be updateable via the Google Play store due to minimum API level requirements. Play Store requires targeting API level 29 (Android 10), while the code was written for API level 9 (Android 2.3) from 2011.*

app/build.gradle

@@ -1,10 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace 'org.pocketworkstation.pckeyboard'
     compileSdkVersion 26
     defaultConfig {
         applicationId 'org.pocketworkstation.pckeyboard'
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion 26
         versionCode 1041001
         versionName "v1.41.1"
@@ -19,6 +20,10 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            debuggable true
+        }
+        debug {
+            debuggable true
         }
     }
     externalNativeBuild {

app/src/main/java/org/pocketworkstation/pckeyboard/CandidateView.java

@@ -46,6 +46,10 @@ public class CandidateView extends View {
 
     private LatinIME mService;
     private final ArrayList<CharSequence> mSuggestions = new ArrayList<CharSequence>();
+
+
+
+    private ArrayList<CharSequence> mSuggestions_fullText = null;
     private boolean mShowingCompletions;
     private CharSequence mSelectedString;
     private int mSelectedIndex;
@@ -62,11 +66,15 @@ public class CandidateView extends View {
     private int mCurrentWordIndex;
     private Drawable mDivider;
 
-    private static final int MAX_SUGGESTIONS = 32;
+    private static final int MAX_SUGGESTIONS = 10;
+    /**
+    *Length of R.array.suggested_commands
+    */
+    private static final int COMMANDS_COUNT = 1;
     private static final int SCROLL_PIXELS = 20;
 
-    private final int[] mWordWidth = new int[MAX_SUGGESTIONS];
-    private final int[] mWordX = new int[MAX_SUGGESTIONS];
+    private final int[] mWordWidth = new int[MAX_SUGGESTIONS+COMMANDS_COUNT];
+    private final int[] mWordX = new int[MAX_SUGGESTIONS+COMMANDS_COUNT];
     private int mPopupPreviewX;
     private int mPopupPreviewY;
 
@@ -320,6 +328,7 @@ private void scrollToTarget() {
 
     public void setSuggestions(List<CharSequence> suggestions, boolean completions,
             boolean typedWordValid, boolean haveMinimalSuggestion) {
+        mSuggestions_fullText=null;
         clear();
         if (suggestions != null) {
             int insertCount = Math.min(suggestions.size(), MAX_SUGGESTIONS);
@@ -329,6 +338,30 @@ public void setSuggestions(List<CharSequence> suggestions, boolean completions,
                     break;
             }
         }
+        mSuggestions.addAll(Arrays.asList(getResources().getStringArray(R.array.suggested_commands)));
+        mShowingCompletions = completions;
+        mTypedWordValid = typedWordValid;
+        scrollTo(0, getScrollY());
+        mTargetScrollX = 0;
+        mHaveMinimalSuggestion = haveMinimalSuggestion;
+        // Compute the total width
+        onDraw(null);
+        invalidate();
+        requestLayout();
+    }
+    public void setSuggestions(List<CharSequence> suggestions,List<CharSequence> suggestions_FullText, boolean completions,
+                               boolean typedWordValid, boolean haveMinimalSuggestion) {
+        mSuggestions_fullText=new ArrayList<>();
+        clear();
+        if (suggestions != null) {
+            int insertCount = Math.min(suggestions.size(), MAX_SUGGESTIONS);
+            for (int i=0;i<insertCount;i++) {
+                mSuggestions.add(suggestions.get(i));
+                mSuggestions_fullText.add(suggestions_FullText.get(i));
+            }
+        }
+        mSuggestions.addAll(Arrays.asList(getResources().getStringArray(R.array.suggested_commands)));
+        mSuggestions_fullText.addAll(Arrays.asList(getResources().getStringArray(R.array.suggested_commands)));
         mShowingCompletions = completions;
         mTypedWordValid = typedWordValid;
         scrollTo(0, getScrollY());
@@ -361,6 +394,7 @@ public boolean dismissAddToDictionaryHint() {
     /* package */ List<CharSequence> getSuggestions() {
         return mSuggestions;
     }
+    /* package */ ArrayList<CharSequence> getSuggestions_fullText() {return mSuggestions_fullText;}
 
     public void clear() {
         // Don't call mSuggestions.clear() because it's being used for logging
@@ -403,7 +437,7 @@ public boolean onTouchEvent(MotionEvent me) {
                         //TextEntryState.acceptedSuggestion(mSuggestions.get(0), mSelectedString);
                         //TextEntryState.manualTyped(mSelectedString);
                     }
-                    mService.pickSuggestionManually(mSelectedIndex, mSelectedString);
+                    mService.pickSuggestionManually(mSelectedIndex);
                     mSelectedString = null;
                     mSelectedIndex = -1;
                 }
@@ -420,7 +454,7 @@ public boolean onTouchEvent(MotionEvent me) {
                             //TextEntryState.acceptedSuggestion(mSuggestions.get(0), mSelectedString);
                             //TextEntryState.manualTyped(mSelectedString);
                         }
-                        mService.pickSuggestionManually(mSelectedIndex, mSelectedString);
+                        mService.pickSuggestionManually(mSelectedIndex);
                     }
                 }
             }

app/src/main/java/org/pocketworkstation/pckeyboard/EditingUtil.java

@@ -63,6 +63,25 @@ public static void appendText(InputConnection connection, String newText) {
 
         connection.setComposingText(newText, 1);
     }
+    //*//Added by Pulya Max
+    public static void SetText(InputConnection connection, String newText) {
+        if (connection == null) {
+            return;
+        }
+
+        // Commit the composing text
+        connection.finishComposingText();
+
+        // Deletes text if the field already has text.
+        CharSequence charBeforeCursor = connection.getTextBeforeCursor(1, 0);
+        if (charBeforeCursor != null
+                && !charBeforeCursor.equals(" ")
+                && (charBeforeCursor.length() > 0)) {
+            deleteWordAtCursor(connection,"",false);
+        }
+
+        connection.setComposingText(newText, 1);
+    }
 
     private static int getCursorPosition(InputConnection connection) {
         ExtractedText extracted = connection.getExtractedText(
@@ -73,6 +92,16 @@ private static int getCursorPosition(InputConnection connection) {
         return extracted.startOffset + extracted.selectionStart;
     }
 
+    public static boolean textViewIsEmpty(InputConnection connection) {
+        if (connection==null) return true;
+        CharSequence before = connection.getTextBeforeCursor(1, 0);
+        CharSequence after = connection.getTextAfterCursor(1, 0);
+        String text = "";
+        if(before!=null) text += before;
+        if(after!=null)  text += after;
+        return text.isEmpty();
+
+    }
     /**
      * @param connection connection to the current text field.
      * @param separators characters which may separate words
@@ -83,18 +112,29 @@ private static int getCursorPosition(InputConnection connection) {
      */
     public static String getWordAtCursor(
             InputConnection connection, String separators, Range range) {
-        Range r = getWordRangeAtCursor(connection, separators, range);
+        Range r = getWordOrSeparatorsRangeAtCursor(connection, separators, range,false);
         return (r == null) ? null : r.word;
     }
+    //*//Added by Pulya Max. Used for ctrl+backspace hotkey
+    /**
+     * Removes the word surrounding the cursor and separators. Parameters are identical to
+     * getWordAtCursor.
+     */
+    public static void deleteWordAndSeparatorAtCursor(
+            InputConnection connection, String separators) {
+        deleteWordAtCursor(connection,separators,true);
+        deleteWordAtCursor(connection,separators,false);
+    }
 
     /**
      * Removes the word surrounding the cursor. Parameters are identical to
      * getWordAtCursor.
      */
+    //*// edited by Maxim Pulya
     public static void deleteWordAtCursor(
-        InputConnection connection, String separators) {
+        InputConnection connection, String separators,boolean deleteSeparators) {
 
-        Range range = getWordRangeAtCursor(connection, separators, null);
+        Range range = getWordOrSeparatorsRangeAtCursor(connection, separators, null,deleteSeparators);
         if (range == null) return;
 
         connection.finishComposingText();
@@ -105,6 +145,7 @@ public static void deleteWordAtCursor(
         connection.deleteSurroundingText(0, range.charsBefore + range.charsAfter);
     }
 
+
     /**
      * Represents a range of text, relative to the current cursor position.
      */
@@ -133,8 +174,8 @@ public Range(int charsBefore, int charsAfter, String word) {
         }
     }
 
-    private static Range getWordRangeAtCursor(
-            InputConnection connection, String sep, Range range) {
+    private static Range getWordOrSeparatorsRangeAtCursor(
+            InputConnection connection, String sep, Range range,boolean getSeparatorsRange) {
         if (connection == null || sep == null) {
             return null;
         }
@@ -146,7 +187,8 @@ private static Range getWordRangeAtCursor(
 
         // Find first word separator before the cursor
         int start = before.length();
-        while (start > 0 && !isWhitespace(before.charAt(start - 1), sep)) start--;
+        if(!getSeparatorsRange) while (start > 0 && !isWhitespace(before.charAt(start - 1), sep)) start--;
+        else while (start > 0 && isWhitespace(before.charAt(start - 1), sep)) start--;
 
         // Find last word separator after the cursor
         int end = -1;

app/src/main/java/org/pocketworkstation/pckeyboard/KeyboardSwitcher.java

@@ -226,7 +226,9 @@ private static class KeyboardId {
         /** A KEYBOARDMODE_XXX value */
         public final boolean mEnableShiftLock;
         public final boolean mHasVoice;
-        public final float mKeyboardHeightPercent;
+        public float mKeyboardHeightPercent;
+        //*//Pulya Max. Size of keyboard is dynamic.
+        //*// Used by Big pin keyboard option
         public final boolean mUsingExtension;
 
         private final int mHashCode;
@@ -307,11 +309,13 @@ private void setKeyboardMode(int mode, int imeOptions, boolean enableVoice,
 
         KeyboardId id = getKeyboardId(mode, imeOptions, isSymbols);
         LatinKeyboard keyboard = null;
+        //*// Added by Maxim Pulya
+        //*// I made pin keyboard bigger
+        if (mode == MODE_PHONE && mInputMethodService.isPortrait())id.mKeyboardHeightPercent*=1.4;
+
         keyboard = getKeyboard(id);
 
-        if (mode == MODE_PHONE) {
-            mInputView.setPhoneKeyboard(keyboard);
-        }
+        if (mode == MODE_PHONE)mInputView.setPhoneKeyboard(keyboard);
 
         mCurrentId = id;
         mInputView.setKeyboard(keyboard);
@@ -644,7 +648,8 @@ private void changeLatinKeyboardView(int newLayout, boolean forceReset) {
         mInputMethodService.mHandler.post(new Runnable() {
             public void run() {
                 if (mInputView != null) {
-                    mInputMethodService.setInputView(mInputView);
+                    //*//Edited by Pulya Max to fix candidates
+                    mInputMethodService.setInputView(mInputMethodService.mCandidateViewAndKeyboardView);
                 }
                 mInputMethodService.updateInputViewShown();
             }

app/src/main/java/org/pocketworkstation/pckeyboard/LanguageSwitcher.java

@@ -36,10 +36,14 @@ public class LanguageSwitcher {
     private String[] mSelectedLanguageArray;
     private String   mSelectedLanguages;
     private int      mCurrentIndex = 0;
+    private int      mPreviousIndex = 0;
+    private int      mEnglishIndex = 0;
     private String   mDefaultInputLanguage;
     private Locale   mDefaultInputLocale;
     private Locale   mSystemLocale;
 
+    //*// added by Pulya Max //*//
+    private boolean mLangChangedByUser=false;
     public LanguageSwitcher(LatinIME ime) {
         mIme = ime;
         mLocales = new Locale[0];
@@ -87,6 +91,13 @@ public boolean loadLocales(SharedPreferences sp) {
             }
             // If we didn't find the index, use the first one
         }
+
+        //*//Added by Pulya Max
+        for (int i=0;i<mSelectedLanguageArray.length;i++){
+            if (mSelectedLanguageArray[i].equals("en"))mEnglishIndex=i;
+        }
+        //*//
+
         return true;
     }
 
@@ -196,21 +207,33 @@ public Locale getPrevInputLocale() {
     }
 
     public void reset() {
+        mLangChangedByUser=true;
         mCurrentIndex = 0;
         mSelectedLanguages = "";
         loadLocales(PreferenceManager.getDefaultSharedPreferences(mIme));
     }
 
     public void next() {
+        mLangChangedByUser=true;
         mCurrentIndex++;
         if (mCurrentIndex >= mLocales.length) mCurrentIndex = 0; // Wrap around
     }
 
     public void prev() {
+        mLangChangedByUser=true;
         mCurrentIndex--;
         if (mCurrentIndex < 0) mCurrentIndex = mLocales.length - 1; // Wrap around
     }
-
+    //*// Added by Pulya Max
+    public void p_max_force_en(){
+        mLangChangedByUser=false;
+        mPreviousIndex=mCurrentIndex;
+        mCurrentIndex=mEnglishIndex;
+    }
+    public void p_max_previous_lang(){
+        if(!mLangChangedByUser)mCurrentIndex=mPreviousIndex;
+    }
+    //*//
     public void persist() {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mIme);
         Editor editor = sp.edit();