Merge pull request #18 from Irineu333/release/v1.0.4

Release/v1.0.4
NeoUtils · Dec 11, 2021 · 6c0991b · 6c0991b
2 parents d4db1c5 + c53fd48
commit 6c0991b
Show file tree

Hide file tree

Showing 31 changed files with 679 additions and 582 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/README.md b/README.md
@@ -14,10 +14,7 @@ highlight.addScheme(
         new ColorScheme(
                 Pattern.compile("\\b([Jj])ava\\b"),
                 Color.parseColor("#FC0400")
-        )
-);
-
-highlight.addScheme(
+        ),
         new ColorScheme(
                 Pattern.compile("\\b([Kk])otlin\\b"),
                 Color.parseColor("#FC8500")
@@ -41,10 +38,7 @@ highlightTextWatcher.addScheme(
         new StyleScheme(
                 Pattern.compile("\\b([Jj])ava\\b"),
                 StyleScheme.STYLE.BOLD_ITALIC
-        ).setClearOldSpan(true)
-);
-
-highlightTextWatcher.addScheme(
+        ).setClearOldSpan(true),
         new StyleScheme(
                 Pattern.compile("\\b([Kk])otlin\\b"),
                 StyleScheme.STYLE.BOLD_ITALIC
@@ -55,34 +49,31 @@ highlightTextWatcher.addScheme(
 binding.edittext.addTextChangedListener(highlightTextWatcher);
 ```
 ## Schemes
-Use the default schemes; `ColorScheme`, `StyleScheme`, `LinkScheme` and `OnClickScheme`, or implement the `Scheme` interface to create a custom scheme.
+Use the default schemes; `ColorScheme`, `OnBackgroundScheme`, `StyleScheme`, `FontScheme`, `LinkScheme` and `OnClickScheme`, or implement the `Scheme` interface to create a custom scheme.
 
 ``` java
 ...
 
 highlight.addScheme(
-        //modify the style
         new StyleScheme(
                 Pattern.compile("Highlight"),
                 StyleScheme.STYLE.BOLD_ITALIC
+        ).addScopeScheme(
+                //scheme in scope of other schemes
+                new ColorScheme(
+                        Pattern.compile("light"),
+                        Color.parseColor("#FF03DAC5")
+                )
         )
 );
 
 highlight.addScheme(
-        //modify the text color
-        new ColorScheme(
-                Pattern.compile("light"),
-                Color.parseColor("#FF03DAC5")
-        )
-);
-
-highlight.addScheme(
-        //make the links clickable
+        //clickable links
         new LinkScheme().setPainTextUnderline(false)
 );
 
 highlight.addScheme(
-        //make a clickable text
+        //clickable text
         new OnClickScheme(
                 Pattern.compile("Highlight"),
                 new OnClickScheme.OnClickListener() {
@@ -95,30 +86,50 @@ highlight.addScheme(
 );
 
 highlight.addScheme(
-        //create the custom scheme
-        new Scheme() {
-            @Override
-            public Pattern getRegex() {
-                return Pattern.compile("Highlight");
-            }
-
-            @Override
-            public Object getSpan(@NonNull CharSequence text) {
-                return new BackgroundColorSpan(Color.GRAY);
-            }
-
-            @Override
-            public boolean getClearOldSpan() {
-                return false;
-            }
-        });
-
-//for the library to know how to remove span
-highlight.addSpanType(BackgroundColorSpan.class);
+        new ColorScheme(
+                Pattern.compile("Project"),
+                Color.BLACK
+        ).addScopeScheme(
+                //font scheme
+                new FontScheme(
+                        FontScheme.getFont(this, R.font.pacifico_regular)
+                )
+        )
+);
+
 ...
 ```
 
-## Performance
+## SchemeScope
+
+Every schema has a scope to which other schemas can be added via the `addScopeScheme (...)` method. Schemes added to a scope will run only within that scope, saving processing and creating possibilities for smarter highlights.
+
+``` java
+Highlight highlight = new Highlight();
+
+highlight.addScheme(
+        new StyleScheme(
+                Pattern.compile("Highlight"),
+                StyleScheme.STYLE.BOLD_ITALIC
+        ).addScopeScheme(
+                //add scheme scope in any scheme
+                new ColorScheme(
+                        Pattern.compile("light"),
+                        Color.parseColor("#FF03DAC5")
+                )
+        )
+);
+
+highlight.addScheme(
+        //use scope to group schemes
+        new Scope(Pattern.compile("Project"),
+                new ColorScheme(Color.BLACK),
+                new FontScheme(FontScheme.getFont(this, R.font.pacifico_regular))
+        )
+);
+
+highlight.setSpan(binding.toolbarTitle);
+```
 
 ## Add to project
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -27,8 +27,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }