1. add getState method

2. update sample

Author: andyxialm

multistatelayout/src/main/java/cn/refactor/multistatelayout/MultiStateLayout.java

@@ -185,13 +185,34 @@ public void setCustomState(int customStateKey, boolean displayContentLayout) {
         showCustomViewByState(customStateKey);
     }
 
+    /**
+     * Put customise state view by customise key
+     * @param customStateKey key
+     * @param stateView      view
+     */
     @SuppressWarnings("unused")
     public void putCustomStateView(int customStateKey, View stateView) {
         mCustomStateViewArray.put(customStateKey, stateView);
         addView(stateView, stateView.getLayoutParams());
         stateView.setVisibility(GONE);
     }
 
+    /**
+     * @return current state value
+     */
+    @SuppressWarnings("unused")
+    public int getState() {
+        return mIsSystemState ? mCurState : mCurCustomStateKey;
+    }
+
+    /**
+     * @return current state is customise state
+     */
+    @SuppressWarnings("unused")
+    public boolean isCustomiseState() {
+        return !mIsSystemState;
+    }
+
     @SuppressWarnings("unused")
     public View findCustomStateViewByKey(int customStateKey) {
         return mCustomStateViewArray.get(customStateKey);

sample/src/main/java/cn/refactor/multistatelayoutdemo/MainActivity.java

@@ -1,22 +1,21 @@
 package cn.refactor.multistatelayoutdemo;
 
-import android.animation.ObjectAnimator;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.animation.AccelerateInterpolator;
 import android.widget.Toast;
 
 import cn.refactor.multistatelayout.MultiStateLayout;
-import cn.refactor.multistatelayout.TransitionAnimatorLoader;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
+    private static final String TAG = MainActivity.class.getSimpleName();
     private static final int KEY_CUSTOM_NOTICE = 1024;
 
     private MultiStateLayout mStateLayout;
@@ -55,16 +54,6 @@ public void onClick(View view) {
         // setup custom notice message view
         View customNoticeMsgView = LayoutInflater.from(this).inflate(R.layout.layout_custom_notice, mStateLayout, false);
         mStateLayout.putCustomStateView(KEY_CUSTOM_NOTICE, customNoticeMsgView);
-
-        mStateLayout.setTransitionAnimator(new TransitionAnimatorLoader() {
-            @Override
-            public ObjectAnimator loadAnimator(View targetView) {
-                ObjectAnimator customAnimator = ObjectAnimator.ofFloat(targetView, "alpha", 0.0f, 1.0f)
-                                                              .setDuration(500);
-                customAnimator.setInterpolator(new AccelerateInterpolator());
-                return customAnimator;
-            }
-        });
     }
 
     private void setupToolbar() {
@@ -96,6 +85,7 @@ public boolean onMenuItemClick(MenuItem item) {
                     default:
                         break;
                 }
+                Log.d(TAG, String.valueOf(mStateLayout.getState()));
                 return true;
             }
         });

sample/src/main/res/drawable-xxhdpi/ic_no_data.png

@@ -22,7 +22,7 @@
         android:layout_height="match_parent"
         state:layout_network_error="@layout/layout_custom_network_error"
         state:animEnable="true"
-        state:animDuration="250">
+        state:animDuration="300">
 
         <TextView
             android:id="@+id/tv_content"

sample/src/main/res/drawable-xxhdpi/ic_no_network.png

@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:text="@string/empty"/>
+    android:orientation="vertical">
 
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_no_data"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/empty"/>
+</LinearLayout>

sample/src/main/res/drawable-xxhdpi/ic_no_server.png

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:text="@string/error"/>
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_no_server"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/error"/>
+</LinearLayout>

sample/src/main/res/drawable-xxhdpi/ic_placeholder.png

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:text="@string/network_error"/>
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_no_network"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/network_error"/>
+</LinearLayout>