Rename application back to 8Vim

.gitignore

@@ -7,6 +7,6 @@
 /build
 /captures
 
-vi8/release/
+/release
 
 Store Assets/

8Vim.iml

@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="8Vim" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/my_passport/programming/Android/8Vim" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
+<module version="4">
+  <component name="NewModuleRootManager">
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

8vim/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
-        applicationId "inc.flide.vi8"
+        applicationId "inc.flide.vim8"
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 2
@@ -26,8 +26,8 @@ android {
 
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.astuetz:pagerslidingtabstrip:1.0.1'
-    implementation 'com.orhanobut:logger:2.1.1'
+    implementation 'com.orhanobut:logger:2.2.0'
     api 'com.afollestad.material-dialogs:core:0.9.2.3'
 }

8vim/src/androidTest/java/inc/flide/vim8/ApplicationTest.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8;
+package inc.flide.vim8;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;

8vim/src/main/AndroidManifest.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="inc.flide.vi8">
+    package="inc.flide.vim8">
 
     <application
         android:allowBackup="false"
-        android:icon="@drawable/icon_vi8"
+        android:icon="@drawable/app_icon"
         android:label="@string/app_name"
         tools:ignore="GoogleAppIndexingWarning">
         <service
-            android:name=".MainInputMethodService"
+            android:name="inc.flide.vim8.MainInputMethodService"
             android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
@@ -21,7 +21,7 @@
         </service>
 
         <activity
-            android:name=".ui.LauncherActivity"
+            android:name="inc.flide.vim8.ui.LauncherActivity"
             android:label="@string/app_name"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/AppTheme.NoActionBar">
@@ -33,10 +33,10 @@
         </activity>
 
         <activity
-            android:name=".ui.ConfigureEmoticonKeyboardActivity"
+            android:name="inc.flide.vim8.ui.ConfigureEmoticonKeyboardActivity"
             android:label="@string/title_activity_configure_emoticon_keyboard"
             android:theme="@style/AppTheme.NoActionBar"
-            android:parentActivityName=".ui.LauncherActivity">
+            android:parentActivityName="inc.flide.vim8.ui.LauncherActivity">
         </activity>
 
     </application>

8vim/src/main/java/inc/flide/vim8/MainInputMethodService.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8;
+package inc.flide.vim8;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -14,14 +14,14 @@ import android.view.inputmethod.InputMethodManager;
 import java.util.List;
 import java.util.Map;
 
