Migrated 1.0.x bug fix for #9 and updated different dependencies

README.md

@@ -32,12 +32,12 @@ repositories {
 }
 
 dependencies {
-  implementation 'org.hitogo:hitogo-core:1.0.2'
-  testImplementation 'org.hitogo:hitogo-testing:1.0.2' //mocks and testing tools
+  implementation 'org.hitogo:hitogo-core:1.0.3'
+  testImplementation 'org.hitogo:hitogo-testing:1.0.3' //mocks and testing tools
 }
 ```
 
-How do I use Hitogo? (Step-by-step introduction for 1.0.2)
+How do I use Hitogo? (Step-by-step introduction for 1.0.3)
 -------------------
 
 1. Extend the HitogoController
@@ -162,9 +162,9 @@ If you have finished step 1 and 2, you are ready to go! Using Hitogo you can cre
 
 Status
 ------
-Version 1.1.0 is currently under development in the develop branch. The latest stable version is 1.0.2 which can be found in the 1.0.x branch.
+Version 1.1.0 is currently under development in the develop branch. The latest stable version is 1.0.3 which can be found in the 1.0.x branch.
 
-Each new version version will be supported until the next version is released. For example: 1.0.1 is supported until 1.1.0 or 1.0.2 is out. Each minor release won't include any public API changes.
+Each new version version will be supported until the next version is released. For example: 1.0.3 is supported until 1.1.0 or 1.0.4 is out. Each minor release won't include any public API changes.
 
 Comments/bugs/questions/pull requests are always welcome!
 

build.gradle

@@ -3,11 +3,11 @@
 buildscript {
 
     ext {
-        support_default_lib_version = '1.0.0'
-        support_appcompat_version = "1.1.0"
+        support_material_version = "1.2.0"
+        support_appcompat_version = "1.2.0"
         support_annotation_version = "1.1.0"
 
-        juni_version = "4.12"
+        juni_version = "4.13"
         mockito_version = "1.10.19"
 
         hitogo_library_version = "1.1.0"
@@ -19,8 +19,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }

core/build.gradle

@@ -42,9 +42,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    //Support lib dependencies
-    implementation "com.google.android.material:material:$support_default_lib_version"
+    implementation "com.google.android.material:material:$support_material_version"
 }
 
 if (project.rootProject.file('local.properties').exists()) {

core/src/main/java/org/hitogo/alert/dialog/DialogAlertImpl.java

@@ -133,7 +133,7 @@ protected void buildLayoutContent(View view, @NonNull AlertDialog.Builder builde
                 Drawable drawable = drawableMap.valueAt(i);
                 setDrawable(view, viewId, drawable);
             }
-        } else if (textMap.size() > 0) {
+        } else if (drawableMap.size() > 0) {
             builder.setIcon(drawableMap.valueAt(0));
         }
     }

core/src/main/java/org/hitogo/alert/view/ViewAlertImpl.java

@@ -64,7 +64,7 @@ protected void onCreate(@NonNull HitogoController controller, @NonNull ViewAlert
                         "Use for example the LinearLayout to solve this issue.");
             }
 
-            if (containerView != null && containerView instanceof ViewGroup) {
+            if (containerView instanceof ViewGroup) {
                 viewGroup = (ViewGroup) containerView;
             } else {
                 Log.e(ViewAlertBuilderImpl.class.getName(), "Cannot find any container view. " +

examples/build.gradle

@@ -22,7 +22,6 @@ dependencies {
     implementation project(path: ':hitogo-core')
     implementation project(path: ':hitogo-support')
 
-    //Support lib dependencies
     implementation "androidx.appcompat:appcompat:$support_appcompat_version"
-    implementation "com.google.android.material:material:$support_default_lib_version"
+    implementation "com.google.android.material:material:$support_material_version"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ 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-6.1.1-all.zip