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

Core recode redesign

Author: jjhesk

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

UltimateRecyclerView/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;
 

…ultimaterecyclerview/demo/TestAdMob.java …cyclerview/demo/admobdemo/TestAdMob.javaUltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/TestAdMob.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/admobdemo/TestAdMob.java UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/TestAdMob.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/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;

…view/demo/TestAdvancedAdmobActivity.java …admobdemo/TestAdvancedAdmobActivity.javaUltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/TestAdvancedAdmobActivity.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/admobdemo/TestAdvancedAdmobActivity.java UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/TestAdvancedAdmobActivity.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/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;

…materecyclerview/demo/SimpleAdapter.java …erview/demo/basicdemo/SimpleAdapter.javaUltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/SimpleAdapter.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/basicdemo/SimpleAdapter.java UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/SimpleAdapter.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/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;

…lerview/demo/SimpleAnimationAdapter.java …mo/basicdemo/SimpleAnimationAdapter.javaUltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/SimpleAnimationAdapter.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/basicdemo/SimpleAnimationAdapter.java UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/SimpleAnimationAdapter.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/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;

…imaterecyclerview/demo/DragActivity.java …clerview/demo/dragdemo/DragActivity.javaUltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/DragActivity.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/dragdemo/DragActivity.java UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/DragActivity.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/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);

…timaterecyclerview/demo/DragAdatper.java …yclerview/demo/dragdemo/DragAdatper.javaUltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/DragAdatper.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/dragdemo/DragAdatper.java UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/DragAdatper.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/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;
 
 

…cyclerview/demo/expanables/Category.java …ecyclerview/demo/expandemo/Category.javaUltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/expanables/Category.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/expandemo/Category.java UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/expanables/Category.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/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;

…ew/demo/expanables/ExpCustomAdapter.java …iew/demo/expandemo/ExpCustomAdapter.javaUltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/expanables/ExpCustomAdapter.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/expandemo/ExpCustomAdapter.java UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/expanables/ExpCustomAdapter.java renamed to UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/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;