From 384351b99c9d86f29354ccfebd21cf592c5c95ee Mon Sep 17 00:00:00 2001
From: "Vishnu Sanal. T" <50027064+VishnuSanal@users.noreply.github.com>
Date: Thu, 24 Jun 2021 20:14:19 +0530
Subject: [PATCH 1/9] Create pull_request_template.md (#9)
* Create pull_request_template.md
Create PR template
* Update pull_request_template.md
---
.github/pull_request_template.md | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 .github/pull_request_template.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..cb8c58a
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,24 @@
+# PR Info
+
+## Issue Details
+
+
+
+ - **Fixes** #----
+ - **Addresses** #----
+
+## Branch
+ - **Addresses** `development`
+
+## Type of change
+
+
+
+- **Bug Fix**
+- **New Feature**
+- **Breaking Change**
+- **Other**
+
+## Additional Info
+
+
From 0b5d271e03ed65c9717f9eb5dff1e889afd7658e Mon Sep 17 00:00:00 2001
From: Sushant <56603153+sushant-varanasi@users.noreply.github.com>
Date: Sat, 21 Aug 2021 17:20:42 +0530
Subject: [PATCH 2/9] Upgraded gradle version
---
.idea/compiler.xml | 18 +----------------
.idea/gradle.xml | 2 ++
.idea/jarRepositories.xml | 25 ++++++++++++++++++++++++
.idea/misc.xml | 25 +++++++++++++++++++++---
.idea/modules.xml | 9 ---------
.idea/runConfigurations.xml | 1 +
app/build.gradle | 4 ++--
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 3 +--
9 files changed, 55 insertions(+), 34 deletions(-)
create mode 100644 .idea/jarRepositories.xml
delete mode 100644 .idea/modules.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7990923..4626645 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
+
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index d15f572..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index d84b9bf..1632ddf 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,10 @@ android {
minSdkVersion 15
targetSdkVersion 22
versionCode 1
- versionName "1.7.5.7"
+
+ //Previous was 1.7.5.7 => 1.7.5.6
+
+ versionName "1.8.1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/java/com/example/iris/login1/Common.java b/app/src/main/java/com/example/iris/login1/Common.java
index 655bfd2..622d241 100755
--- a/app/src/main/java/com/example/iris/login1/Common.java
+++ b/app/src/main/java/com/example/iris/login1/Common.java
@@ -69,6 +69,14 @@ public enum STATE {
R.raw.chui, R.raw.simba, R.raw.tumbili, R.raw.panya, R.raw.mbuni, R.raw.kasuku, R.raw.sungura, R.raw.kondoo,
R.raw.nyoka, R.raw.buibui, R.raw.kuchakuro, R.raw.kobe, R.raw.mbwa_mwitu, R.raw.punda};
+ public static Map ANIMALS_Link = new HashMap() {{
+ for(int i = 0; i < ANIMAL_NAMES_ENG.length; i++){
+ put(ANIMAL_NAMES_ENG[i],ANIMAL_NAMES_SWA[i]);
+ }
+ }};
+
+
+
public static Map> ANIMALS_ENG = new HashMap>() {{
for(int i = 0; i < ANIMAL_NAMES_ENG.length; i++){
put(ANIMAL_NAMES_ENG[i], Pair.create(ANIMAL_PATHS[i], ANIMAL_SOUNDS[i]));
diff --git a/app/src/main/java/com/example/iris/login1/DataHelper.java b/app/src/main/java/com/example/iris/login1/DataHelper.java
index e6e982e..6286628 100755
--- a/app/src/main/java/com/example/iris/login1/DataHelper.java
+++ b/app/src/main/java/com/example/iris/login1/DataHelper.java
@@ -18,6 +18,7 @@
import java.util.Locale;
import static com.example.iris.login1.Common.ANIMALS_ENG;
+import static com.example.iris.login1.Common.ANIMALS_Link;
import static com.example.iris.login1.Common.ANIMAL_NAMES_ENG;
import static com.example.iris.login1.Common.ANIMAL_NAMES_SWA;
import static com.example.iris.login1.Common.ANIMAL_PATHS;
@@ -225,6 +226,7 @@ public String[] getImageOrder() {
Cursor values = db.rawQuery("SELECT Count(_id), profileIcon from users Group by profileicon order By Count(_id) ASC", null);
ArrayList animal_names = new ArrayList();
+ ArrayList animal_names_swa = new ArrayList();
values.moveToFirst();
while(!values.isAfterLast()){
@@ -263,19 +265,22 @@ public String[] getImageOrder() {
}
-
-
for (int i = 0; i < ANIMAL_NAMES_ENG.length; i++) {
-
+ String tempName = animal_names.get(i);
ANIMAL_NAMES_ENG[i] = animal_names.get(i);
- String tempName = animal_names.get(i);
+
+
+ ;
Pair animalData = ANIMALS_ENG.get(tempName);
ANIMAL_PATHS[i] = animalData.first;
ANIMAL_SOUNDS[i] = animalData.second;
+
+ ANIMAL_NAMES_SWA[i] = ANIMALS_Link.get(tempName);
+
}
//
diff --git a/app/src/main/java/com/example/iris/login1/GalleryActivity.java b/app/src/main/java/com/example/iris/login1/GalleryActivity.java
index 7522e87..75db65c 100755
--- a/app/src/main/java/com/example/iris/login1/GalleryActivity.java
+++ b/app/src/main/java/com/example/iris/login1/GalleryActivity.java
@@ -1437,10 +1437,9 @@ public void onClick(View view, int position) {
if (videoThread != null) videoThread.stopPlayingVideo();
int startTimeWithSilence = realStartTime - (language.equals(LANG_EN) ? Common.TRAILING_SILENCE_EN : Common.TRAILING_SILENCE_SW);
// create a new EnrollmentVideo thread
- if (surfaceHolder != null) {
- videoThread = new PlayEnrollmentVideo(surfaceHolder, mHandler, GalleryActivity.this, v, p, startTimeWithSilence);
- videoThread.start();
- }
+ videoThread = new PlayEnrollmentVideo(surfaceHolder, mHandler, GalleryActivity.this, v, p, startTimeWithSilence);
+ videoThread.start();
+
view.setBackgroundColor(Color.YELLOW);
}
});