Skip to content

Commit c0345b7

Browse files
committed
Merge pull request #358 from cymcsg/dev
new deploy
2 parents f37e34e + 957371b commit c0345b7

27 files changed

+264
-74
lines changed

README.md

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
# UltimateRecyclerView
22

3-
### Version:0.4.8
3+
[![Download](https://api.bintray.com/packages/jjhesk/maven/MenuURV/images/download.svg) ](https://bintray.com/jjhesk/maven/MenuURV/_latestVersion)[![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)[![Stories in Ready](https://badge.waffle.io/cymcsg/UltimateRecyclerView.svg?label=ready&title=Ready)](http://waffle.io/cymcsg/UltimateRecyclerView)
4+
45

56
[![Throughput Graph](https://graphs.waffle.io/cymcsg/UltimateRecyclerView/throughput.svg)](https://waffle.io/cymcsg/UltimateRecyclerView/metrics)
67

78
#### Master branch:[![Build Status](https://travis-ci.org/cymcsg/UltimateRecyclerView.svg?branch=master)](https://travis-ci.org/cymcsg/UltimateRecyclerView)
89

910
#### Dev branch:[![Build Status](https://travis-ci.org/cymcsg/UltimateRecyclerView.svg?branch=dev)](https://travis-ci.org/cymcsg/UltimateRecyclerView)
1011

11-
[![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
12-
13-
[![Stories in Ready](https://badge.waffle.io/cymcsg/UltimateRecyclerView.svg?label=ready&title=Ready)](http://waffle.io/cymcsg/UltimateRecyclerView)
1412

1513
##### Project website:[https://github.com/cymcsg/UltimateRecyclerView](https://github.com/cymcsg/UltimateRecyclerView)
1614

@@ -19,17 +17,17 @@
1917

2018
###### 1.Integration jcenter
2119

22-
Please follow the latest publishing aar on jcenter. [ ![Download](https://api.bintray.com/packages/jjhesk/maven/MenuURV/images/download.svg) ](https://bintray.com/jjhesk/maven/MenuURV/_latestVersion)
20+
Please follow the latest publishing aar on jcenter.
2321

2422
follow by the gradle code
2523
```gradle
26-
2724
repositories {
2825
jcenter()
2926
maven { url "http://dl.bintray.com/jjhesk/maven" }
30-
}
31-
{
32-
compile 'com.hkm.slidingmenulib:libmenu:0.4.7'
27+
}
28+
29+
dependencies{
30+
compile 'com.hkm.slidingmenulib:libmenu:0.4.9'
3331
}
3432
```
3533

@@ -40,12 +38,12 @@ compile 'com.hkm.slidingmenulib:libmenu:0.4.7'
4038
android:layout_width="fill_parent"
4139
android:layout_height="fill_parent"
4240
android:id="@+id/ultimate_recycler_view"
43-
>
44-
</com.marshalchen.ultimaterecyclerview.UltimateRecyclerView>
41+
/>
4542
```
4643

47-
48-
44+
### Version Log
45+
* ***v0.4.9*** This is the last version that will be based on V23.1.1
46+
* ***v0.3.11*** There are still version that is based on 22.+
4947

5048
### Description
5149

@@ -111,9 +109,6 @@ If you have some good ideas, please tell us. My email is cymcsg # gmail.com.And
111109
![ultimate_recyclerview](https://bytebucket.org/marshalchen/images/raw/44beb162121c719ea4094bd7ea1c9f0cd7de4c04/ultimaterecyclerview/ultimate_recyclerview9.gif)
112110

113111

114-
115-
116-
117112
### Thanks
118113
* Use animators from [recyclerview-animators](https://github.com/wasabeef/recyclerview-animators)
119114
* Deal with different types of LayoutManager from[SuperRecyclerView](https://github.com/Malinskiy/SuperRecyclerView)

UltimateRecyclerView/app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ repositories {
2525
flatDir {
2626
dirs 'libs'
2727
}
28+
maven { url "http://dl.bintray.com/jjhesk/maven" }
2829
}
2930
dependencies {
3031
compile fileTree(dir: 'libs', include: ['*.jar'])
@@ -39,6 +40,7 @@ dependencies {
3940
debugCompile 'me.drakeet.library:crashwoodpecker:0.9.7'
4041
releaseCompile 'me.drakeet.library:crashwoodpecker-do-nothing:0.9.7'
4142

43+
compile 'com.hkm.loyalslider:library:1.6.2'
4244

4345
//used in the gridlayout
4446
// compile 'com.hkm.loyalslider:library:1.4.5' exclude group: 'android.support.v13'

UltimateRecyclerView/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
<activity
4343
android:name=".loadmoredemo.FirstPageCancelLoadMore"
4444
android:label="Stop Loading loadmore" />
45+
<activity
46+
android:name=".loadmoredemo.SliderHeader"
47+
android:label="Slider Header" />
4548
<activity
4649
android:name=".admobdemo.TestAdMobClassicActivity"
4750
android:label="TestAdMob" />

UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/MainActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ protected void onCreate(Bundle savedInstanceState) {
7575

7676
linearLayoutManager = new LinearLayoutManager(this);
7777
ultimateRecyclerView.setLayoutManager(linearLayoutManager);
78-
ultimateRecyclerView.setAdapter(RVAdapter);
78+
7979

8080

8181
// ultimateRecyclerView.setEmptyView(getResources().getIdentifier("empty_view","layout",getPackageName()));
@@ -184,6 +184,8 @@ public void onNothingSelected(AdapterView<?> parent) {
184184
185185
186186
*/
187+
188+
ultimateRecyclerView.setAdapter(RVAdapter);
187189
findViewById(R.id.add).setOnClickListener(new View.OnClickListener() {
188190
@Override
189191
public void onClick(View v) {

UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/loadmoredemo/BasicFunctions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
2323
import com.marshalchen.ultimaterecyclerview.demo.R;
2424
import com.marshalchen.ultimaterecyclerview.ui.AnimationType;
25-
import com.marshalchen.ultimaterecyclerview.uiUtils.ScrollSmoothLineaerLayoutManager;
25+
import com.marshalchen.ultimaterecyclerview.layoutmanagers.ScrollSmoothLineaerLayoutManager;
2626

2727
/**
2828
* Created by hesk on 19/2/16.
@@ -160,6 +160,9 @@ public void onItemLongClick(RecyclerView parent, View clickedView, int position)
160160

161161
protected void setupSpinnerSelection(Spinner sp, ArrayAdapter<String> adapter) {
162162
adapter.add("- select -");
163+
/**
164+
* a list of selection for other tests
165+
*/
163166
for (Route type : Route.values()) {
164167
adapter.add(type.getNameDisplay());
165168
}

UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/loadmoredemo/DebugLoadMoreActivity.java

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,14 @@
11
package com.marshalchen.ultimaterecyclerview.demo.loadmoredemo;
22

33
import android.graphics.Color;
4-
import android.graphics.drawable.Drawable;
5-
import android.os.Bundle;
6-
import android.os.Handler;
7-
import android.support.v4.widget.SwipeRefreshLayout;
8-
import android.support.v7.app.AppCompatActivity;
9-
import android.support.v7.widget.LinearLayoutManager;
10-
import android.support.v7.widget.RecyclerView;
11-
import android.support.v7.widget.Toolbar;
12-
import android.view.ActionMode;
13-
import android.view.Menu;
14-
import android.view.MenuItem;
15-
import android.view.View;
16-
import android.widget.AdapterView;
17-
import android.widget.ArrayAdapter;
18-
import android.widget.Spinner;
19-
20-
import com.marshalchen.ultimaterecyclerview.DragDropTouchListener;
21-
import com.marshalchen.ultimaterecyclerview.ItemTouchListenerAdapter;
22-
import com.marshalchen.ultimaterecyclerview.ObservableScrollState;
23-
import com.marshalchen.ultimaterecyclerview.ObservableScrollViewCallbacks;
4+
245
import com.marshalchen.ultimaterecyclerview.ui.swipe.SwipeableRecyclerViewTouchListener;
25-
import com.marshalchen.ultimaterecyclerview.URLogs;
266
import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView;
277
import com.marshalchen.ultimaterecyclerview.demo.R;
288
import com.marshalchen.ultimaterecyclerview.demo.basicdemo.sectionZeroAdapter;
29-
import com.marshalchen.ultimaterecyclerview.demo.modules.FastBinding;
309
import com.marshalchen.ultimaterecyclerview.demo.modules.SampleDataboxset;
3110
import com.marshalchen.ultimaterecyclerview.ui.swipe.defaultRegularSwipe;
32-
import com.marshalchen.ultimaterecyclerview.uiUtils.ScrollSmoothLineaerLayoutManager;
3311

34-
import java.lang.reflect.Type;
3512
import java.util.ArrayList;
3613

3714
/**
@@ -95,15 +72,15 @@ protected void onFireRefresh() {
9572
//simpleRecyclerViewAdapter.notifyDataSetChanged();
9673
simpleRecyclerViewAdapter.removeAll();
9774
ultimateRecyclerView.disableLoadmore();
98-
ultimateRecyclerView.showEmptyView();
75+
//ultimateRecyclerView.showEmptyView();
9976
}
10077

10178
@Override
10279
protected void doURV(UltimateRecyclerView ultimateRecyclerView) {
10380
ultimateRecyclerView.setHasFixedSize(false);
10481
simpleRecyclerViewAdapter = new sectionZeroAdapter(new ArrayList<String>());
10582
ultimateRecyclerView.setLayoutManager(setupLinearLayoutMgr());
106-
ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
83+
10784
enableParallaxHeader();
10885
enableEmptyViewPolicy();
10986
enableLoadMore();
@@ -112,7 +89,8 @@ protected void doURV(UltimateRecyclerView ultimateRecyclerView) {
11289
// enableScrollControl();
11390
// enableSwipe();
11491
// enableItemClick();
115-
ultimateRecyclerView.setItemViewCacheSize(simpleRecyclerViewAdapter.getAdditionalItems());
92+
//ultimateRecyclerView.setItemViewCacheSize(simpleRecyclerViewAdapter.getAdditionalItems());
93+
ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
11694
}
11795

11896

UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/loadmoredemo/DebugNoHeaderLoadMoreActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected void doURV(UltimateRecyclerView urv) {
4747
ultimateRecyclerView.setHasFixedSize(false);
4848
simpleRecyclerViewAdapter = new sectionZeroAdapter(new ArrayList<String>());
4949
ultimateRecyclerView.setLayoutManager(setupLinearLayoutMgr());
50-
ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
50+
5151
// enableParallaxHeader();
5252
enableEmptyViewPolicy();
5353
enableLoadMore();
@@ -58,6 +58,9 @@ protected void doURV(UltimateRecyclerView urv) {
5858
// enableItemClick();
5959
ultimateRecyclerView.setItemViewCacheSize(simpleRecyclerViewAdapter.getAdditionalItems());
6060

61+
62+
63+
ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
6164
}
6265

6366
@Override

UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/loadmoredemo/FinalEmptyViewDisplayActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,14 @@ protected void doURV(UltimateRecyclerView urv) {
5454
ultimateRecyclerView.setHasFixedSize(false);
5555
simpleRecyclerViewAdapter = new sectionZeroAdapter(new ArrayList<String>());
5656
ultimateRecyclerView.setLayoutManager(setupLinearLayoutMgr());
57-
ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
57+
5858
enableEmptyViewPolicy();
5959
enableLoadMore();
6060
ultimateRecyclerView.setRecylerViewBackgroundColor(Color.parseColor("#ff4fcccf"));
6161
enableRefresh();
62+
63+
64+
ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
6265
}
6366

6467
@Override

UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/loadmoredemo/FirstPageCancelLoadMore.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,14 @@ protected void doURV(UltimateRecyclerView urv) {
5353
ultimateRecyclerView.setHasFixedSize(false);
5454
simpleRecyclerViewAdapter = new sectionZeroAdapter(new ArrayList<String>());
5555
ultimateRecyclerView.setLayoutManager(setupLinearLayoutMgr());
56-
ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
56+
5757
enableEmptyViewPolicy();
5858
enableLoadMore();
5959
ultimateRecyclerView.setRecylerViewBackgroundColor(Color.parseColor("#ff4fcccf"));
6060
enableRefresh();
61+
62+
63+
ultimateRecyclerView.setAdapter(simpleRecyclerViewAdapter);
6164
}
6265

6366
@Override

UltimateRecyclerView/app/src/main/java/com/marshalchen/ultimaterecyclerview/demo/loadmoredemo/Route.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public enum Route {
1111
LOADLOADING_CUT("Stop loading", FirstPageCancelLoadMore.class),
1212
LOADMORE_TEST("No Header", DebugNoHeaderLoadMoreActivity.class),
1313
FinalEmptyViewDisplayActivity("Empty View", FinalEmptyViewDisplayActivity.class),
14+
SLIDER_HEADER("Header of Slider", SliderHeader.class),
1415
LOADMORE_HEADER("Header Pallx", DebugLoadMoreActivity.class),;
1516

1617
private String name;

0 commit comments

Comments
 (0)