zoomView added

jdagnogo · Oct 27, 2017 · 9c576de · 9c576de
1 parent f687da3
commit 9c576de
Show file tree

Hide file tree

Showing 6 changed files with 371 additions and 344 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "26.0.2"
     defaultConfig {
         applicationId "com.example.jdagnogo.tournament"
         minSdkVersion 21
@@ -24,7 +24,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:26.+'
+    compile 'com.android.support:appcompat-v7:26.0.2'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     compile project(':mytournament')

diff --git a/build.gradle b/build.gradle
@@ -15,6 +15,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 

diff --git a/mytournament/build.gradle b/mytournament/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         minSdkVersion 21
@@ -22,11 +22,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:26.+'
-    compile 'com.android.support:cardview-v7:26.+'
+    compile 'com.android.support:appcompat-v7:26.0.2'
+    compile 'com.android.support:cardview-v7:26.0.2'
+    compile 'com.otaliastudios:zoomlayout:1.1.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/mytournament/src/main/java/com/example/jdagnogo/mytournament/TournamentView.java b/mytournament/src/main/java/com/example/jdagnogo/mytournament/TournamentView.java
@@ -57,7 +57,6 @@ public TournamentView(Context context, @Nullable AttributeSet attrs) {
         setupLayout(context);
         initViews();
         updateElementsAccordingToAttributs(context, attrs);
-
     }
 
     private void initViews() {
@@ -169,18 +168,18 @@ private Team updateScoreandGetWinner(BinderTeamTextView semi1, BinderTeamTextVie
                         .scoreA(Integer.valueOf(semi1.getTextViewScore().getText().toString()))
                         .scoreB(Integer.valueOf(semi2.getTextViewScore().getText().toString()))
                         .build();
-                if (matchResult.getWinner().equals(semi1.getTeam())) {
-                    setColorsBgForLoserAndWinner(semi1, semi2);
-                } else {
-                    setColorsBgForLoserAndWinner(semi2, semi1);
+                Team winner = matchResult.getWinner();
+                if (null!= winner){
+                    if (winner.equals(semi1.getTeam())) {
+                        setColorsBgForLoserAndWinner(semi1, semi2);
+                    } else {
+                        setColorsBgForLoserAndWinner(semi2, semi1);
+                    }
+                    return winner;
                 }
-
-                return matchResult.getWinner();
-
-
-            } else return null;
+            }
         }
-        else return null;
+        return null;
     }
 
     private TextWatcher watcherSemi1 = new TextWatcher() {

diff --git a/mytournament/src/main/java/com/example/jdagnogo/mytournament/model/MatchResult.java b/mytournament/src/main/java/com/example/jdagnogo/mytournament/model/MatchResult.java
@@ -21,6 +21,8 @@ public Team getWinner(){
         if (scoreA>scoreB){
             teamB.setHasBeenEliminated(true);
             return teamA;
+        }else if (scoreA == scoreB) {
+            return null;
         }else {
             return teamB;
         }