[优化] 新增了修改布局TextView

Author: F1ReKing

library/src/main/java/com/f1reking/statuslayout/library/StatusLayout.kt

@@ -1,8 +1,11 @@
 package com.f1reking.statuslayout.library
 
 import android.support.annotation.LayoutRes
+import android.support.annotation.StringRes
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.TextView
 
 /**
  * @author: F1ReKing
@@ -20,6 +23,10 @@ class StatusLayout {
     @LayoutRes private var emptyLayoutID: Int = 0
     @LayoutRes private var errorLayoutID: Int = 0
 
+    private var loadingText: String = ""
+    private var emptyText: String = ""
+    private var errorText: String = ""
+
     private var inflater: LayoutInflater? = null
     private var statusLayoutHelper: StatusLayoutHelper? = null
 
@@ -35,20 +42,24 @@ class StatusLayout {
 
         this.loadingLayout = builder.loadingLayout
         this.loadingLayoutID = builder.loadingLayoutID
+        this.loadingText = builder.loadingText
 
         this.emptyLayout = builder.emptyLayout
         this.emptyLayoutID = builder.emptyLayoutID
+        this.emptyText = builder.emptyText
 
         this.errorLayout = builder.errorLayout
         this.errorLayoutID = builder.errorLayoutID
+        this.errorText = builder.errorText
+
         this.statusLayoutHelper = StatusLayoutHelper(contentLayout)
     }
 
     /**
      * 显示内容布局
      */
     fun showContentLayout() {
-        statusLayoutHelper?.defaultLayout()
+        statusLayoutHelper?.setContentLayout()
     }
 
     /**
@@ -62,7 +73,11 @@ class StatusLayout {
     private fun createLoadingLayout() {
         if (null == loadingLayout) {
             loadingLayout = inflater(loadingLayoutID)
-        } //todo 加载布局的控件处理
+        }
+        if (!TextUtils.isEmpty(loadingText)) {
+            val loadingTextView = loadingLayout!!.findViewById<TextView>(R.id.tv_status_loading)
+            loadingTextView?.text = loadingText
+        }
     }
 
     /**
@@ -77,8 +92,13 @@ class StatusLayout {
         if (null == emptyLayout) {
             emptyLayout = inflater(emptyLayoutID)
         }
+        if (!TextUtils.isEmpty(emptyText)) {
+            val emptyTextView = emptyLayout!!.findViewById<TextView>(R.id.tv_status_empty)
+            emptyTextView?.text = emptyText
+        }
     }
 
+
     /**
      * 显示错误布局
      */
@@ -91,6 +111,10 @@ class StatusLayout {
         if (null == errorLayout) {
             errorLayout = inflater(errorLayoutID)
         }
+        if (!TextUtils.isEmpty(errorText)) {
+            val errorTextView = errorLayout!!.findViewById<TextView>(R.id.tv_status_error)
+            errorTextView?.text = errorText
+        }
     }
 
     class Builder {
@@ -104,11 +128,16 @@ class StatusLayout {
         @LayoutRes var emptyLayoutID: Int = 0
         @LayoutRes var errorLayoutID: Int = 0
 
+        var loadingText: String = ""
+        var emptyText: String = ""
+        var errorText: String = ""
+
         constructor(contentLayout: View) {
             this.contentLayout = contentLayout
             this.loadingLayoutID = R.layout.layout_loading
             this.emptyLayoutID = R.layout.layout_empty
-            this.errorLayoutID = R.layout.layout_error //todo 处理布局中控件
+            this.errorLayoutID = R.layout.layout_error
+
         }
 
         fun build(): StatusLayout {
@@ -125,6 +154,16 @@ class StatusLayout {
             return this
         }
 
+        fun setLoadingText(loadingText: String): Builder {
+            this.loadingText = loadingText
+            return this
+        }
+
+        fun setLoadingtext(@StringRes loadingTextStringRes: Int): Builder {
+            this.loadingText = contentLayout?.context?.resources?.getString(loadingTextStringRes)!!
+            return this
+        }
+
         fun setEmptyLayout(@LayoutRes emptyLayoutID: Int): Builder {
             this.emptyLayoutID = emptyLayoutID
             return this
@@ -135,6 +174,16 @@ class StatusLayout {
             return this
         }
 
+        fun setEmptyText(emptyText: String): Builder {
+            this.emptyText = emptyText
+            return this
+        }
+
+        fun setEmptyText(@StringRes emptyTextStringRes: Int): Builder {
+            this.emptyText = contentLayout?.context?.resources?.getString(emptyTextStringRes)!!
+            return this
+        }
+
         fun setErrorLayout(@LayoutRes errorLayoutID: Int): Builder {
             this.errorLayoutID = errorLayoutID
             return this
@@ -144,5 +193,17 @@ class StatusLayout {
             this.errorLayout = errorLayout
             return this
         }
+
+        fun setErrorText(errorText: String): Builder {
+            this.errorText = errorText
+            return this
+        }
+
+        fun setErrorText(@StringRes errorTextStringRes: Int): Builder {
+            this.errorText = contentLayout?.context?.resources?.getString(errorTextStringRes)!!
+            return this
+        }
+
+
     }
 }

library/src/main/java/com/f1reking/statuslayout/library/StatusLayoutHelper.kt

@@ -50,17 +50,15 @@ class StatusLayoutHelper {
         if (currentLayout != view) {
             currentLayout = view
             val parent = view.parent as? ViewGroup
-            if (parent != null) {
-                parent.removeView(view)
-            }
+            parent?.removeView(view)
             parentLayout?.removeViewAt(viewIndex!!)
             parentLayout?.addView(view, viewIndex!!, params)
             return true
         }
         return false
     }
 
-    fun defaultLayout(): Boolean {
+    fun setContentLayout(): Boolean {
         return showStatusLayout(contentLayout!!)
     }
 }

library/src/main/res/layout/layout_empty.xml

@@ -7,7 +7,7 @@
     >
 
     <TextView
-        android:id="@+id/tv_empty"
+        android:id="@+id/tv_status_empty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="空数据"

library/src/main/res/layout/layout_error.xml

@@ -7,7 +7,7 @@
     >
 
     <TextView
-        android:id="@+id/tv_empty"
+        android:id="@+id/tv_status_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="出错了"

library/src/main/res/layout/layout_loading.xml

@@ -12,6 +12,7 @@
         />
 
     <TextView
+        android:id="@+id/tv_status_loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"

sample/src/main/java/com/f1reking/statuslayout/MainActivity.kt

@@ -18,7 +18,11 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun initView() {
-        statusLayout = StatusLayout.Builder(tv_content).build()
+        statusLayout = StatusLayout.Builder(tv_content)
+            .setLoadingText("加载中...")
+            .setEmptyText("空数据了...")
+            .setErrorText("错误了...")
+            .build()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -36,11 +40,11 @@ class MainActivity : AppCompatActivity() {
                 statusLayout.showLoadingLayout()
                 return true
             }
-            R.id.menu_empty -> {
+            R.id.menu_empty   -> {
                 statusLayout.showEmptyLayout()
                 return true
             }
-            R.id.menu_error -> {
+            R.id.menu_error   -> {
                 statusLayout.showErrorLayout()
                 return true
             }

sample/src/main/res/layout/layout_status_loading.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center"
+    >
+
+    <ProgressBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="dawdwadwdwadawdwa"
+        />
+</LinearLayout>