fix6 for search to include all the meets

Electrostat-Lab · Jul 3, 2021 · b0b930d · b0b930d
1 parent 2162ec9
commit b0b930d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 32 deletions.
diff --git a/...Plugin/src/main/java/com/scrappers/superiorExtendedEngine/menuStates/uiPager/UiPager.java b/...Plugin/src/main/java/com/scrappers/superiorExtendedEngine/menuStates/uiPager/UiPager.java
@@ -180,40 +180,49 @@ public void forEachUiState(UiStatesLooper.Modifiable.Looper uiStatesLooper){
     }
 
     /**
-     * Runs an anonymous asynchronous searching task function for some items inside a searchList based on a list of searchKeyWords.
+     * Runs a searching task function for some items inside a searchList based on a list of searchKeyWords.
      * @param searchList the search list you want to traverse through, it should be parallel to the UiStates you want to update.
      * @param searchKeyWords the keywords you want to look for inside this search list.
      * @param injector injects what you want to do when an item is returned by the search engine.
      * @return a list of the founded strings from the searchList based on the search keywords.
-     * @throws Exception throws an exception if the search custom thread fails.
-     * @apiNote <b> <T extends Object> synchronized(T)</b> marks a thread-safe function by the dead locking other threads synchronized on the same object scheduled or started by the thread factory.
      */
-    public String[] search(String[] searchList, String[] searchKeyWords, ActionInjector injector) throws Exception {
-        synchronized(this) {
-            final String[][] resultList = {new String[0]};
-            return Executors.callable(() -> {
-                String[] temp;
-                for (int i = 0; i < searchKeyWords.length; i++) {
-                    for (int j = 0; j < searchList.length; j++) {
-                        if (searchList[j].replaceAll(" ","").trim().toLowerCase().contains(
-                                searchKeyWords[i].replaceAll(" ","").trim().toLowerCase())) {
-                            //dynamic array conception
-                            if(i > resultList[0].length-1){
-                                temp = resultList[0];
-                                resultList[0] = new String[temp.length+1];
-                                for(int position=0; position < temp.length; position++){
-                                    resultList[0][position] = temp[position];
+    public String[] search(String[] searchList, String[] searchKeyWords, ActionInjector injector) {
+        String[] resultList = new String[0];
+        String[] temp;
+        int index = 0;
+            //loop over the main list items
+            for (int i = 0; i < searchList.length; i++) {
+                //loop over the search keywords
+                for (String searchKeyWord : searchKeyWords) {
+                    if ( searchList[i].replaceAll(" ", "").trim().toLowerCase().contains(
+                            searchKeyWord.replaceAll(" ", "").trim().toLowerCase()) ){
+                            //dynamic array conception (expandable by 1 array) & index to keep track of the successful matched string literals
+                            if ( index > resultList.length - 1 ){
+                                //creating temp pointer producing a deep copy of resultList[0] array
+                                temp = resultList;
+                                //expanding the array through a new wider in size pointer
+                                resultList = new String[temp.length + 1];
+                                //copy the values of the old contacted array to the new expanded one
+                                int position = 0;
+                                while (position < temp.length) {
+                                    resultList[position] = temp[position];
+                                    position++;
                                 }
                             }
-                            resultList[0][i] = searchKeyWords[i];
-                            if(injector != null){
-                                injector.execute(getChildUiStateByIndex(j), j, resultList[0][i]);
+                            //fill a new item after expanding the pointer
+                            resultList[index] = searchList[i];
+                            //inject users' actions to execute
+                            if ( injector != null ){
+                                injector.execute(getChildUiStateByIndex(i), i, resultList[index]);
                             }
-                        }
+                            //add 1 to keep track of successful values
+                            index++;
+                            //terminate when a successful condition search has met in the list of search keywords
+                        break;
                     }
                 }
-            }, resultList[0]).call();
-        }
+            }
+        return resultList;
     }
 
     /**

diff --git a/demoApp/src/main/java/com/myGame/JMESurfaceViewExampleActivity/UiTestCase.java b/demoApp/src/main/java/com/myGame/JMESurfaceViewExampleActivity/UiTestCase.java
@@ -11,6 +11,7 @@
 import com.scrappers.superiorExtendedEngine.menuStates.uiPager.UiPager;
 
 import java.util.Arrays;
+import java.util.concurrent.Executors;
 
 /**
  * Test case for UiPager #{@link UiPager}.
@@ -61,18 +62,21 @@ public void testPagerUiStates() throws Exception {
     public void onClick(View v) {
             if(v.getId() == 'S'){
                 Toast.makeText(uiPager.getContext(), "Search Button Clicked", Toast.LENGTH_LONG).show();
+                uiPager.removeAllViews();
                 try {
-                    uiPager.removeAllViews();
-                    uiPager.search(sortedList, new String[]{"Search", "PAvlY", "Thomas"}, (uiState, position, currentItem) -> {
-                        uiPager.addView(uiState);
-                        uiState.setBackgroundColor(Color.MAGENTA);
-                        if(uiState.getId() == 'P'){
-                            uiState.setBackgroundColor(Color.RED);
-                        }
-                    });
+                    Executors.callable(()->{
+                        System.out.println(Arrays.toString(uiPager.search(sortedList, new String[]{"Search", "PAvlY", "Thomas"}, (uiState, position, currentItem) -> {
+                            uiPager.addView(uiState);
+                            uiState.setBackgroundColor(Color.MAGENTA);
+                            if ( uiState.getId() == 'P' ){
+                                uiState.setBackgroundColor(Color.RED);
+                            }
+                        })));
+                    }).call();
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+
             }else if(v.getId() == 'R'){
                 Toast.makeText(uiPager.getContext(), "Revert Search clicked", Toast.LENGTH_LONG).show();