Merge pull request #291 from HKMOpen/core-recode-redesign

Core recode redesign
cymcsg · Feb 11, 2016 · 809fc44 · 809fc44
2 parents 9a42576 + f0db09c
commit 809fc44
Show file tree

Hide file tree

Showing 29 changed files with 84 additions and 112 deletions.
diff --git a/UltimateRecyclerView/app/src/main/AndroidManifest.xml b/UltimateRecyclerView/app/src/main/AndroidManifest.xml
@@ -28,34 +28,34 @@
         </activity>
 
         <activity
-            android:name=".MultiViewTypesActivity"
+            android:name=".multiitemdemo.MultiViewTypesActivity"
             android:label="MultiViewTypesActivity" />
         <activity
-            android:name=".GridLayoutRVTest"
+            android:name=".griddemo.GridLayoutRVTest"
             android:label="GridLayoutRVTest" />
         <activity
-            android:name=".CustomSwipeToRefreshRefreshActivity"
+            android:name=".loadmoredemo.CustomSwipeToRefreshRefreshActivity"
             android:label="CustomSwipeToRefreshRefreshActivity" />
         <activity
-            android:name=".TestAdMob"
+            android:name=".admobdemo.TestAdMob"
             android:label="TestAdMob" />
         <activity
-            android:name=".TestExpandableRV"
+            android:name=".expandemo.TestExpandableRV"
             android:label="TestExpandableRV" />
         <activity
-            android:name=".DebugLoadMoreActivity"
+            android:name=".loadmoredemo.DebugLoadMoreActivity"
             android:label="DebugLoadMoreActivity" />
         <activity
             android:name=".scrollableobservable.ScrollObservablesActivity"
             android:label="ScrollObservablesActivity" />
         <activity
-            android:name=".DragActivity"
+            android:name=".dragdemo.DragActivity"
             android:label="DragActivity" />
         <activity
-            android:name=".swipelist.SwipeListViewExampleActivity"
+            android:name=".swiplistdemo.SwipeListViewExampleActivity"
             android:label="SwipeListViewExampleActivity" />
         <activity
-            android:name=".TestAdvancedAdmobActivity"
+            android:name=".admobdemo.TestAdvancedAdmobActivity"
             android:label="TestAdvancedAdmobActivity" />
 
         <activity

diff --git a/...ecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/MainActivity.java b/...ecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/MainActivity.java
@@ -1,6 +1,5 @@
 package com.marshalchen.ultimaterecyclerview.demo;
 
-import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
@@ -20,18 +19,14 @@
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
-import com.marshalchen.ultimaterecyclerview.DragDropTouchListener;
-import com.marshalchen.ultimaterecyclerview.ItemTouchListenerAdapter;
-import com.marshalchen.ultimaterecyclerview.SwipeableRecyclerViewTouchListener;
 import com.marshalchen.ultimaterecyclerview.URLogs;
 import com.marshalchen.ultimaterecyclerview.ObservableScrollState;
 import com.marshalchen.ultimaterecyclerview.ObservableScrollViewCallbacks;
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
 import com.marshalchen.ultimaterecyclerview.animators.BaseItemAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.*;
+import com.marshalchen.ultimaterecyclerview.demo.basicdemo.SimpleAdapter;
 import com.marshalchen.ultimaterecyclerview.demo.modules.FastBinding;
-import com.marshalchen.ultimaterecyclerview.demo.scrollableobservable.ScrollObservablesActivity;
-import com.marshalchen.ultimaterecyclerview.demo.swipelist.SwipeListViewExampleActivity;
 import com.marshalchen.ultimaterecyclerview.itemTouchHelper.SimpleItemTouchHelperCallback;
 import com.marshalchen.ultimaterecyclerview.stickyheadersrecyclerview.StickyRecyclerHeadersDecoration;
 

diff --git a/.../ultimaterecyclerview/demo/TestAdMob.java → ...ecyclerview/demo/admobdemo/TestAdMob.java b/.../ultimaterecyclerview/demo/TestAdMob.java → ...ecyclerview/demo/admobdemo/TestAdMob.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.admobdemo;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -23,6 +23,7 @@
 import com.marshalchen.ultimaterecyclerview.AdmobAdapter;
 import com.marshalchen.ultimaterecyclerview.URLogs;
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
+import com.marshalchen.ultimaterecyclerview.demo.R;
 import com.marshalchen.ultimaterecyclerview.demo.modules.FastBinding;
 import com.marshalchen.ultimaterecyclerview.demo.modules.SampleDataboxset;
 import com.marshalchen.ultimaterecyclerview.demo.modules.admobdfpadapter;