-import inc.flide.vi8.structures.FingerPosition;
-import inc.flide.vi8.keyboardHelpers.InputMethodServiceHelper;
-import inc.flide.vi8.structures.InputSpecialKeyEventCode;
-import inc.flide.vi8.keyboardHelpers.KeyboardAction;
-import inc.flide.vi8.views.mainKeyboard.MainKeyboardView;
-import inc.flide.vi8.views.NumberPadKeyboardView;
-import inc.flide.vi8.views.SelectionKeyboardView;
-import inc.flide.vi8.views.SymbolKeyboardView;
+import inc.flide.vim8.structures.FingerPosition;
+import inc.flide.vim8.keyboardHelpers.InputMethodServiceHelper;
+import inc.flide.vim8.structures.InputSpecialKeyEventCode;
+import inc.flide.vim8.keyboardHelpers.KeyboardAction;
+import inc.flide.vim8.views.mainKeyboard.MainKeyboardView;
+import inc.flide.vim8.views.NumberPadKeyboardView;
+import inc.flide.vim8.views.SelectionKeyboardView;
+import inc.flide.vim8.views.SymbolKeyboardView;
 
 public class MainInputMethodService extends InputMethodService {
 

8vim/src/main/java/inc/flide/vim8/geometry/Circle.java

@@ -1,8 +1,8 @@
-package inc.flide.vi8.geometry;
+package inc.flide.vim8.geometry;
 
 import android.graphics.PointF;
 
-import inc.flide.vi8.structures.FingerPosition;
+import inc.flide.vim8.structures.FingerPosition;
 
 public class Circle{
     private PointF centre;

8vim/src/main/java/inc/flide/vim8/geometry/GeometricUtilities.java

@@ -1,13 +1,7 @@
-package inc.flide.vi8.geometry;
+package inc.flide.vim8.geometry;
 
-import android.graphics.Point;
 import android.graphics.PointF;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import inc.flide.vi8.utilities.Utilities;
-
 public class GeometricUtilities {
 
     public static double getSquaredDistanceBetweenPoints(PointF a, PointF b){

8vim/src/main/java/inc/flide/vim8/geometry/LineSegment.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.geometry;
+package inc.flide.vim8.geometry;
 
 import android.graphics.PointF;
 

8vim/src/main/java/inc/flide/vim8/keyboardActionListners/KeyboardActionListner.java

@@ -1,14 +1,14 @@
-package inc.flide.vi8.keyboardActionListners;
+package inc.flide.vim8.keyboardActionListners;
 
 import android.inputmethodservice.KeyboardView;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.View;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.keyboardHelpers.KeyboardAction;
-import inc.flide.vi8.structures.InputSpecialKeyEventCode;
-import inc.flide.vi8.structures.KeyboardActionType;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.keyboardHelpers.KeyboardAction;
+import inc.flide.vim8.structures.InputSpecialKeyEventCode;
+import inc.flide.vim8.structures.KeyboardActionType;
 
 public abstract class KeyboardActionListner implements KeyboardView.OnKeyboardActionListener {
 

8vim/src/main/java/inc/flide/vim8/keyboardActionListners/MainKeyboardActionListener.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.keyboardActionListners;
+package inc.flide.vim8.keyboardActionListners;
 
 import android.os.Handler;
 import android.view.HapticFeedbackConstants;
@@ -8,10 +8,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.structures.Constants;
-import inc.flide.vi8.structures.FingerPosition;
-import inc.flide.vi8.keyboardHelpers.KeyboardAction;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.structures.Constants;
+import inc.flide.vim8.structures.FingerPosition;
+import inc.flide.vim8.keyboardHelpers.KeyboardAction;
 
 public class MainKeyboardActionListener {
 

8vim/src/main/java/inc/flide/vim8/keyboardActionListners/NumberPadKeyboardActionListener.java

@@ -1,12 +1,12 @@
-package inc.flide.vi8.keyboardActionListners;
+package inc.flide.vim8.keyboardActionListners;
 
 import android.view.KeyEvent;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.structures.InputSpecialKeyEventCode;
-import inc.flide.vi8.keyboardHelpers.KeyboardAction;
-import inc.flide.vi8.structures.KeyboardActionType;
-import inc.flide.vi8.views.NumberPadKeyboardView;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.structures.InputSpecialKeyEventCode;
+import inc.flide.vim8.keyboardHelpers.KeyboardAction;
+import inc.flide.vim8.structures.KeyboardActionType;
+import inc.flide.vim8.views.NumberPadKeyboardView;
 
 public class NumberPadKeyboardActionListener extends KeyboardActionListner {
 

8vim/src/main/java/inc/flide/vim8/keyboardActionListners/SelectionKeyboardActionListener.java

@@ -1,13 +1,13 @@
-package inc.flide.vi8.keyboardActionListners;
+package inc.flide.vim8.keyboardActionListners;
 
 import android.view.KeyEvent;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.structures.InputSpecialKeyEventCode;
-import inc.flide.vi8.keyboardHelpers.KeyboardAction;
-import inc.flide.vi8.structures.KeyboardActionType;
-import inc.flide.vi8.structures.SelectionKeyboardKeyCode;
-import inc.flide.vi8.views.SelectionKeyboardView;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.structures.InputSpecialKeyEventCode;
+import inc.flide.vim8.keyboardHelpers.KeyboardAction;
+import inc.flide.vim8.structures.KeyboardActionType;
+import inc.flide.vim8.structures.SelectionKeyboardKeyCode;
+import inc.flide.vim8.views.SelectionKeyboardView;
 
 public class SelectionKeyboardActionListener extends KeyboardActionListner {
 

8vim/src/main/java/inc/flide/vim8/keyboardActionListners/SymbolKeyboardActionListener.java

@@ -1,12 +1,12 @@
-package inc.flide.vi8.keyboardActionListners;
+package inc.flide.vim8.keyboardActionListners;
 
 import android.view.KeyEvent;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.keyboardHelpers.KeyboardAction;
-import inc.flide.vi8.structures.InputSpecialKeyEventCode;
-import inc.flide.vi8.structures.KeyboardActionType;
-import inc.flide.vi8.views.SymbolKeyboardView;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.keyboardHelpers.KeyboardAction;
+import inc.flide.vim8.structures.InputSpecialKeyEventCode;
+import inc.flide.vim8.structures.KeyboardActionType;
+import inc.flide.vim8.views.SymbolKeyboardView;
 
 public class SymbolKeyboardActionListener extends KeyboardActionListner {
 

8vim/src/main/java/inc/flide/vim8/keyboardHelpers/InputMethodServiceHelper.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.keyboardHelpers;
+package inc.flide.vim8.keyboardHelpers;
 
 import android.content.res.Resources;
 
@@ -6,12 +6,10 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import inc.flide.vi8.structures.FingerPosition;
+import inc.flide.vim8.structures.FingerPosition;
 
 public class InputMethodServiceHelper {
 

8vim/src/main/java/inc/flide/vim8/keyboardHelpers/KeyboardAction.java

@@ -1,6 +1,6 @@
-package inc.flide.vi8.keyboardHelpers;
+package inc.flide.vim8.keyboardHelpers;
 
-import inc.flide.vi8.structures.KeyboardActionType;
+import inc.flide.vim8.structures.KeyboardActionType;
 
 public class KeyboardAction {
 

8vim/src/main/java/inc/flide/vim8/keyboardHelpers/KeyboardActionXmlParser.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.keyboardHelpers;
+package inc.flide.vim8.keyboardHelpers;
 
 import android.util.Xml;
 import android.view.KeyEvent;
@@ -15,8 +15,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import inc.flide.vi8.structures.FingerPosition;
-import inc.flide.vi8.structures.KeyboardActionType;
+import inc.flide.vim8.structures.FingerPosition;
+import inc.flide.vim8.structures.KeyboardActionType;
 
 class KeyboardActionXmlParser {
     private static final String KEYBOARD_ACTION_MAP_TAG = "keyboardActionMap";

8vim/src/main/java/inc/flide/vim8/structures/Constants.java

@@ -1,7 +1,7 @@
-package inc.flide.vi8.structures;
+package inc.flide.vim8.structures;
 
 public interface Constants {
-    String KEYBOARD_ID = "inc.flide.vi8/.MainInputMethodService";
+    String KEYBOARD_ID = "inc.flide.vim8/.MainInputMethodService";
     int DELAY_MILLIS_LONG_PRESS_INITIATION = 500;
     int DELAY_MILLIS_LONG_PRESS_CONTINUATION = 50;
     int TEXT_SIZE = 50;

8vim/src/main/java/inc/flide/vim8/structures/FingerPosition.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.structures;
+package inc.flide.vim8.structures;
 
 public enum FingerPosition {
     NO_TOUCH, INSIDE_CIRCLE, TOP, LEFT, BOTTOM, RIGHT, LONG_PRESS, LONG_PRESS_END

8vim/src/main/java/inc/flide/vim8/structures/InputSpecialKeyEventCode.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.structures;
+package inc.flide.vim8.structures;
 
 public enum InputSpecialKeyEventCode {
 

8vim/src/main/java/inc/flide/vim8/structures/KeyboardActionType.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.structures;
+package inc.flide.vim8.structures;
 
 public enum KeyboardActionType {
     INPUT_TEXT, INPUT_KEY, INPUT_SPECIAL

8vim/src/main/java/inc/flide/vim8/structures/SelectionKeyboardKeyCode.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.structures;
+package inc.flide.vim8.structures;
 
 public enum SelectionKeyboardKeyCode {
     MOVE_CURRENT_END_POINT_LEFT(0),

8vim/src/main/java/inc/flide/vim8/ui/ConfigureEmoticonKeyboardActivity.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.ui;
+package inc.flide.vim8.ui;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -18,8 +18,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import inc.flide.vi8.R;
-import inc.flide.vi8.structures.Constants;
+import inc.flide.vim8.R;
+import inc.flide.vim8.structures.Constants;
 
 public class ConfigureEmoticonKeyboardActivity extends AppCompatActivity {
 

8vim/src/main/java/inc/flide/vim8/ui/LauncherActivity.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.ui;
+package inc.flide.vim8.ui;
 
 import android.content.Context;
 import android.content.Intent;
@@ -22,9 +22,9 @@ import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.util.List;
 
-import inc.flide.vi8.BuildConfig;
-import inc.flide.vi8.R;
-import inc.flide.vi8.structures.Constants;
+import inc.flide.vim8.BuildConfig;
+import inc.flide.vim8.R;
+import inc.flide.vim8.structures.Constants;
 
 public class LauncherActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
@@ -72,7 +72,7 @@ public class LauncherActivity extends AppCompatActivity
                 String shareMessage= "\nCheck out this awesome keyboard application\n\n";
                 shareMessage = shareMessage + "https://play.google.com/store/apps/details?id=" + BuildConfig.APPLICATION_ID +"\n";
                 shareIntent.putExtra(Intent.EXTRA_TEXT, shareMessage);
-                startActivity(Intent.createChooser(shareIntent, "Share VI8"));
+                startActivity(Intent.createChooser(shareIntent, "Share "+ R.string.app_name));
                 break;
 
             case R.id.help:
@@ -84,9 +84,9 @@ public class LauncherActivity extends AppCompatActivity
 
             case R.id.about :
                 AlertDialog.Builder about = new AlertDialog.Builder(this);
-                about.setTitle("About VI8");
+                about.setTitle("About "+ R.string.app_name);
                 about.setMessage("More than just a clone for now defunct 8Pen Application\n\n" +
-                        "Designed and Developed by Flide\n" + "Version 1.0.0");
+                        "Designed and Developed by Flide\n" + R.string.version_name);
                 about.setCancelable(true);
                 about.show();
                 break;

8vim/src/main/java/inc/flide/vim8/utilities/Utilities.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.utilities;
+package inc.flide.vim8.utilities;
 import android.graphics.PointF;
 
 import java.util.ArrayList;

8vim/src/main/java/inc/flide/vim8/views/ButtonKeyboardView.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.views;
+package inc.flide.vim8.views;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -10,10 +10,7 @@ import android.util.AttributeSet;
 
 import java.util.List;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.R;
-import inc.flide.vi8.keyboardActionListners.SymbolKeyboardActionListener;
-import inc.flide.vi8.structures.Constants;
+import inc.flide.vim8.structures.Constants;
 
 public abstract class ButtonKeyboardView extends KeyboardView {
 

8vim/src/main/java/inc/flide/vim8/views/NumberPadKeyboardView.java

@@ -1,20 +1,12 @@
-package inc.flide.vi8.views;
+package inc.flide.vim8.views;
 
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Typeface;
 import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.KeyboardView;
 import android.util.AttributeSet;
-import android.view.View;
 
-import java.util.List;
-
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.R;
-import inc.flide.vi8.keyboardActionListners.NumberPadKeyboardActionListener;
-import inc.flide.vi8.structures.Constants;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.R;
+import inc.flide.vim8.keyboardActionListners.NumberPadKeyboardActionListener;
 
 public class NumberPadKeyboardView extends ButtonKeyboardView {
 

8vim/src/main/java/inc/flide/vim8/views/SelectionKeyboardView.java

@@ -1,14 +1,12 @@
-package inc.flide.vi8.views;
+package inc.flide.vim8.views;
 
 import android.content.Context;
 import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.KeyboardView;
 import android.util.AttributeSet;
-import android.view.View;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.R;
-import inc.flide.vi8.keyboardActionListners.SelectionKeyboardActionListener;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.R;
+import inc.flide.vim8.keyboardActionListners.SelectionKeyboardActionListener;
 
 public class SelectionKeyboardView extends ButtonKeyboardView {
 

8vim/src/main/java/inc/flide/vim8/views/SymbolKeyboardView.java

@@ -1,20 +1,12 @@
-package inc.flide.vi8.views;
+package inc.flide.vim8.views;
 
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Typeface;
 import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.KeyboardView;
 import android.util.AttributeSet;
-import android.view.View;
 
-import java.util.List;
-
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.R;
-import inc.flide.vi8.keyboardActionListners.SymbolKeyboardActionListener;
-import inc.flide.vi8.structures.Constants;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.R;
+import inc.flide.vim8.keyboardActionListners.SymbolKeyboardActionListener;
 
 public class SymbolKeyboardView extends ButtonKeyboardView {
 

8vim/src/main/java/inc/flide/vim8/views/mainKeyboard/MainKeyboardView.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.views.mainKeyboard;
+package inc.flide.vim8.views.mainKeyboard;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -9,12 +9,12 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.R;
-import inc.flide.vi8.keyboardActionListners.MainKeyboardActionListener;
-import inc.flide.vi8.keyboardHelpers.KeyboardAction;
-import inc.flide.vi8.structures.InputSpecialKeyEventCode;
-import inc.flide.vi8.structures.KeyboardActionType;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.R;
+import inc.flide.vim8.keyboardActionListners.MainKeyboardActionListener;
+import inc.flide.vim8.keyboardHelpers.KeyboardAction;
+import inc.flide.vim8.structures.InputSpecialKeyEventCode;
+import inc.flide.vim8.structures.KeyboardActionType;
 
 public class MainKeyboardView extends View{
 

8vim/src/main/java/inc/flide/vim8/views/mainKeyboard/XboardView.java

@@ -1,4 +1,4 @@
-package inc.flide.vi8.views.mainKeyboard;
+package inc.flide.vim8.views.mainKeyboard;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -12,15 +12,15 @@ import android.view.View;
 import java.util.ArrayList;
 import java.util.List;
 
-import inc.flide.vi8.MainInputMethodService;
-import inc.flide.vi8.R;
-import inc.flide.vi8.geometry.Circle;
-import inc.flide.vi8.geometry.GeometricUtilities;
-import inc.flide.vi8.geometry.LineSegment;
-import inc.flide.vi8.keyboardActionListners.MainKeyboardActionListener;
-import inc.flide.vi8.structures.Constants;
-import inc.flide.vi8.structures.FingerPosition;
-import inc.flide.vi8.utilities.Utilities;
+import inc.flide.vim8.MainInputMethodService;
+import inc.flide.vim8.R;
+import inc.flide.vim8.geometry.Circle;
+import inc.flide.vim8.geometry.GeometricUtilities;
+import inc.flide.vim8.geometry.LineSegment;
+import inc.flide.vim8.keyboardActionListners.MainKeyboardActionListener;
+import inc.flide.vim8.structures.Constants;
+import inc.flide.vim8.structures.FingerPosition;
+import inc.flide.vim8.utilities.Utilities;
 
 public class XboardView extends View{
 

8vim/src/main/res/layout/activity_launcher.xml

@@ -47,7 +47,7 @@
             android:textSize="20sp"
             android:padding="5dp"
             android:maxLines="6"
-            android:hint="@string/keyboard_test_edittext_hint"
+            android:hint="@string/keyboard_test_edit_text_hint"
             android:inputType="textCapSentences|textMultiLine" />
     </LinearLayout>
 

8vim/src/main/res/layout/app_bar_launcher.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="inc.flide.vi8.ui.LauncherActivity">
+    tools:context="inc.flide.vim8.ui.LauncherActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"

8vim/src/main/res/layout/content_launcher.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="inc.flide.vi8.ui.LauncherActivity">
+    tools:context="inc.flide.vim8.ui.LauncherActivity">
 
     <LinearLayout
         android:id="@+id/liner1"

8vim/src/main/res/layout/main_keyboard_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<inc.flide.vi8.views.mainKeyboard.MainKeyboardView
+<inc.flide.vim8.views.mainKeyboard.MainKeyboardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/keyboard"
     android:layout_width="match_parent"

8vim/src/main/res/layout/main_keyboard_view.xml

@@ -95,7 +95,7 @@
 
         </LinearLayout>
 
-        <inc.flide.vi8.views.mainKeyboard.XboardView
+        <inc.flide.vim8.views.mainKeyboard.XboardView
             android:id="@+id/xboardView"
             android:layout_width="wrap_content"
             android:layout_height="match_parent" />

8vim/src/main/res/layout/numberpad_keyboard_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<inc.flide.vi8.views.NumberPadKeyboardView
+<inc.flide.vim8.views.NumberPadKeyboardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/keyboard"
     android:layout_width="match_parent"

8vim/src/main/res/layout/selection_keyboard_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<inc.flide.vi8.views.SelectionKeyboardView
+<inc.flide.vim8.views.SelectionKeyboardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/keyboard"
     android:layout_width="match_parent"

8vim/src/main/res/layout/symbols_keyboard_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<inc.flide.vi8.views.SymbolKeyboardView
+<inc.flide.vim8.views.SymbolKeyboardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/keyboard"
     android:layout_width="match_parent"

8vim/src/main/res/menu/activity_launcher_drawer.xml

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/share"
         android:icon="@drawable/share_icon_foreground"
-        android:title="@string/share_vi8" />
+        android:title="@string/share_app" />
     <item
         android:id="@+id/help"
         android:icon="@drawable/help_icon_foreground"

8vim/src/main/res/values/strings.xml

@@ -1,19 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE resources [
+    <!ENTITY appname "8Vim">
+    <!ENTITY version_name "iteration 2">
+    ]>
 <resources>
-    <string name="app_name">VI8</string>
-    <string name="version_name">iteration 1</string>
+    <string name="app_name">&appname;</string>
+    <string name="version_name">&version_name;</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="nav_header_desc">Navigation header</string>
-    <string name="enable_ime_dialog_content">In order to utilize the keyboard, you need to enable the keyboard first. Once you click on the enable button, you will be taken to the input method settings screen. Please enable the "VI8 Keyboard" there.</string>
+    <string name="enable_ime_dialog_content">In order to utilize the keyboard, you need to enable the keyboard first. Once you click on the enable button, you will be taken to the input method settings screen. Please enable the "&appname; Keyboard" there.</string>
     <string name="enable_ime_dialog_neutral_button_text">Enable</string>
     <string name="enable_ime_dialog_title">Please Enable IME</string>
     <string name="title_activity_configure_emoticon_keyboard">ConfigureEmoticonKeyboardActivity</string>
 
     <!--Preference Related Strings-->
-    <string name="basic_preference_file_name">inc.flide.vi8.basicPreferences</string>
+    <string name="basic_preference_file_name">inc.flide.&appname;.basicPreferences</string>
     <string name="bp_selected_emoticon_keyboard">selected_emoticon_keyboard</string>
 
-    <string name="keyboard_test_edittext_hint">Test your keyboard here</string>
+    <string name="keyboard_test_edit_text_hint">Test your keyboard here</string>
     <string name="help_feedback"><![CDATA[Help & Feedback]]></string>
-    <string name="share_vi8">Share VI8</string>
+    <string name="share_app">Share &appname;</string>
 </resources>

EightVim.iml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="EightVim" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

README.md

@@ -1,19 +1,18 @@
-# VI8
+# 8Vim
 
-## Download - No More
-
-For the sake of sanity, I have stopped uploading the APK for the "current" state of the application. So you will have to clone the repository and build it yourself.
+## Download -
+Please get the latest release build from Play store : https://play.google.com/store/apps/details?id=inc.flide.vi8
 
 ## Initial Idea
 
-The application is essentially a clone for 8pen, which for some reason they have stopped distributing. ( I can no longer install it even though when i paid for it!!!)
+The application is started essentially as a clone for 8pen, which for some reason they have stopped distributing. ( I can no longer install it even though when i paid for it!!!)
 
 To understand what exactly this keyboard is please watch the video "https://www.youtube.com/watch?v=99vsUF4NuLk"
 
 Now I will go ahead and shamlessly copy text from the original 8Pen website.
 
 ###### Handwriting reinvented
-The vi8 draws inspiration from handwriting. By mimicking the way our hand moves when constrained to a square canvas, we are able to create a natural and fun writing experience, akin to doodling on a piece of paper.
+The 8vim draws inspiration from handwriting. By mimicking the way our hand moves when constrained to a square canvas, we are able to create a natural and fun writing experience, akin to doodling on a piece of paper.
 
 ###### Designed for speed
 The layout is optimised for fast writing, by allowing for the most common letter sequences to be produced with swift, fluid gestures. Once familiar with the layout, you can reach speeds of 40 words per minute.

VI8.iml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="VI8" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

settings.gradle

@@ -1 +1 @@
-include ':vi8'
+include ':8vim'

vi8/vi8.iml

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":vi8" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/my_passport/programming/Android/8Vim" external.system.id="GRADLE" external.system.module.group="8Vim" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":vi8" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.0.0" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="4.0.0" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:core:0.9.2.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: me.zhanghai.android.materialprogressbar:library:1.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.astuetz:pagerslidingtabstrip:1.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v13:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.orhanobut:logger:2.1.1@aar" level="project" />
-  </component>
-</module>