Update readme | Example app code

Author: AmrDeveloper

README.md

@@ -7,7 +7,7 @@ even for your programming language, just config the view with your language keyw
 and you can change the CodeView theme in the runtime so it's made it easy to support any number of themes, 
 and CodeView has AutoComplete and you can customize it with different keywords and tokenizers.
 
-### Demo
+## Demo
 <p align="center">
   <img src="screenshots/python_demo.gif" alt="animated" />
   <img src="screenshots/java_demo.gif" alt="animated" />
@@ -16,18 +16,18 @@ and CodeView has AutoComplete and you can customize it with different keywords a
   <img src="screenshots/error_line_demo.png" alt="animated" width="242" height="480" />
 </p>
 
-### Main Features:
-- Can support any programming language you want
-- Can support AutoComplete and customize it with different tokenizers and design
-- Can support any theme you want and change it in the runtime
-- Syntax Highlighter depend on your patterns so you can support any features like TODO comment
-- Can support errors and warns with different colors and remove them in the runtime
-- Can change highlighter update delay time
+- Main Features
+  - Can support any programming language you want
+  - Can support AutoComplete and customize it with different tokenizers and design
+  - Can support any theme you want and change it in the runtime
+  - Syntax Highlighter depend on your patterns so you can support any features like TODO comment
+  - Can support errors and warns with different colors and remove them in the runtime
+  - Can change highlighter update delay time
 
