IStepperAdapter: Rename

Signed-off-by: Fung <fython@163.com>

Author: fython

demo/src/main/java/moe/feng/common/stepperview/demo/MainActivity.java

@@ -66,12 +66,10 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
 		mDrawerLayout.closeDrawer(mNavigationView);
 		switch (item.getItemId()) {
 			case R.id.item_vertical_stepper:
-				getSupportFragmentManager().beginTransaction()
-						.replace(R.id.container, mVerticalStepperDemoFragment).commit();
+				replaceFragment(mVerticalStepperDemoFragment);
 				return true;
 			case R.id.item_vertical_stepper_adapter:
-				getSupportFragmentManager().beginTransaction()
-						.replace(R.id.container, mVerticalStepperAdapterDemoFragment).commit();
+				replaceFragment(mVerticalStepperAdapterDemoFragment);
 				return true;
 			case R.id.action_alipay_donate:
 				if (AlipayZeroSdk.hasInstalledAlipayClient(this)) {
@@ -98,6 +96,10 @@ public void onClick(DialogInterface dialogInterface, int i) {
 		}
 	}
 
+	private void replaceFragment(Fragment fragment) {
+		getSupportFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
+	}
+
 	private void openWebsite(String url) {
 		CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
 		builder.setToolbarColor(getResources().getColor(R.color.colorPrimary));

demo/src/main/java/moe/feng/common/stepperview/demo/fragment/VerticalStepperAdapterDemoFragment.java

@@ -9,12 +9,12 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-import moe.feng.common.stepperview.IStepperViewAdapter;
+import moe.feng.common.stepperview.IStepperAdapter;
 import moe.feng.common.stepperview.VerticalStepperItemView;
 import moe.feng.common.stepperview.VerticalStepperView;
 import moe.feng.common.stepperview.demo.R;
 
-public class VerticalStepperAdapterDemoFragment extends Fragment implements IStepperViewAdapter {
+public class VerticalStepperAdapterDemoFragment extends Fragment implements IStepperAdapter {
 
 	private VerticalStepperView mVerticalStepperView;
 

…mon/stepperview/IStepperViewAdapter.java …/common/stepperview/IStepperAdapter.javalibrary/src/main/java/moe/feng/common/stepperview/IStepperViewAdapter.java renamed to library/src/main/java/moe/feng/common/stepperview/IStepperAdapter.java library/src/main/java/moe/feng/common/stepperview/IStepperViewAdapter.java renamed to library/src/main/java/moe/feng/common/stepperview/IStepperAdapter.java

@@ -4,7 +4,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-public interface IStepperViewAdapter {
+public interface IStepperAdapter {
 
 	String getTitle(int index);
 

library/src/main/java/moe/feng/common/stepperview/IStepperView.java

@@ -5,7 +5,7 @@
 
 interface IStepperView {
 
-	IStepperViewAdapter getViewAdapter();
+	IStepperAdapter getViewAdapter();
 	int getCurrentStep();
 
 	@ColorInt int getNormalColor();

library/src/main/java/moe/feng/common/stepperview/VerticalStepperItemView.java

@@ -106,6 +106,10 @@ public void addView(View child, int index, ViewGroup.LayoutParams layoutParams)
 		}
 	}
 
+	FrameLayout getCustomView() {
+		return mCustomView;
+	}
+
 	public void removeCustomView() {
 		mCustomView.removeAllViews();
 	}

library/src/main/java/moe/feng/common/stepperview/VerticalStepperView.java

@@ -6,6 +6,7 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import moe.feng.common.stepperview.internal.VerticalSpaceItemDecoration;
@@ -15,7 +16,7 @@ public class VerticalStepperView extends FrameLayout implements IStepperView {
 	private RecyclerView mListView;
 	private ItemAdapter mAdapter;
 
-	private IStepperViewAdapter mViewAdapter;
+	private IStepperAdapter mViewAdapter;
 	private int mCurrentStep = 0;
 	private boolean mAnimationEnabled;
 
@@ -74,7 +75,7 @@ private void prepareListView(Context context) {
 		addView(mListView, new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 	}
 
-	public void setViewAdapter(IStepperViewAdapter viewAdapter) {
+	public void setViewAdapter(IStepperAdapter viewAdapter) {
 		mViewAdapter = viewAdapter;
 		mAdapter.notifyDataSetChanged();
 	}
@@ -118,7 +119,7 @@ public boolean prevStep() {
 	}
 
 	@Override
-	public IStepperViewAdapter getViewAdapter() {
+	public IStepperAdapter getViewAdapter() {
 		return mViewAdapter;
 	}
 
@@ -193,7 +194,10 @@ public void onBindViewHolder(ItemHolder holder, int position) {
 				holder.mItemView.setState(VerticalStepperItemView.STATE_SELECTED);
 			}
 			holder.mItemView.removeCustomView();
-			holder.mItemView.addView(getViewAdapter().onCreateCustomView(position, getContext(), holder.mItemView));
+			View customView = getViewAdapter().onCreateCustomView(position, getContext(), holder.mItemView);
+			if (customView != null) {
+				holder.mItemView.addView(customView);
+			}
 		}
 
 		@Override

…mmon/stepperview/StepperViewAdapter.java …stepperview/ViewBasedStepperAdapter.javalibrary/src/main/java/moe/feng/common/stepperview/StepperViewAdapter.java renamed to library/src/main/java/moe/feng/common/stepperview/ViewBasedStepperAdapter.java library/src/main/java/moe/feng/common/stepperview/StepperViewAdapter.java renamed to library/src/main/java/moe/feng/common/stepperview/ViewBasedStepperAdapter.java

@@ -3,15 +3,15 @@
 import android.content.Context;
 import android.view.View;
 
-public abstract class StepperViewAdapter implements IStepperViewAdapter {
+public abstract class ViewBasedStepperAdapter implements IStepperAdapter {
 
 	private View mViews[];
 
-	public StepperViewAdapter() {
+	public ViewBasedStepperAdapter() {
 
 	}
 
-	public StepperViewAdapter(View[] views) {
+	public ViewBasedStepperAdapter(View[] views) {
 		mViews = views;
 	}