Merge pull request #5 from valartech/loading-layout-bug-fix

Loading layout bug fix

Author: amitav13

app/src/main/res/layout/activity_main.xml

@@ -44,7 +44,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#ee0000"
+            android:background="#ff0000"
             android:gravity="center"
             android:tag="@string/ll_error"
             android:text="Error!"

build.gradle

@@ -28,7 +28,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-beta02'
+        classpath 'com.android.tools.build:gradle:3.6.0-beta03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"

commons/build.gradle

@@ -6,11 +6,11 @@ apply plugin: 'org.jetbrains.dokka-android'
 
 
 static def getAppVersionCode() {
-    return 24
+    return 25
 }
 
 static def getAppVersionName() {
-    return "0.8.3"
+    return "0.8.4"
 }
 
 group = 'com.github.valartech'

commons/src/main/kotlin/com/valartech/commons/views/LoadingLayout.kt

@@ -7,6 +7,8 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
 import androidx.annotation.IntDef
+import androidx.annotation.StringRes
+import androidx.core.view.children
 import com.valartech.commons.R
 
 /**
@@ -63,10 +65,10 @@ class LoadingLayout @JvmOverloads constructor(
         errorView = getChildAt(3)
 
         //If views are specified with tags, override
-        findViewWithTag<View?>(context.getString(R.string.ll_loading))?.let { loadingView = it }
-        findViewWithTag<View?>(context.getString(R.string.ll_complete))?.let { completeView = it }
-        findViewWithTag<View?>(context.getString(R.string.ll_empty))?.let { emptyView = it }
-        findViewWithTag<View?>(context.getString(R.string.ll_error))?.let { errorView = it }
+        findChildViewWithTag(R.string.ll_loading)?.let { loadingView = it }
+        findChildViewWithTag(R.string.ll_complete)?.let { completeView = it }
+        findChildViewWithTag(R.string.ll_empty)?.let { emptyView = it }
+        findChildViewWithTag(R.string.ll_error)?.let { errorView = it }
 
         if (!isInEditMode) {
             if (loadingView == null) {
@@ -111,8 +113,12 @@ class LoadingLayout @JvmOverloads constructor(
                     loadingView?.visibility = View.GONE
                     completeView?.visibility = View.VISIBLE
                 } else if (currentState == LOADING) {
+                    //if we're showing results after loading, animate the appearance of the
+                    //complete view
                     crossfadeCompleteView()
                 } else {
+                    //if we're showing the complete state in any other case, then just show the
+                    //view immediately
                     loadingView?.visibility = View.GONE
                     completeView?.visibility = View.VISIBLE
                 }
@@ -159,6 +165,18 @@ class LoadingLayout @JvmOverloads constructor(
             })
     }
 
+    /**
+     * Searches only the direct children of this view for a child view with the specified tag.
+     */
+    private fun findChildViewWithTag(@StringRes tagRes: Int): View? {
+        children.forEach {
+            if (context.getString(tagRes) == it.tag) {
+                return it
+            }
+        }
+        return null
+    }
+
     companion object {
         //the values of these constants is significant, they correspond to params in attrs.xml
         const val LOADING = 1