diff --git a/...rview/demo/TestAdvancedAdmobActivity.java → .../admobdemo/TestAdvancedAdmobActivity.java b/...rview/demo/TestAdvancedAdmobActivity.java → .../admobdemo/TestAdvancedAdmobActivity.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.admobdemo;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -25,6 +25,7 @@
 import com.marshalchen.ultimaterecyclerview.URLogs;
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder;
+import com.marshalchen.ultimaterecyclerview.demo.R;
 import com.marshalchen.ultimaterecyclerview.demo.modules.SampleDataboxset;
 import com.marshalchen.ultimaterecyclerview.quickAdapter.easyRegularAdapter;
 import com.marshalchen.ultimaterecyclerview.quickAdapter.simpleAdmobAdapter;

diff --git a/...imaterecyclerview/demo/SimpleAdapter.java → ...lerview/demo/basicdemo/SimpleAdapter.java b/...imaterecyclerview/demo/SimpleAdapter.java → ...lerview/demo/basicdemo/SimpleAdapter.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.basicdemo;
 
 import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
@@ -12,6 +12,7 @@
 
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder;
 import com.marshalchen.ultimaterecyclerview.UltimateViewAdapter;
+import com.marshalchen.ultimaterecyclerview.demo.R;
 
 import java.security.SecureRandom;
 import java.util.List;

diff --git a/...clerview/demo/SimpleAnimationAdapter.java → ...emo/basicdemo/SimpleAnimationAdapter.java b/...clerview/demo/SimpleAnimationAdapter.java → ...emo/basicdemo/SimpleAnimationAdapter.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.basicdemo;
 
 import android.animation.Animator;
 import android.graphics.Color;
@@ -15,6 +15,7 @@
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder;
 import com.marshalchen.ultimaterecyclerview.UltimateViewAdapter;
 import com.marshalchen.ultimaterecyclerview.animators.internal.ViewHelper;
+import com.marshalchen.ultimaterecyclerview.demo.R;
 
 import java.security.SecureRandom;
 import java.util.List;

diff --git a/...timaterecyclerview/demo/DragActivity.java → ...yclerview/demo/dragdemo/DragActivity.java b/...timaterecyclerview/demo/DragActivity.java → ...yclerview/demo/dragdemo/DragActivity.java
@@ -1,23 +1,17 @@
-package com.marshalchen.ultimaterecyclerview.demo;
-
-import android.content.Intent;
+package com.marshalchen.ultimaterecyclerview.demo.dragdemo;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
-import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
-import com.marshalchen.ultimaterecyclerview.URLogs;
-import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
 import com.marshalchen.ultimaterecyclerview.animators.BaseItemAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.FadeInAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.FadeInDownAnimator;
@@ -40,6 +34,7 @@
 import com.marshalchen.ultimaterecyclerview.animators.SlideInLeftAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.SlideInRightAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.SlideInUpAnimator;
+import com.marshalchen.ultimaterecyclerview.demo.R;
 import com.marshalchen.ultimaterecyclerview.demo.modules.FastBinding;
 
 
@@ -69,33 +64,24 @@ protected void onCreate(Bundle savedInstanceState) {
         ultimateRecyclerView.setHasFixedSize(false);
         List<String> stringList = new ArrayList<>();
 
-//        stringList.add("111");
-//        stringList.add("aaa");
-//        stringList.add("222");
-//        stringList.add("33");
-//        stringList.add("44");
-//        stringList.add("55");
-//        stringList.add("66");
-//        stringList.add("11771");
         stringList.add("aa");
         stringList.add("bb");
         stringList.add("cc");
         stringList.add("dd");
+
         List<Integer> data = new ArrayList<>();
+
         data.add(1);
         data.add(2);
         data.add(3);
         data.add(4);
         data.add(15);
-        simpleRecyclerViewAdapter = new DragAdatper(ultimateRecyclerView, data);
-
 
+        simpleRecyclerViewAdapter = new DragAdatper(ultimateRecyclerView, data);
         linearLayoutManager = new LinearLayoutManager(this);
         ultimateRecyclerView.setLayoutManager(linearLayoutManager);
-
         ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
 
-
         Spinner spinner = (Spinner) findViewById(R.id.spinner);
         ArrayAdapter<String> spinnerAdapter =
                 new ArrayAdapter<>(this, android.R.layout.simple_list_item_1);

diff --git a/...ltimaterecyclerview/demo/DragAdatper.java → ...cyclerview/demo/dragdemo/DragAdatper.java b/...ltimaterecyclerview/demo/DragAdatper.java → ...cyclerview/demo/dragdemo/DragAdatper.java
@@ -1,6 +1,5 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.dragdemo;
 
-import android.graphics.Color;
 import android.graphics.Point;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
@@ -12,12 +11,10 @@
 import android.widget.TextView;
 
 import com.marshalchen.ultimaterecyclerview.URLogs;
-import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder;
-import com.marshalchen.ultimaterecyclerview.UltimateViewAdapter;
+import com.marshalchen.ultimaterecyclerview.demo.R;
 import com.marshalchen.ultimaterecyclerview.dragsortadapter.DragSortAdapter;
 import com.marshalchen.ultimaterecyclerview.dragsortadapter.NoForegroundShadowBuilder;
 
-import java.security.SecureRandom;
 import java.util.List;
 
 

diff --git a/...ecyclerview/demo/expanables/Category.java → ...recyclerview/demo/expandemo/Category.java b/...ecyclerview/demo/expanables/Category.java → ...recyclerview/demo/expandemo/Category.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo.expanables;
+package com.marshalchen.ultimaterecyclerview.demo.expandemo;
 
 import android.view.View;
 import android.widget.RelativeLayout;

diff --git a/...iew/demo/expanables/ExpCustomAdapter.java → ...view/demo/expandemo/ExpCustomAdapter.java b/...iew/demo/expanables/ExpCustomAdapter.java → ...view/demo/expandemo/ExpCustomAdapter.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo.expanables;
+package com.marshalchen.ultimaterecyclerview.demo.expandemo;
 
 import android.content.Context;
 import android.view.View;

diff --git a/...clerview/demo/expanables/SubCategory.java → ...yclerview/demo/expandemo/SubCategory.java b/...clerview/demo/expanables/SubCategory.java → ...yclerview/demo/expandemo/SubCategory.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo.expanables;
+package com.marshalchen.ultimaterecyclerview.demo.expandemo;
 
 import android.view.View;
 import android.widget.RelativeLayout;

diff --git a/...terecyclerview/demo/TestExpandableRV.java → ...view/demo/expandemo/TestExpandableRV.java b/...terecyclerview/demo/TestExpandableRV.java → ...view/demo/expandemo/TestExpandableRV.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.expandemo;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -10,7 +10,7 @@
 import android.view.MenuItem;
 
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
-import com.marshalchen.ultimaterecyclerview.demo.expanables.ExpCustomAdapter;
+import com.marshalchen.ultimaterecyclerview.demo.R;
 import com.marshalchen.ultimaterecyclerview.demo.modules.FastBinding;
 
 /**

diff --git a/...lerview/demo/gridTools/GridJRAdapter.java → ...clerview/demo/griddemo/GridJRAdapter.java b/...lerview/demo/gridTools/GridJRAdapter.java → ...clerview/demo/griddemo/GridJRAdapter.java
@@ -1,10 +1,7 @@
-package com.marshalchen.ultimaterecyclerview.demo.gridTools;
+package com.marshalchen.ultimaterecyclerview.demo.griddemo;
 
-import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.marshalchen.ultimaterecyclerview.UltimateGridLayoutAdapter;
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder;

diff --git a/...terecyclerview/demo/GridLayoutRVTest.java → ...rview/demo/griddemo/GridLayoutRVTest.java b/...terecyclerview/demo/GridLayoutRVTest.java → ...rview/demo/griddemo/GridLayoutRVTest.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.griddemo;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -14,7 +14,7 @@
 import android.view.View;
 
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
-import com.marshalchen.ultimaterecyclerview.demo.gridTools.GridJRAdapter;
+import com.marshalchen.ultimaterecyclerview.demo.R;
 import com.marshalchen.ultimaterecyclerview.demo.modules.JRitem;
 import com.marshalchen.ultimaterecyclerview.demo.modules.SampleDataboxset;
 import com.marshalchen.ultimaterecyclerview.grid.BasicGridLayoutManager;

diff --git a/...iew/demo/gridTools/GridStringAdapter.java → ...view/demo/griddemo/GridStringAdapter.java b/...iew/demo/gridTools/GridStringAdapter.java → ...view/demo/griddemo/GridStringAdapter.java
@@ -1,11 +1,8 @@
-package com.marshalchen.ultimaterecyclerview.demo.gridTools;
+package com.marshalchen.ultimaterecyclerview.demo.griddemo;
 
-import android.graphics.Color;
 import android.support.v7.widget.GridLayoutManager;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder;
 import com.marshalchen.ultimaterecyclerview.UltimateGridLayoutAdapter;

diff --git a/...erview/demo/gridTools/HolderGirdCell.java → ...lerview/demo/griddemo/HolderGirdCell.java b/...erview/demo/gridTools/HolderGirdCell.java → ...lerview/demo/griddemo/HolderGirdCell.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo.gridTools;
+package com.marshalchen.ultimaterecyclerview.demo.griddemo;
 
 import android.graphics.Color;
 import android.view.View;

diff --git a/.../CustomSwipeToRefreshRefreshActivity.java → .../CustomSwipeToRefreshRefreshActivity.java b/.../CustomSwipeToRefreshRefreshActivity.java → .../CustomSwipeToRefreshRefreshActivity.java
@@ -1,14 +1,11 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.loadmoredemo;
 
-import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
@@ -46,6 +43,8 @@
 import com.marshalchen.ultimaterecyclerview.animators.SlideInLeftAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.SlideInRightAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.SlideInUpAnimator;
+import com.marshalchen.ultimaterecyclerview.demo.R;
+import com.marshalchen.ultimaterecyclerview.demo.basicdemo.SimpleAnimationAdapter;
 import com.marshalchen.ultimaterecyclerview.demo.modules.FastBinding;
 
 import java.util.ArrayList;

diff --git a/...yclerview/demo/DebugLoadMoreActivity.java → ...o/loadmoredemo/DebugLoadMoreActivity.java b/...yclerview/demo/DebugLoadMoreActivity.java → ...o/loadmoredemo/DebugLoadMoreActivity.java
@@ -1,4 +1,4 @@
-package com.marshalchen.ultimaterecyclerview.demo;
+package com.marshalchen.ultimaterecyclerview.demo.loadmoredemo;
 
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ -47,6 +47,8 @@
 import com.marshalchen.ultimaterecyclerview.animators.SlideInLeftAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.SlideInRightAnimator;
 import com.marshalchen.ultimaterecyclerview.animators.SlideInUpAnimator;
+import com.marshalchen.ultimaterecyclerview.demo.R;
+import com.marshalchen.ultimaterecyclerview.demo.basicdemo.SimpleAdapter;
 import com.marshalchen.ultimaterecyclerview.demo.modules.SampleDataboxset;
 import com.marshalchen.ultimaterecyclerview.demo.modules.FastBinding;
 import com.marshalchen.ultimaterecyclerview.uiUtils.ScrollSmoothLineaerLayoutManager;

diff --git a/...View/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/modules/FastBinding.java b/...View/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/modules/FastBinding.java
@@ -4,16 +4,16 @@
 import android.content.Intent;
 import android.support.annotation.IdRes;
 
-import com.marshalchen.ultimaterecyclerview.demo.CustomSwipeToRefreshRefreshActivity;
-import com.marshalchen.ultimaterecyclerview.demo.GridLayoutRVTest;
-import com.marshalchen.ultimaterecyclerview.demo.MultiViewTypesActivity;
+import com.marshalchen.ultimaterecyclerview.demo.loadmoredemo.CustomSwipeToRefreshRefreshActivity;
+import com.marshalchen.ultimaterecyclerview.demo.griddemo.GridLayoutRVTest;
+import com.marshalchen.ultimaterecyclerview.demo.multiitemdemo.MultiViewTypesActivity;
 import com.marshalchen.ultimaterecyclerview.demo.R;
-import com.marshalchen.ultimaterecyclerview.demo.TestAdMob;
-import com.marshalchen.ultimaterecyclerview.demo.DebugLoadMoreActivity;
-import com.marshalchen.ultimaterecyclerview.demo.TestAdvancedAdmobActivity;
+import com.marshalchen.ultimaterecyclerview.demo.admobdemo.TestAdMob;
+import com.marshalchen.ultimaterecyclerview.demo.loadmoredemo.DebugLoadMoreActivity;
+import com.marshalchen.ultimaterecyclerview.demo.admobdemo.TestAdvancedAdmobActivity;
 import com.marshalchen.ultimaterecyclerview.demo.scrollableobservable.ScrollObservablesActivity;
-import com.marshalchen.ultimaterecyclerview.demo.swipelist.SwipeListViewExampleActivity;
-import com.marshalchen.ultimaterecyclerview.demo.TestExpandableRV;
+import com.marshalchen.ultimaterecyclerview.demo.swiplistdemo.SwipeListViewExampleActivity;
+import com.marshalchen.ultimaterecyclerview.demo.expandemo.TestExpandableRV;
 
 /**
  * Created by hesk on 7/1/2015.

diff --git a/...app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/modules/SampleDataboxset.java b/...app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/modules/SampleDataboxset.java
@@ -1,7 +1,7 @@
 package com.marshalchen.ultimaterecyclerview.demo.modules;
 
 import com.marshalchen.ultimaterecyclerview.demo.R;
-import com.marshalchen.ultimaterecyclerview.demo.SimpleAdapter;
+import com.marshalchen.ultimaterecyclerview.demo.basicdemo.SimpleAdapter;
 
 import java.util.ArrayList;
 import java.util.List;