diff --git a/.github/assets/triviahack.png b/.github/assets/triviahack.png
new file mode 100644
index 0000000..f329769
Binary files /dev/null and b/.github/assets/triviahack.png differ
diff --git a/README.md b/README.md
index 96e9760..1c545e4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,6 @@
-![image](https://user-images.githubusercontent.com/40510200/47895774-2ebe6580-dea5-11e8-9db7-9693c1bd6403.png)
+# Trivia hack [![licence](https://img.shields.io/badge/Licence-GPLv3-red.svg)](https://github.com/SubhamTyagi/loco-answers/blob/master/LICENSE) ![version](https://img.shields.io/badge/Version-2.0-green.svg)
-
-[![licence](https://img.shields.io/badge/Licence-GPLv3-red.svg)](https://github.com/SubhamTyagi/loco-answers/blob/master/LICENSE)
-![version](https://img.shields.io/badge/Version-2.0-green.svg)
-
-
-# Trivia hack
+![Banner](/.github/assets/triviahack.png?raw=true "Banner")
* A free, 100 % open source, ads free trivia helper app that respect user sentiments.
* Previously Known as LoKo HacK
@@ -37,6 +32,7 @@
## Contribution
* [Shubham Tyagi](https://subhamtyagi.github.io/).
+* New icon is designed by [Deb Pedrano](https://github.com/debpedrano)
* Valid Pull request always accepted.
## Screenshots
diff --git a/app/build.gradle b/app/build.gradle
index 8745e59..3f051e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,22 +36,22 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
*/
android {
- signingConfigs {
+ /*signingConfigs {
debug {
keyAlias 'debug'
keyPassword '123456'
storeFile file('./../debug-key.jks')
storePassword '123456'
}
- }
+ }*/
compileSdkVersion 28
buildToolsVersion "28.0.2"
defaultConfig {
applicationId "ai.loko.hk.ui"
minSdkVersion 19 //19
targetSdkVersion 28
- versionCode 24
- versionName '2.1.2'
+ versionCode 25
+ versionName '2.2'
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionNameSuffix '-capybara'
@@ -86,7 +86,7 @@ android {
renderscriptDebuggable true
minifyEnabled false
zipAlignEnabled false
- signingConfig signingConfigs.debug
+ //signingConfig signingConfigs.debug
}
}
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index 5c3b92c..93322d5 100644
Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ
diff --git a/app/src/main/java/ai/loko/hk/ui/Accessibility.java b/app/src/main/java/ai/loko/hk/ui/Accessibility.java
index 32b8423..9dc8433 100644
--- a/app/src/main/java/ai/loko/hk/ui/Accessibility.java
+++ b/app/src/main/java/ai/loko/hk/ui/Accessibility.java
@@ -119,7 +119,7 @@ private void swagiq(AccessibilityNodeInfo source) {
} catch (Exception io) {
io.printStackTrace();
// Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
@@ -147,7 +147,7 @@ private void theQ(AccessibilityNodeInfo source) {
} catch (Exception io) {
io.printStackTrace();
// Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
@@ -175,7 +175,7 @@ private void swoo(AccessibilityNodeInfo source) {
} catch (Exception io) {
io.printStackTrace();
// Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
}
@@ -204,7 +204,7 @@ private void weshow(AccessibilityNodeInfo source) {
} catch (Exception io) {
io.printStackTrace();
// Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
}
@@ -237,7 +237,7 @@ private void justplay(AccessibilityNodeInfo source) {
} catch (Exception io) {
io.printStackTrace();
// Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
}
@@ -269,7 +269,7 @@ private void mobshow(AccessibilityNodeInfo source) {
} catch (Exception io) {
io.printStackTrace();
// Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
}
@@ -300,7 +300,7 @@ private void hq(AccessibilityNodeInfo source) {
} catch (Exception io) {
io.printStackTrace();
// Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
}
@@ -331,9 +331,9 @@ private void qureka(AccessibilityNodeInfo source) {
option3ID.clear();
}
} catch (Exception io) {
- io.printStackTrace();
+
// Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
}
@@ -361,9 +361,8 @@ private void brainbazzi(AccessibilityNodeInfo source) {
option3ID.clear();
}
} catch (Exception io) {
- io.printStackTrace();
- Toast.makeText(this, "Error:::" + io.getMessage(), Toast.LENGTH_SHORT).show();
- showCustomAlert("Some error occured");
+
+ showCustomAlert("Error:Accessibility is either switch off or disabled on this screen ");
}
}
@@ -419,7 +418,7 @@ private class Update extends AsyncTask {
@Override
protected void onPostExecute(String s) {
super.onPostExecute(s);
- Which.itIsGoogle = true;
+
Intent i = new Intent(getApplicationContext(), Floating.class);
/*i.putExtra("option1", obj.getAcount());
i.putExtra("option2", obj.getBcount());
diff --git a/app/src/main/java/ai/loko/hk/ui/activities/TestActivity.java b/app/src/main/java/ai/loko/hk/ui/activities/TestActivity.java
index d33f7ff..2b937a1 100644
--- a/app/src/main/java/ai/loko/hk/ui/activities/TestActivity.java
+++ b/app/src/main/java/ai/loko/hk/ui/activities/TestActivity.java
@@ -65,7 +65,7 @@ public class TestActivity extends AppCompatActivity {
TextView a1, b2, c3;
EditText q, a, b, c;
- ActionProcessButton wiki, google;
+ ActionProcessButton google;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -77,11 +77,9 @@ protected void onCreate(Bundle savedInstanceState) {
b2 = findViewById(R.id.optionBtest);
c3 = findViewById(R.id.optionCtest);
- wiki = findViewById(R.id.wiki1);
+
google = findViewById(R.id.getanswer1);
google.setMode(ActionProcessButton.Mode.ENDLESS);
- wiki.setMode(ActionProcessButton.Mode.ENDLESS);
-
new CustomToast(this, "In future this will be used for AI learning").setDuration(1).show();
q = findViewById(R.id.q_test);
@@ -94,49 +92,10 @@ protected void onCreate(Bundle savedInstanceState) {
b.setText(o2);
c.setText(o3);
- wiki.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Which.itIsGoogle = false;
- Which.isWikiDone = false;
- wiki.setProgress(1);
-
- a1.setText("");
- b2.setText("");
- c3.setText("");
-
- Random random = new Random(System.currentTimeMillis());
- int index = random.nextInt(5);
- qu = quA[index];
- o1 = o1A[index];
- o2 = o2A[index];
- o3 = o3A[index];
-
- q.setText(qu);
- a.setText(o1);
- b.setText(o2);
- c.setText(o3);
-
- if (q.getText().toString().length() > 0) {
- qu = q.getText().toString();
- }
- if (a.getText().toString().length() > 0) {
- o1 = a.getText().toString();
- }
- if (b.getText().toString().length() > 0) {
- o2 = b.getText().toString();
- }
- if (c.getText().toString().length() > 0) {
- o3 = c.getText().toString();
- }
- new Update().execute("save this to AI database");
- }
- });
-
google.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Which.itIsGoogle = true;
+
google.setProgress(1);
a1.setText("");
@@ -191,7 +150,6 @@ protected void onPostExecute(String s) {
b2.setText(obj.getB2());
c3.setText(obj.getC3());
- wiki.setProgress(0);
google.setProgress(0);
switch (s) {
case "a":
@@ -221,7 +179,6 @@ protected void onProgressUpdate(Void... values) {
protected String doInBackground(String... strings) {
obj = new Engine(new Question(qu, o1, o2, o3));
return obj.search();
-
// obj = new FindAnswers(qu, o1, o2, o3);
//obj.search();
//return obj.getOptionRed();
diff --git a/app/src/main/java/ai/loko/hk/ui/answers/Base.java b/app/src/main/java/ai/loko/hk/ui/answers/Base.java
index 0bd45be..a106ba0 100644
--- a/app/src/main/java/ai/loko/hk/ui/answers/Base.java
+++ b/app/src/main/java/ai/loko/hk/ui/answers/Base.java
@@ -28,6 +28,7 @@
package ai.loko.hk.ui.answers;
+import ai.loko.hk.ui.data.Data;
import ai.loko.hk.ui.data.Which;
import ai.loko.hk.ui.model.Question;
@@ -88,6 +89,10 @@ abstract class Base extends Which {
*/
String optionRed;
+ protected static String BASE_URL;
+
+
+
/**
* Instantiates a new Base.
*
@@ -101,9 +106,10 @@ public Base(Question questionObj) {
optionC = questionObj.getOptionC();
reset();
+ BASE_URL=Data.BASE_SEARCH_URL;
error = false;
checkForNegative = true;
- isWikiDone = false;
+ isFallbackDone = false;
}
/**
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
index 34f60ee..214fd2a 100644
--- a/app/src/main/java/ai/loko/hk/ui/answers/Engine.java
+++ b/app/src/main/java/ai/loko/hk/ui/answers/Engine.java
@@ -29,7 +29,6 @@
package ai.loko.hk.ui.answers;
import android.support.annotation.NonNull;
-import android.util.Log;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -64,7 +63,7 @@ public Engine(Question questionObj) {
}
//currently not used but will be...
- private String googlePairSearch() {
+ private String pairSearch() {
boolean isNeg;
a = b = c = 0;
int p, q, r;
@@ -87,7 +86,7 @@ private String googlePairSearch() {
String sub3 = optionC.substring(0, optionC.indexOf("-") - 1);
- String text1 = getResponseFromGoogle(simplifiedQuestion, sub1);
+ String text1 = getResponseFromInternet(simplifiedQuestion, sub1);
A1.append(sub1).append("-");
B2.append(sub2).append("-");
@@ -108,7 +107,7 @@ private String googlePairSearch() {
}
- String text2 = getResponseFromGoogle(simplifiedQuestion, sub2);
+ String text2 = getResponseFromInternet(simplifiedQuestion, sub2);
sub2 = optionB.substring(optionB.indexOf("-") + 1);
String optionB[] = sub2.split(" ");
@@ -128,7 +127,7 @@ private String googlePairSearch() {
String optionC[] = sub3.split(" ");
cSize = optionC.length;
- String text3 = getResponseFromGoogle(simplifiedQuestion, sub3);
+ String text3 = getResponseFromInternet(simplifiedQuestion, sub3);
for (String words : optionC) {
if (!skip.contains(words)) {
@@ -172,7 +171,6 @@ private String googlePairSearch() {
}
synchronized public String search() {
- //int max = 0;
boolean isNeg = false;
a = b = c = 0;
int p, q, r;
@@ -189,12 +187,7 @@ synchronized public String search() {
this.question = stringBuilder.toString();
}
- if (!itIsGoogle && !isWikiDone) {
- // Log.d(TAG, "googleSearch: advance search");
- return wikiBot(isNeg);
-
- }
- Document doc = Jsoup.connect(Data.BASE_SEARCH_URL + URLEncoder.encode(question, "UTF-8") + "&num=20").userAgent(Data.USER_AGENT).get();
+ 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 optionAsplit[] = optionA.split(" ");
@@ -258,8 +251,8 @@ synchronized public String search() {
if (q != 0 && bSize > 1) b *= q;
if (r != 0 && cSize > 1) c *= r;
- if (a == b && b == c && !isWikiDone) {
- return wikiBot(isNeg);
+ if (a == b && b == c && !isFallbackDone) {
+ return fallbackSearch(isNeg);
}
A1.append("=(").append(a).append(")");
@@ -269,54 +262,24 @@ synchronized public String search() {
return setAnswer(isNeg);
} catch (Exception ioe) {
- //Logger.logException(ioe);
+
+ if (!isFallbackDone){
+ return fallbackSearch(isNeg);
+ }
error = true;
+ Logger.logException(ioe);
optionRed = "b";
return "error";
-
}
-
}
- synchronized private String wikiBot(boolean isNeg) {
- ArrayList simplifiedQuestionList = getSimplifiedQuestion(question);
- String simplifiedQuestion = getSimplifiedString(question, null);
-
- final WikiSearch first = new WikiSearch(optionA, simplifiedQuestionList, simplifiedQuestion);
- final WikiSearch second = new WikiSearch(optionB, simplifiedQuestionList, simplifiedQuestion);
- final WikiSearch third = new WikiSearch(optionC, simplifiedQuestionList, simplifiedQuestion);
-
- first.start();
- second.start();
- third.start();
- try {
- third.join();
- second.join();
- first.join();
- } catch (Exception e) {
- // Logger.logException(e);
-
- }
+ private String fallbackSearch(boolean isNeg) {
+ //ArrayList simplifiedQuestionList = getSimplifiedQuestion(question);
+ //String simplifiedQuestion = getSimplifiedString(question, null);
checkForNegative = false;
- isWikiDone = true;
- itIsGoogle = true;
-
- a = first.recurrence;
- b = second.recurrence;
- c = third.recurrence;
-
- Log.d(TAG, "wikiBot: done");
-
- if (a == b && b == c) {
- return search();
- }
-
- reset();
-
- A1.append(optionA).append("=(").append(a).append(")");
- B2.append(optionB).append("=(").append(b).append(")");
- C3.append(optionC).append("=(").append(c).append(")");
- return setAnswer(isNeg);
+ isFallbackDone = true;
+ BASE_URL = Data.FALLBACK_SEARCH_ENGINE;
+ return search();
}
private String setAnswer(boolean isNeg) {
@@ -356,8 +319,8 @@ private String setAnswer(boolean isNeg) {
}
@NonNull
- private String getResponseFromGoogle(String simplifiedQuestion, String sub) throws IOException {
- return Jsoup.connect(Data.BASE_SEARCH_URL + URLEncoder.encode(simplifiedQuestion + " " + sub, "UTF-8") + "&num=5").userAgent(Data.USER_AGENT).get().body().text().toLowerCase();
+ private String getResponseFromInternet(String simplifiedQuestion, String sub) throws IOException {
+ return Jsoup.connect(BASE_URL + URLEncoder.encode(simplifiedQuestion + " " + sub, "UTF-8") + "&num=5").userAgent(Data.USER_AGENT).get().body().text().toLowerCase();
}
}
diff --git a/app/src/main/java/ai/loko/hk/ui/answers/WikiSearch.java b/app/src/main/java/ai/loko/hk/ui/answers/WikiSearch.java
index b0ec2b7..7ed5708 100644
--- a/app/src/main/java/ai/loko/hk/ui/answers/WikiSearch.java
+++ b/app/src/main/java/ai/loko/hk/ui/answers/WikiSearch.java
@@ -43,6 +43,7 @@
/**
* The type Wiki search.
*/
+@Deprecated
class WikiSearch extends Thread {
/**
* The Recurrence.
diff --git a/app/src/main/java/ai/loko/hk/ui/constants/Constant.java b/app/src/main/java/ai/loko/hk/ui/constants/Constant.java
index 0342b5b..a829c72 100644
--- a/app/src/main/java/ai/loko/hk/ui/constants/Constant.java
+++ b/app/src/main/java/ai/loko/hk/ui/constants/Constant.java
@@ -33,9 +33,9 @@
import ui.BuildConfig;
public class Constant {
- //TODO:
- public static final int VERSION = 24;
- public static final String VERSION_NAME = "2.1.2";
+ //TODO:why i am using this, Why not using BuildConfig "i don't know :)"
+ public static final int VERSION = 25;
+ public static final String VERSION_NAME = "2.2";//
public static final boolean DEBUG = BuildConfig.DEBUG;
public static final int CODE_DRAW_OVER_OTHER_APP_PERMISSION = 2084;
public static final int CODE_FOR_SCREEN_CAPTURE = 1349;
diff --git a/app/src/main/java/ai/loko/hk/ui/data/Data.java b/app/src/main/java/ai/loko/hk/ui/data/Data.java
index 441935b..0157bfe 100644
--- a/app/src/main/java/ai/loko/hk/ui/data/Data.java
+++ b/app/src/main/java/ai/loko/hk/ui/data/Data.java
@@ -30,7 +30,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Random;
public class Data {
@@ -46,7 +45,21 @@ public class Data {
"&", ".", "?", ",", "matched", "paired", "pair"
};
public static final ArrayList removeWords = new ArrayList<>(Arrays.asList(remove));
- private static final String[] USER_AGENTS_LIST = {
+
+ public static String BASE_SEARCH_URL = "https://www.google.com/search?q=";
+ public static String FALLBACK_SEARCH_ENGINE = "https://www.bing.com/search?q=";
+
+ public static String skip = "the of a an ? & and , in - ";
+ public static boolean IMAGE_LOGS_STORAGE = true;
+ public static boolean IS_TESSERACT_OCR_USE = false;
+ public static String TESSERACT_LANGUAGE = "";
+ public static boolean FAST_MODE_FOR_OCR = false;
+
+ private static String[] negativeWords = {"not", "least", "never", "incorrect", "incorrectly", "none", "cannot", "can't", "didn't"};
+ public static final ArrayList removeNegativeWords = new ArrayList<>(Arrays.asList(negativeWords));
+
+
+ /* private static final String[] USER_AGENTS_LIST = {
"Mozilla/5.0 (Windows NT 6.1; Win64; x64)",
"Mozilla/5.0 (Linux; Android 7.0; SM-G892A Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/60.0.3112.107 Mobile Safari/537.36",
"Mozilla/5.0 (Linux; Android 6.0.1; Nexus 6P Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36",
@@ -75,21 +88,10 @@ public class Data {
"Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/60.1",
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36"
};
- public static String BASE_SEARCH_URL = "https://www.google.com/search?q=";
- public static String skip = "the of a an ? & and , in - ";
- private static String[] negativeWords = {"not", "least", "never", "incorrect", "incorrectly", "none", "cannot", "can't", "didn't"};
- public static final ArrayList removeNegativeWords = new ArrayList<>(Arrays.asList(negativeWords));
-
//RETURN RANDOM USER
public static String getRandomUserAgent(){
Random random = new Random();
return USER_AGENTS_LIST[random.nextInt(USER_AGENTS_LIST.length)];
- }
-
- //public static boolean GRAYSCALE_IAMGE_FOR_OCR=false;
- public static boolean IMAGE_LOGS_STORAGE = true;
- public static boolean IS_TESSERACT_OCR_USE = false;
- public static String TESSERACT_LANGUAGE = "";
- public static boolean FAST_MODE_FOR_OCR = false;
+ }*/
}
diff --git a/app/src/main/java/ai/loko/hk/ui/data/Which.java b/app/src/main/java/ai/loko/hk/ui/data/Which.java
index cd5c6d0..52f4b89 100644
--- a/app/src/main/java/ai/loko/hk/ui/data/Which.java
+++ b/app/src/main/java/ai/loko/hk/ui/data/Which.java
@@ -29,8 +29,8 @@
package ai.loko.hk.ui.data;
public abstract class Which {
- public static boolean itIsGoogle = true;
- public static boolean isWikiDone = true;
- public static boolean checkForNegative;
+
+ public static boolean isFallbackDone =false;
+ protected static boolean checkForNegative;
public static boolean error;
}
\ No newline at end of file
diff --git a/app/src/main/java/ai/loko/hk/ui/services/Floating.java b/app/src/main/java/ai/loko/hk/ui/services/Floating.java
index a31b8ff..548896a 100644
--- a/app/src/main/java/ai/loko/hk/ui/services/Floating.java
+++ b/app/src/main/java/ai/loko/hk/ui/services/Floating.java
@@ -51,7 +51,6 @@
import ai.loko.hk.ui.MainActivity;
import ai.loko.hk.ui.activities.ForegroundActivity;
-import ai.loko.hk.ui.data.Which;
import ui.R;
@@ -167,7 +166,6 @@ public boolean onTouch(View v, MotionEvent event) {
getAnswer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Which.itIsGoogle = true;
setAnswers();
getAnswer.setProgress(1);
}
@@ -210,7 +208,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
option3.setText(option33);
- Which.itIsGoogle = true;
// wiki.setProgress(0);
getAnswer.setProgress(0);
switch (s) {
diff --git a/app/src/main/java/ai/loko/hk/ui/utils/Utils.java b/app/src/main/java/ai/loko/hk/ui/utils/Utils.java
index 19c09de..b33f86a 100644
--- a/app/src/main/java/ai/loko/hk/ui/utils/Utils.java
+++ b/app/src/main/java/ai/loko/hk/ui/utils/Utils.java
@@ -82,8 +82,17 @@ public static ArrayList getSimplifiedQuestion(String question, int a) {
public static int count(String subString, String string) {
int cnt = 0;
- String regex = "\\b" + subString + "\\b";
- Pattern p = Pattern.compile(regex);
+ // String regex = "\\b" + subString + "\\b";
+ Pattern p = Pattern.compile("\\b" + subString + "\\b");
+ Matcher m = p.matcher(string);
+ while (m.find())
+ cnt++;
+ return cnt;
+ }
+
+ public static int count2(String subString, String string) {
+ int cnt = 0;
+ Pattern p = Pattern.compile(Pattern.quote(subString));
Matcher m = p.matcher(string);
while (m.find())
cnt++;
diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml
index 7e73547..2848be4 100644
--- a/app/src/main/res/layout/activity_test.xml
+++ b/app/src/main/res/layout/activity_test.xml
@@ -38,14 +38,14 @@
android:orientation="vertical">
-
-
-
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09b..20442d5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09b..1493765 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 337f105..17506f7 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index aa94635..0cf0c72 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index dc1942d..084b578 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 56650ca..3cde0b8 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 890d312..deca9bb 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