if answer has same rating in two or three answer it wont guess you wi…

…ll guess the answer removed "." from option for better matching (it might mis behave )
rollychop · Mar 29, 2020 · eea6217 · eea6217
1 parent fc63f6d
commit eea6217
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 20 deletions.
diff --git a/app/src/main/java/ai/loko/hk/ui/answers/Engine.java b/app/src/main/java/ai/loko/hk/ui/answers/Engine.java
@@ -190,7 +190,7 @@ synchronized public String search() {
 
             Document doc = Jsoup.connect(BASE_URL + URLEncoder.encode(question, "UTF-8") + "&num=20").userAgent(Data.USER_AGENT).get();
 
-            String text = doc.body().text().toLowerCase();
+            String text = doc.body().text().toLowerCase().replace("."," ");
             String optionAsplit[] = optionA.split(" ");
             aSize = optionAsplit.length;
 
@@ -284,7 +284,10 @@ private String fallbackSearch(boolean isNeg) {
 
     private String setAnswer(boolean isNeg) {
         if (!isNeg) {
-            if (a > b) {
+            if (a==b&&b==c){
+                optionRed = "abc";//if answer has same rating answer color will be black
+            }
+            else if (a > b) {
                 if (c > a) {
                     optionRed = "c";
                 } else {
@@ -298,21 +301,34 @@ private String setAnswer(boolean isNeg) {
                 optionRed = "c";
             }
         } else {
-            if (a < b) {
-                if (c < a) {
-                    //c is most least
-                    optionRed = "c";
+            if (a==b && b==c){
+                optionRed="abc";/* if a,b and c has same rating means no ans*/
+            }
+            else if (a==b && a<c){
+                optionRed="ab";/* a and b has same rating but less than c ans may be a or b*/
+            }else  if (a==c && a<b){
+                optionRed="ac";/* a and c has same rating but less than b*/
+            }else if(b==c && b<a){
+                optionRed="bc";/* b and c has same rating but less than a*/
+            }
+            else {
+                if (a < b) {
+                    if (c < a) {
+                        //c is most least
+                        optionRed = "c";
+                    } else {
+                        //a is most least
+                        optionRed = "a";
+                    }
+                } else if (b < c) {
+                    //b is least
+                    optionRed = "b";
                 } else {
-                    //a is most least
-                    optionRed = "a";
+                    //c is least
+                    optionRed = "c";
                 }
-            } else if (b < c) {
-                //b is least
-                optionRed = "b";
-            } else {
-                //c is least
-                optionRed = "c";
             }
+
         }
 
         return optionRed;

diff --git a/app/src/main/java/ai/loko/hk/ui/model/Question.java b/app/src/main/java/ai/loko/hk/ui/model/Question.java
@@ -52,9 +52,9 @@ public Question(String questionText, String optionA, String optionB, String opti
             this.questionText = questionText.substring(0, questionText.length() - 1).toLowerCase();
         } else
             this.questionText = questionText.toLowerCase();
-        this.optionA = optionA.toLowerCase();
-        this.optionB = optionB.toLowerCase();
-        this.optionC = optionC.toLowerCase();
+        this.optionA = optionA.toLowerCase().replace(".","");
+        this.optionB = optionB.toLowerCase().replace(".","");
+        this.optionC = optionC.toLowerCase().replace(".","");
     }
 
     public String getQuestionText() {

diff --git a/app/src/main/java/ai/loko/hk/ui/services/OCRFloating.java b/app/src/main/java/ai/loko/hk/ui/services/OCRFloating.java
@@ -282,6 +282,26 @@ protected void onPostExecute(final String s) {
                         option1.setTextColor(Color.BLACK);
                         option2.setTextColor(Color.BLACK);
                         break;
+                    case "ab":
+                        option1.setTextColor(Color.RED);
+                        option2.setTextColor(Color.RED);
+                        option3.setTextColor(Color.BLACK);
+                        break;
+                    case "ac":
+                        option1.setTextColor(Color.RED);
+                        option2.setTextColor(Color.BLACK);
+                        option3.setTextColor(Color.RED);
+                        break;
+                    case "bc":
+                        option1.setTextColor(Color.BLACK);
+                        option2.setTextColor(Color.RED);
+                        option3.setTextColor(Color.RED);
+                        break;
+                    case "abc":
+                        option1.setTextColor(Color.BLACK);
+                        option2.setTextColor(Color.BLACK);
+                        option3.setTextColor(Color.BLACK);
+                        break;
                 }
             } else if (questionAndOption.length > 0) {
                 Toast.makeText(getApplicationContext(), questionAndOption[0], Toast.LENGTH_SHORT).show();

diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.google.gms:google-services:4.2.0'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Nov 03 14:45:03 IST 2019
+#Sun Mar 29 11:22:16 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip