Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Commit

Permalink
updated README
Browse files Browse the repository at this point in the history
  • Loading branch information
florent37 committed May 21, 2015
1 parent c6c22bf commit f9a9126
Show file tree
Hide file tree
Showing 9 changed files with 123 additions and 320 deletions.
221 changes: 107 additions & 114 deletions .idea/workspace.xml

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ And have a look on a sample Youtube Video : [Youtube Link](http://www.youtube.co

In your module [![Download](https://api.bintray.com/packages/florent37/maven/MaterialViewPager/images/download.svg)](https://bintray.com/florent37/maven/MaterialViewPager/_latestVersion)
```groovy
compile ('com.github.florent37:materialviewpager:1.0.3.3@aar'){
compile ('com.github.florent37:materialviewpager:1.0.4@aar'){
transitive = true
}
```
Expand Down Expand Up @@ -507,6 +507,14 @@ MaterialViewPagerHelper.registerListView(getActivity(), mListView, null);

#CHANGELOG

##1.0.4
Fixed :

- Orientation changed
- Memory Leak
- Android >2.3 with NineOldAndroid
- Removed ListView usage

##1.0.3

Fixed : Rapid scrolling results in varying Toolbar height
Expand Down
2 changes: 1 addition & 1 deletion materialviewpager/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

version = "1.0.3.3"
version = "1.0.4"


android {
Expand Down
2 changes: 1 addition & 1 deletion materialviewpager/materialviewpager.iml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":materialviewpager" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.florent37" external.system.module.version="1.0.3.3" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":materialviewpager" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.florent37" external.system.module.version="1.0.4" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import android.widget.ListView;
import android.widget.ScrollView;

import com.github.ksoichiro.android.observablescrollview.ObservableListView;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollView;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
import com.github.ksoichiro.android.observablescrollview.ObservableWebView;
Expand Down Expand Up @@ -552,52 +551,6 @@ public void onUpOrCancelMotionEvent(ScrollState scrollState) {
}
}

/**
* Register a ListView to the current MaterialViewPagerAnimator
* Listen to ObservableScrollViewCallbacks so give to $[observableScrollViewCallbacks] your ObservableScrollViewCallbacks if you already use one
* For loadmore or anything else
*
* @param listView the scrollable
* @param observableScrollViewCallbacks use it if you want to get a callback of the RecyclerView
*/
@Deprecated
public void registerListView(final ObservableListView listView, final ObservableScrollViewCallbacks observableScrollViewCallbacks) {
if (listView != null) {
if (listView.getParent() != null && listView.getParent().getParent() != null && listView.getParent().getParent() instanceof ViewGroup)
listView.setTouchInterceptionViewGroup((ViewGroup) listView.getParent().getParent());
scrollViewList.add(listView); //add to the scrollable list
listView.setScrollViewCallbacks(new ObservableScrollViewCallbacks() {
@Override
public void onScrollChanged(int i, boolean b, boolean b2) {
if (observableScrollViewCallbacks != null)
observableScrollViewCallbacks.onScrollChanged(i, b, b2);

//if scrolled from dispatch, remove & return -> so skip
if (calledScrollList.contains(listView)) {
calledScrollList.remove(listView);
return;
}

onMaterialScrolled(listView, i);
}

@Override
public void onDownMotionEvent() {
if (observableScrollViewCallbacks != null)
observableScrollViewCallbacks.onDownMotionEvent();
}

@Override
public void onUpOrCancelMotionEvent(ScrollState scrollState) {
if (observableScrollViewCallbacks != null)
observableScrollViewCallbacks.onUpOrCancelMotionEvent(scrollState);
}
});

this.setScrollOffset(listView, lastYOffset);
}
}

//endregion

public void restoreScroll(float scroll,MaterialViewPagerSettings settings) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,6 @@ public static void registerWebView(Activity activity, ObservableWebView webView,
}
}

/**
* Register a ListView to the current MaterialViewPagerAnimator
* Listen to ObservableScrollViewCallbacks so give to $[observableScrollViewCallbacks] your ObservableScrollViewCallbacks if you already use one
* For loadmore or anything else
*
* @param activity current context
* @param listView the scrollable
* @param observableScrollViewCallbacks use it if you want to get a callback of the RecyclerView
*/
@Deprecated
public static void registerListView(Activity activity, ObservableListView listView, ObservableScrollViewCallbacks observableScrollViewCallbacks) {
if (activity != null && hashMap.containsKey(activity)) {
MaterialViewPagerAnimator animator = hashMap.get(activity);
if (animator != null) {
animator.registerListView(listView, observableScrollViewCallbacks);
}
}
}

/**
* Register a ScrollView to the current MaterialViewPagerAnimator
* Listen to ObservableScrollViewCallbacks so give to $[observableScrollViewCallbacks] your ObservableScrollViewCallbacks if you already use one
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.ViewGroup;

import com.github.florent37.materialviewpager.MaterialViewPager;
import com.github.florent37.materialviewpager.MaterialViewPagerHelper;
import com.github.florent37.materialviewpager.MaterialViewPagerImageHeader;
import com.github.florent37.materialviewpager.sample.fragment.ListViewFragment;
import com.github.florent37.materialviewpager.sample.fragment.RecyclerViewFragment;
import com.github.florent37.materialviewpager.sample.fragment.ScrollFragment;
import com.github.florent37.materialviewpager.sample.fragment.WebViewFragment;

public class MainActivity extends ActionBarActivity {

Expand Down Expand Up @@ -67,8 +62,6 @@ public Fragment getItem(int position) {
case 1:
return ScrollFragment.newInstance();
//case 2:
// return ListViewFragment.newInstance();
//case 3:
// return WebViewFragment.newInstance();
default:
return RecyclerViewFragment.newInstance();
Expand All @@ -80,13 +73,13 @@ public void setPrimaryItem(ViewGroup container, int position, Object object) {
super.setPrimaryItem(container, position, object);

//only if position changed
if(position == oldPosition)
if (position == oldPosition)
return;
oldPosition = position;

int color = 0;
String imageUrl = "";
switch (position){
switch (position) {
case 0:
imageUrl = "http://cdn1.tnwcdn.com/wp-content/blogs.dir/1/files/2014/06/wallpaper_51.jpg";
color = getResources().getColor(R.color.blue);
Expand All @@ -106,8 +99,8 @@ public void setPrimaryItem(ViewGroup container, int position, Object object) {
}

final int fadeDuration = 400;
mViewPager.setImageUrl(imageUrl,fadeDuration);
mViewPager.setColor(color,fadeDuration);
mViewPager.setImageUrl(imageUrl, fadeDuration);
mViewPager.setColor(color, fadeDuration);

}

Expand All @@ -118,7 +111,7 @@ public int getCount() {

@Override
public CharSequence getPageTitle(int position) {
switch (position){
switch (position) {
case 0:
return "Selection";
case 1:
Expand Down

This file was deleted.

0 comments on commit f9a9126

Please sign in to comment.