-#### Who uses CodeView?
-- [MathScript](https://play.google.com/store/apps/details?id=com.amrdeveloper.mathscript)
+- Project that used CodeView
+  - [MathScript](https://play.google.com/store/apps/details?id=com.amrdeveloper.mathscript)
 
-##### If you use CodeView in an interesting project, I would like to know!
+##### If you use CodeView in an interesting project, I would like to know
 
 #### Add CodeView to your project
 
@@ -48,7 +48,7 @@ dependencies {
 }
 ````
 
-#### Documentation:
+#### Documentation
 CodeView is based on AppCompatMultiAutoCompleteTextView
 
 Add CodeView on your xml 

app/src/main/java/com/amrdeveloper/codeviewlibrary/MainActivity.java

@@ -21,7 +21,7 @@ public class MainActivity extends AppCompatActivity {
     private int mNextThemeIndex = 2;
 
     //To change themes easily
-    private Language mCurrentLanguage = Language.JAVA;
+    private final Language mCurrentLanguage = Language.JAVA;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -37,9 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void configLanguageAutoComplete() {
-        //Load current Programming Language
         final String[] languageKeywords;
-        switch (mCurrentLanguage){
+        switch (mCurrentLanguage) {
             case JAVA:
                 languageKeywords = getResources().getStringArray(R.array.java_keywords);
                 break;
@@ -78,11 +77,12 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     }
 
     private void changeCodeViewTheme() {
-        //Change CodeView Theme
-        if(mNextThemeIndex > 4) {
-            mNextThemeIndex = 1;
-        }
+        if (mNextThemeIndex > 4) mNextThemeIndex = 1;
+        loadNextTheme();
+        mNextThemeIndex = mNextThemeIndex + 1;
+    }
 
+    private void loadNextTheme() {
         switch (mNextThemeIndex) {
             case 1:
                 SyntaxManager.applyMonokaiTheme(this, mCodeView, mCurrentLanguage);
@@ -96,12 +96,11 @@ private void changeCodeViewTheme() {
                 SyntaxManager.applyFiveColorsDarkTheme(this, mCodeView, mCurrentLanguage);
                 Toast.makeText(this, "5 Colors Dark", Toast.LENGTH_SHORT).show();
                 break;
-            case 4:
+            default:
                 SyntaxManager.applyOrangeBoxTheme(this, mCodeView, mCurrentLanguage);
                 Toast.makeText(this, "Orange Box", Toast.LENGTH_SHORT).show();
                 break;
         }
-
-        mNextThemeIndex = mNextThemeIndex + 1;
     }
+
 }

app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/GoSyntaxManager.java renamed to app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/GoSyntaxUtils.java

@@ -7,7 +7,7 @@
 
 import java.util.regex.Pattern;
 
-public class GoSyntaxManager {
+public class GoSyntaxUtils {
 
     //Language Keywords
     private static final Pattern PATTERN_KEYWORDS = Pattern.compile("\\b(break|default|func|interface|case|defer|" +

app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/JavaSyntaxManager.java renamed to app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/JavaSyntaxUtils.java

@@ -7,7 +7,7 @@
 
 import java.util.regex.Pattern;
 
-public class JavaSyntaxManager {
+public class JavaSyntaxUtils {
 
     //Language Keywords
     private static final Pattern PATTERN_KEYWORDS = Pattern.compile("\\b(abstract|boolean|break|byte|case|catch" +

app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/PythonSyntaxManager.java renamed to app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/PythonSyntaxUtils.java

@@ -7,7 +7,7 @@
 
 import java.util.regex.Pattern;
 
-public class PythonSyntaxManager {
+public class PythonSyntaxUtils {
 
     //Language Keywords
     private static final Pattern PATTERN_KEYWORDS = Pattern.compile("\\b(False|await|else|import|pass|None|break|except|in|raise" +

app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/SyntaxManager.java

@@ -9,55 +9,55 @@ public class SyntaxManager {
     public static void applyMonokaiTheme(Context context, CodeView codeView, Language language) {
         switch (language) {
             case JAVA:
-                JavaSyntaxManager.applyMonokaiTheme(context, codeView);
+                JavaSyntaxUtils.applyMonokaiTheme(context, codeView);
                 break;
             case PYTHON:
-                PythonSyntaxManager.applyMonokaiTheme(context, codeView);
+                PythonSyntaxUtils.applyMonokaiTheme(context, codeView);
                 break;
             case GO_LANG:
-                GoSyntaxManager.applyMonokaiTheme(context, codeView);
+                GoSyntaxUtils.applyMonokaiTheme(context, codeView);
                 break;
         }
     }
 
     public static void applyNoctisWhiteTheme(Context context, CodeView codeView, Language language) {
         switch (language) {
             case JAVA:
-                JavaSyntaxManager.applyNoctisWhiteTheme(context, codeView);
+                JavaSyntaxUtils.applyNoctisWhiteTheme(context, codeView);
                 break;
             case PYTHON:
-                PythonSyntaxManager.applyNoctisWhiteTheme(context, codeView);
+                PythonSyntaxUtils.applyNoctisWhiteTheme(context, codeView);
                 break;
             case GO_LANG:
-                GoSyntaxManager.applyNoctisWhiteTheme(context, codeView);
+                GoSyntaxUtils.applyNoctisWhiteTheme(context, codeView);
                 break;
         }
     }
 
     public static void applyFiveColorsDarkTheme(Context context, CodeView codeView, Language language) {
         switch (language) {
             case JAVA:
-                JavaSyntaxManager.applyFiveColorsDarkTheme(context, codeView);
+                JavaSyntaxUtils.applyFiveColorsDarkTheme(context, codeView);
                 break;
             case PYTHON:
-                PythonSyntaxManager.applyFiveColorsDarkTheme(context, codeView);
+                PythonSyntaxUtils.applyFiveColorsDarkTheme(context, codeView);
                 break;
             case GO_LANG:
-                GoSyntaxManager.applyFiveColorsDarkTheme(context, codeView);
+                GoSyntaxUtils.applyFiveColorsDarkTheme(context, codeView);
                 break;
         }
     }
 
     public static void applyOrangeBoxTheme(Context context, CodeView codeView, Language language) {
         switch (language) {
             case JAVA:
-                JavaSyntaxManager.applyOrangeBoxTheme(context, codeView);
+                JavaSyntaxUtils.applyOrangeBoxTheme(context, codeView);
                 break;
             case PYTHON:
-                PythonSyntaxManager.applyOrangeBoxTheme(context, codeView);
+                PythonSyntaxUtils.applyOrangeBoxTheme(context, codeView);
                 break;
             case GO_LANG:
-                GoSyntaxManager.applyOrangeBoxTheme(context, codeView);
+                GoSyntaxUtils.applyOrangeBoxTheme(context, codeView);
                 break;
         }
     }

codeview/src/androidTest/java/com/amrdeveloper/codeview/ExampleInstrumentedTest.java

@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.