diff --git a/.gitignore b/.gitignore
index 27dce785..89676dd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,6 @@
*.apk
*.ap_
-.idea/workspace.xml
-
# Files for the Dalvik VM
*.dex
@@ -17,7 +15,6 @@ gen/
# Gradle files
.gradle/
build/
-/*/build/
# Local configuration file (sdk path, etc)
local.properties
@@ -27,3 +24,14 @@ proguard/
# Log Files
*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+.gradle
+.idea
+*.iml
+**/build/*
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 058c87cc..26f59804 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,10 +3,24 @@
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 47662492..5d199810 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
+
+
+
@@ -34,7 +37,7 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ad2b2424..d104611d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,9 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b8..00000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddf..94a25f7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/MaterialViewPager.iml b/MaterialViewPager.iml
index 02342f05..9c5f8acd 100644
--- a/MaterialViewPager.iml
+++ b/MaterialViewPager.iml
@@ -7,16 +7,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/README.md b/README.md
index 5d36ff0b..cb6dea21 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ And have a look on a sample Youtube Video : [Youtube Link](http://www.youtube.co
In your module [](https://bintray.com/florent37/maven/MaterialViewPager/_latestVersion)
```groovy
-compile ('com.github.florent37:materialviewpager:1.1.3@aar'){
+compile ('com.github.florent37:materialviewpager:1.2.0@aar'){
transitive = true
}
```
@@ -441,6 +441,15 @@ Sample :
##RecyclerView
+### LinearLayoutManager / GridLayoutManager
+
+```java
+mRecyclerView.setAdapter(new MaterialViewPagerHeaderDecorator());
+mRecyclerView.setAdapter(yourAdapter);
+```
+
+### StaggedLayoutManager
+
From your fragment
```java
mAdapter = new RecyclerViewMaterialAdapter(new ***Adapter(mList));
@@ -501,6 +510,9 @@ And must include @layout/material_view_pager_placeholder as first child
#CHANGELOG
+##1.2.0
+- header decorator instead of Adapter
+
##1.1.3
- header is now clickable
- fixed some scrolling issues
diff --git a/build.gradle b/build.gradle
index 3c8242b7..9bed12bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,38 +4,33 @@ buildscript {
repositories {
mavenCentral()
jcenter()
- maven {
- url "http://dl.bintray.com/jfrog/jfrog-jars"
- }
+ maven { url "http://dl.bintray.com/jfrog/jfrog-jars" }
+ maven { url 'https://maven.fabric.io/public' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.2.3'
- classpath 'com.github.dcendents:android-maven-plugin:1.2'
- classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"
- classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
+ classpath 'com.android.tools.build:gradle:2.1.0'
+ classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1"
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:+'
-
+ classpath 'io.fabric.tools:gradle:1.+'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
-ext{
- ANDROID_BUILD_MIN_SDK_VERSION=10
- ANDROID_BUILD_TARGET_SDK_VERSION=22
- ANDROID_BUILD_TOOLS_VERSION='22.0.0'
- ANDROID_BUILD_SDK_VERSION=22
-
- SUPPORT_VERSION='22.2.1'
-
- MAVEN_VERSION='1.1.3'
+ext {
+ minSdk = 10
+ sdk = 23
+ buildTools = "23.0.3"
+ supportVersion = "23.3.0"
+ libraryVersion = '1.2.0'
}
allprojects {
repositories {
jcenter()
- maven {
- url "http://dl.bintray.com/florent37/maven"
- }
+ maven { url "http://dl.bintray.com/florent37/maven" }
+ maven { url 'https://maven.fabric.io/public' }
}
}
diff --git a/gradle/bintray-android-v1.gradle b/gradle/bintray-android-v1.gradle
new file mode 100644
index 00000000..0101dd55
--- /dev/null
+++ b/gradle/bintray-android-v1.gradle
@@ -0,0 +1,52 @@
+apply plugin: 'com.jfrog.bintray'
+
+version = libraryVersion
+
+task sourcesJar(type: Jar) {
+ from android.sourceSets.main.java.srcDirs
+ classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+ source = android.sourceSets.main.java.srcDirs
+ classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+}
+artifacts {
+ archives javadocJar
+ archives sourcesJar
+}
+
+// Bintray
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+bintray {
+ user = properties.getProperty("bintray.user")
+ key = properties.getProperty("bintray.apikey")
+
+ configurations = ['archives']
+ pkg {
+ repo = bintrayRepo
+ name = bintrayName
+ desc = libraryDescription
+ userOrg = orgName
+ websiteUrl = siteUrl
+ vcsUrl = gitUrl
+ licenses = allLicenses
+ publish = true
+ publicDownloadNumbers = true
+ version {
+ desc = libraryDescription
+ gpg {
+ sign = true //Determines whether to GPG sign the files. The default is false
+ passphrase = properties.getProperty("bintray.gpg.password")
+ //Optional. The passphrase for GPG signing'
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/gradle/bintray-java-v1.gradle b/gradle/bintray-java-v1.gradle
new file mode 100644
index 00000000..67025d75
--- /dev/null
+++ b/gradle/bintray-java-v1.gradle
@@ -0,0 +1,49 @@
+apply plugin: 'com.jfrog.bintray'
+
+version = libraryVersion
+
+task sourcesJar(type: Jar) {
+ from sourceSets.main.allSource
+ classifier = 'sources'
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+}
+artifacts {
+ archives javadocJar
+ archives sourcesJar
+}
+
+// Bintray
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+bintray {
+ user = properties.getProperty("bintray.user")
+ key = properties.getProperty("bintray.apikey")
+
+ configurations = ['archives']
+ pkg {
+ repo = bintrayRepo
+ name = bintrayName
+ desc = libraryDescription
+ userOrg = orgName
+ websiteUrl = siteUrl
+ vcsUrl = gitUrl
+ licenses = ['Apache-2.0']
+ publish = true
+ publicDownloadNumbers = true
+ version {
+ desc = libraryDescription
+ gpg {
+ sign = true //Determines whether to GPG sign the files. The default is false
+ passphrase = properties.getProperty("bintray.gpg.password")
+ //Optional. The passphrase for GPG signing'
+ }
+ }
+ }
+}
+
+//from https://github.com/workarounds/bundler/blob/master/gradle/bintray-java-v1.gradle
\ No newline at end of file
diff --git a/gradle/install-v1.gradle b/gradle/install-v1.gradle
new file mode 100644
index 00000000..79980d1d
--- /dev/null
+++ b/gradle/install-v1.gradle
@@ -0,0 +1,44 @@
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = publishedGroupId // Maven Group ID for the artifact
+
+install {
+ repositories.mavenInstaller {
+ // This generates POM.xml with proper parameters
+ pom {
+ project {
+ packaging 'aar'
+ groupId publishedGroupId
+ artifactId artifact
+
+ // Add your description here
+ name libraryName
+ description libraryDescription
+ url siteUrl
+
+ // Set your license
+ licenses {
+ license {
+ name licenseName
+ url licenseUrl
+ }
+ }
+ developers {
+ developer {
+ id developerId
+ name developerName
+ email developerEmail
+ }
+ }
+ scm {
+ connection gitUrl
+ developerConnection gitUrl
+ url siteUrl
+
+ }
+ }
+ }
+ }
+}
+
+//from https://github.com/workarounds/bundler/blob/master/gradle/install-v1.gradle
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e760..d5705170 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/materialviewpager/build.gradle b/materialviewpager/build.gradle
index b8c1d62f..addb842d 100644
--- a/materialviewpager/build.gradle
+++ b/materialviewpager/build.gradle
@@ -1,18 +1,13 @@
-apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
apply plugin: 'com.github.ben-manes.versions'
-version = project.MAVEN_VERSION
-
android {
- compileSdkVersion project.ANDROID_BUILD_SDK_VERSION
- buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+ compileSdkVersion project.sdk
+ buildToolsVersion project.buildTools
defaultConfig {
- minSdkVersion project.ANDROID_BUILD_MIN_SDK_VERSION
- targetSdkVersion ANDROID_BUILD_TARGET_SDK_VERSION
+ minSdkVersion project.minSdk
+ targetSdkVersion project.sdk
versionCode 1
versionName "1.0"
}
@@ -28,110 +23,47 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile (
- 'com.android.support:appcompat-v7:'+project.SUPPORT_VERSION,
- 'com.android.support:support-v4:'+project.SUPPORT_VERSION,
- 'com.android.support:recyclerview-v7:'+project.SUPPORT_VERSION,
- 'com.android.support:cardview-v7:'+project.SUPPORT_VERSION,
- 'com.android.support:support-annotations:'+project.SUPPORT_VERSION
+ 'com.android.support:appcompat-v7:'+project.supportVersion,
+ 'com.android.support:support-v4:'+project.supportVersion,
+ 'com.android.support:recyclerview-v7:'+project.supportVersion,
+ 'com.android.support:cardview-v7:'+project.supportVersion,
+ 'com.android.support:support-annotations:'+project.supportVersion
)
compile 'com.nineoldandroids:library:2.4.0'
- compile 'com.flaviofaria:kenburnsview:1.0.6'
+ compile 'com.flaviofaria:kenburnsview:1.0.7'
compile 'com.jpardogo.materialtabstrip:library:1.1.0'
- compile 'com.github.ksoichiro:android-observablescrollview:1.5.2'
- compile 'com.squareup.picasso:picasso:2.5.2'
+ compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
+ compile 'com.github.bumptech.glide:glide:3.7.0'
}
+ext {
+ bintrayRepo = 'maven'
+ bintrayName = 'MaterialViewPager'
+ orgName = 'florent37'
-//https://github.com/danielemaddaluno/gradle-jcenter-publish
-
-// ./gradlew install bintrayUpload
-
-
-def siteUrl = 'https://github.com/florent37/MaterialViewPager' // Homepage URL of the library
-def gitUrl = 'https://github.com/florent37/MaterialViewPager.git' // Git repository URL
-group = "com.github.florent37" // Maven Group ID for the artifact
+ publishedGroupId = 'com.github.florent37'
+ libraryName = 'MaterialViewPager'
+ artifact = 'materialviewpager'
+ libraryDescription = 'MaterialViewPager'
-install {
- repositories.mavenInstaller {
- // This generates POM.xml with proper parameters
- pom {
- project {
- packaging 'aar'
+ siteUrl = 'https://github.com/florent37/MaterialViewPager'
+ gitUrl = 'https://github.com/florent37/MaterialViewPager.git'
- // Add your description here
- name 'MaterialViewPager'
- description = ''
- url siteUrl
+ libraryVersion = rootProject.ext.libraryVersion
- // Set your license
- licenses {
- license {
- name 'The Apache Software License, Version 2.0'
- url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
- }
- }
- developers {
- developer {
- id 'florent37'
- name 'Florent Champigny'
- email 'champigny.florent@gmail.com'
- }
- }
- scm {
- connection gitUrl
- developerConnection gitUrl
- url siteUrl
-
- }
- }
- }
- }
-}
+ developerId = 'florent37'
+ developerName = 'Florent Champigny'
+ developerEmail = 'champigny.florent@gmail.com'
-task sourcesJar(type: Jar) {
- from android.sourceSets.main.java.srcDirs
- classifier = 'sources'
+ licenseName = 'The Apache Software License, Version 2.0'
+ licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ allLicenses = ["Apache-2.0"]
}
-artifacts {
- archives sourcesJar
+if (project.rootProject.file('local.properties').exists()) {
+ apply from: rootProject.file('gradle/install-v1.gradle')
+ apply from: rootProject.file('gradle/bintray-android-v1.gradle')
}
-
-Properties properties = new Properties()
-File f = new File("local.properties")
-if(f.exists()) {
- properties.load(project.rootProject.file('local.properties').newDataInputStream())
-}
-
-// https://github.com/bintray/gradle-bintray-plugin
-bintray {
-
- user = properties.getProperty("bintray.user")
- key = properties.getProperty("bintray.apikey")
-
- configurations = ['archives']
- pkg {
- repo = "maven"
- // it is the name that appears in bintray when logged
- name = "MaterialViewPager"
- websiteUrl = siteUrl
- vcsUrl = gitUrl
- licenses = ["Apache-2.0"]
- publish = true
- version {
- gpg {
- sign = true //Determines whether to GPG sign the files. The default is false
- passphrase = properties.getProperty("bintray.gpg.password") //Optional. The passphrase for GPG signing'
- }
-// mavenCentralSync {
-// sync = true //Optional (true by default). Determines whether to sync the version to Maven Central.
-// user = properties.getProperty("bintray.oss.user") //OSS user token
-// password = properties.getProperty("bintray.oss.password") //OSS user password
-// close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
-// }
- }
- }
-}
\ No newline at end of file
diff --git a/materialviewpager/materialviewpager.iml b/materialviewpager/materialviewpager.iml
index c2ae7bb9..a323cf64 100644
--- a/materialviewpager/materialviewpager.iml
+++ b/materialviewpager/materialviewpager.iml
@@ -1,5 +1,5 @@
-
+
@@ -12,10 +12,7 @@
-
-
- generateDebugAndroidTestSourcesgenerateDebugSources
@@ -29,7 +26,7 @@
-
+
@@ -37,13 +34,13 @@
-
+
-
+
@@ -51,6 +48,15 @@
+
+
+
+
+
+
+
+
+
@@ -58,6 +64,7 @@
+
@@ -65,47 +72,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
+
-
+
-
-
+
+
-
-
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPager.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPager.java
index 18d79ad8..ee24e609 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPager.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPager.java
@@ -20,7 +20,7 @@
import com.astuetz.PagerSlidingTabStrip;
import com.github.florent37.materialviewpager.header.HeaderDesign;
import com.github.florent37.materialviewpager.header.MaterialViewPagerImageHelper;
-import com.nineoldandroids.view.ViewHelper;
+import android.support.v4.view.ViewCompat;
/**
* Created by florentchampigny on 28/04/15.
@@ -32,26 +32,40 @@
*/
public class MaterialViewPager extends FrameLayout implements ViewPager.OnPageChangeListener {
+ /**
+ * Contains all references to MatervialViewPager's header views
+ */
+ protected MaterialViewPagerHeader materialViewPagerHeader;
+ //the child toolbar
+ protected Toolbar mToolbar;
+ //the child viewpager
+ protected ViewPager mViewPager;
+ //a view used to add placeholder color below the header
+ protected View headerBackground;
+ //a view used to add fading color over the headerBackgroundContainer
+ protected View toolbarLayoutBackground;
+ //Class containing the configuration of the MaterialViewPager
+ protected MaterialViewPagerSettings settings = new MaterialViewPagerSettings();
+ protected MaterialViewPager.Listener listener;
+ int lastPosition = -1;
/**
* the layout containing the header
* default : add @layout/material_view_pager_default_header
* with viewpager_header you can set your own layout
*/
private ViewGroup headerBackgroundContainer;
-
/**
* the layout containing tabs
* default : add @layout/material_view_pager_pagertitlestrip_standard
* with viewpager_pagerTitleStrip you can set your own layout
*/
private ViewGroup pagerTitleStripContainer;
-
-
/**
* the layout containing the viewpager, can be replaced to add your own implementation of viewpager
*/
private ViewGroup viewpagerContainer;
+ //region construct
/**
* the layout containing logo
* default : empty
@@ -59,30 +73,6 @@ public class MaterialViewPager extends FrameLayout implements ViewPager.OnPageCh
*/
private ViewGroup logoContainer;
- /**
- * Contains all references to MatervialViewPager's header views
- */
- protected MaterialViewPagerHeader materialViewPagerHeader;
-
- //the child toolbar
- protected Toolbar mToolbar;
-
- //the child viewpager
- protected ViewPager mViewPager;
-
- //a view used to add placeholder color below the header
- protected View headerBackground;
-
- //a view used to add fading color over the headerBackgroundContainer
- protected View toolbarLayoutBackground;
-
- //Class containing the configuration of the MaterialViewPager
- protected MaterialViewPagerSettings settings = new MaterialViewPagerSettings();
-
- protected MaterialViewPager.Listener listener;
-
- //region construct
-
public MaterialViewPager(Context context) {
super(context);
}
@@ -97,132 +87,41 @@ public MaterialViewPager(Context context, AttributeSet attrs, int defStyleAttr)
settings.handleAttributes(context, attrs);
}
+ //endregion
+
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public MaterialViewPager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
settings.handleAttributes(context, attrs);
}
- //endregion
-
-
- @Override
- protected void onDetachedFromWindow() {
- MaterialViewPagerHelper.unregister(getContext());
- listener = null;
- super.onDetachedFromWindow();
- }
-
@Override
- protected void onFinishInflate() {
- super.onFinishInflate();
-
- //add @layout/material_view_pager_layout as child, containing all the MaterialViewPager views
- addView(LayoutInflater.from(getContext()).inflate(R.layout.material_view_pager_layout, this, false));
-
- headerBackgroundContainer = (ViewGroup) findViewById(R.id.headerBackgroundContainer);
- pagerTitleStripContainer = (ViewGroup) findViewById(R.id.pagerTitleStripContainer);
- viewpagerContainer = (ViewGroup) findViewById(R.id.viewpager_layout);
- logoContainer = (ViewGroup) findViewById(R.id.logoContainer);
-
- mToolbar = (Toolbar) findViewById(R.id.toolbar);
- if (settings.disableToolbar)
- mToolbar.setVisibility(INVISIBLE);
-
- { //replace the viewpager ?
- int viewPagerLayoutId = settings.viewpagerId;
- if (viewPagerLayoutId != -1) {
- viewpagerContainer.removeAllViews();
- viewpagerContainer.addView(LayoutInflater.from(getContext()).inflate(viewPagerLayoutId, viewpagerContainer, false));
- }
- }
-
- mViewPager = (ViewPager) findViewById(R.id.materialviewpager_viewpager);
-
- mViewPager.addOnPageChangeListener(this);
-
- //inflate subviews defined in attributes
-
- {
- int headerId = settings.headerLayoutId;
- if (headerId == -1) {
- if (settings.animatedHeaderImage)
- headerId = R.layout.material_view_pager_moving_header;
- else
- headerId = R.layout.material_view_pager_imageview_header;
- }
- headerBackgroundContainer.addView(LayoutInflater.from(getContext()).inflate(headerId, headerBackgroundContainer, false));
- }
-
-
- if (isInEditMode()) { //preview titlestrip
- //add fake tabs on edit mode
- settings.pagerTitleStripId = R.layout.tools_material_view_pager_pagertitlestrip;
- }
- if (settings.pagerTitleStripId != -1) {
- pagerTitleStripContainer.addView(LayoutInflater.from(getContext()).inflate(settings.pagerTitleStripId, pagerTitleStripContainer, false));
- }
+ protected void onRestoreInstanceState(Parcelable state) {
+ SavedState ss = (SavedState) state;
+ super.onRestoreInstanceState(ss.getSuperState());
- if (settings.logoLayoutId != -1) {
- logoContainer.addView(LayoutInflater.from(getContext()).inflate(settings.logoLayoutId, logoContainer, false));
- if (settings.logoMarginTop != 0) {
- RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) logoContainer.getLayoutParams();
- layoutParams.setMargins(0, settings.logoMarginTop, 0, 0);
- logoContainer.setLayoutParams(layoutParams);
- }
+ this.settings = ss.settings;
+ if (headerBackground != null) {
+ headerBackground.setBackgroundColor(this.settings.color);
}
- headerBackground = findViewById(R.id.headerBackground);
- toolbarLayoutBackground = findViewById(R.id.toolbar_layout_background);
-
- initialiseHeights();
-
- //construct the materialViewPagerHeader with subviews
- if (!isInEditMode()) {
- materialViewPagerHeader = MaterialViewPagerHeader
- .withToolbar(mToolbar)
- .withToolbarLayoutBackground(toolbarLayoutBackground)
- .withPagerSlidingTabStrip(pagerTitleStripContainer)
- .withHeaderBackground(headerBackground)
- .withStatusBackground(findViewById(R.id.statusBackground))
- .withLogo(logoContainer);
-
- //and construct the MaterialViewPagerAnimator
- //attach it to the activity to enable MaterialViewPagerHeaderView.setMaterialHeight();
- MaterialViewPagerHelper.register(getContext(), new MaterialViewPagerAnimator(this));
- } else {
-
- //if in edit mode, add fake cardsviews
- View sample = LayoutInflater.from(getContext()).inflate(R.layout.tools_list_items, pagerTitleStripContainer, false);
-
- FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) sample.getLayoutParams();
- int marginTop = Math.round(Utils.dpToPx(settings.headerHeight + 10, getContext()));
- params.setMargins(0, marginTop, 0, 0);
- super.setLayoutParams(params);
+ MaterialViewPagerAnimator animator = MaterialViewPagerHelper.getAnimator(this.getContext());
- addView(sample);
- }
+ //-1*ss.yOffset restore to 0
+ animator.restoreScroll(-1 * ss.yOffset, ss.settings);
+ MaterialViewPagerHelper.register(getContext(), animator);
}
- private void initialiseHeights() {
- if (headerBackground != null) {
- headerBackground.setBackgroundColor(this.settings.color);
+ @Override
+ protected Parcelable onSaveInstanceState() {
+ Parcelable superState = super.onSaveInstanceState();
- ViewGroup.LayoutParams layoutParams = headerBackground.getLayoutParams();
- layoutParams.height = (int) Utils.dpToPx(this.settings.headerHeight + settings.headerAdditionalHeight, getContext());
- headerBackground.setLayoutParams(layoutParams);
- }
- if (pagerTitleStripContainer != null) {
- RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) pagerTitleStripContainer.getLayoutParams();
- int marginTop = (int) Utils.dpToPx(this.settings.headerHeight - 40, getContext());
- layoutParams.setMargins(0, marginTop, 0, 0);
- pagerTitleStripContainer.setLayoutParams(layoutParams);
- }
- if (toolbarLayoutBackground != null) {
- ViewGroup.LayoutParams layoutParams = toolbarLayoutBackground.getLayoutParams();
- layoutParams.height = (int) Utils.dpToPx(this.settings.headerHeight, getContext());
- toolbarLayoutBackground.setLayoutParams(layoutParams);
- }
+ SavedState ss = new SavedState(superState);
+ //end
+ ss.settings = this.settings;
+ ss.yOffset = MaterialViewPagerHelper.getAnimator(getContext()).lastYOffset;
+
+ return ss;
}
/**
@@ -247,18 +146,18 @@ public PagerSlidingTabStrip getPagerTitleStrip() {
/**
* Retrieve the displayed toolbar
+ *
+ * @return the displayed toolbar
*/
- public void setToolbar(Toolbar toolbar) {
- mToolbar = toolbar;
+ public Toolbar getToolbar() {
+ return mToolbar;
}
/**
* Retrieve the displayed toolbar
- *
- * @return the displayed toolbar
*/
- public Toolbar getToolbar() {
- return mToolbar;
+ public void setToolbar(Toolbar toolbar) {
+ mToolbar = toolbar;
}
/**
@@ -270,7 +169,7 @@ public void setImageUrl(String imageUrl, int fadeDuration) {
final ImageView headerBackgroundImage = (ImageView) findViewById(R.id.materialviewpager_imageHeader);
//if using MaterialViewPagerImageHeader
if (headerBackgroundImage != null) {
- ViewHelper.setAlpha(headerBackgroundImage, settings.headerAlpha);
+ ViewCompat.setAlpha(headerBackgroundImage, settings.headerAlpha);
MaterialViewPagerImageHelper.setImageUrl(headerBackgroundImage, imageUrl, fadeDuration);
setImageHeaderDarkLayerAlpha();
}
@@ -282,12 +181,12 @@ public void setImageUrl(String imageUrl, int fadeDuration) {
* may remove Picasso
*/
public void setImageUrl(String imageUrl, int fadeDuration, OnImageLoadListener imageLoadListener) {
- if (imageLoadListener != null)
+ if (imageLoadListener != null) {
MaterialViewPagerImageHelper.setImageLoadListener(imageLoadListener);
+ }
setImageUrl(imageUrl, fadeDuration);
}
-
/**
* change the header displayed image with a fade
* may remove Picasso
@@ -297,7 +196,7 @@ public void setImageDrawable(Drawable drawable, int fadeDuration) {
final ImageView headerBackgroundImage = (ImageView) findViewById(R.id.materialviewpager_imageHeader);
//if using MaterialViewPagerImageHeader
if (headerBackgroundImage != null) {
- ViewHelper.setAlpha(headerBackgroundImage, settings.headerAlpha);
+ ViewCompat.setAlpha(headerBackgroundImage, settings.headerAlpha);
MaterialViewPagerImageHelper.setImageDrawable(headerBackgroundImage, drawable, fadeDuration);
setImageHeaderDarkLayerAlpha();
}
@@ -312,7 +211,7 @@ public void setImageHeaderDarkLayerAlpha() {
//if using MaterialViewPagerImageHeader
if (headerImageDarkLayerView != null) {
headerImageDarkLayerView.setBackgroundColor(getResources().getColor(android.R.color.black));
- ViewHelper.setAlpha(headerImageDarkLayerView, settings.imageHeaderDarkLayerAlpha);
+ ViewCompat.setAlpha(headerImageDarkLayerView, settings.imageHeaderDarkLayerAlpha);
}
}
@@ -320,46 +219,15 @@ public void setImageHeaderDarkLayerAlpha() {
* Change the header color
*/
public void setColor(int color, int fadeDuration) {
- if (MaterialViewPagerHelper.getAnimator(getContext()) != null)
+ if (MaterialViewPagerHelper.getAnimator(getContext()) != null) {
MaterialViewPagerHelper.getAnimator(getContext()).setColor(color, fadeDuration * 2);
- }
-
- @Override
- protected Parcelable onSaveInstanceState() {
- Parcelable superState = super.onSaveInstanceState();
-
- SavedState ss = new SavedState(superState);
- //end
- ss.settings = this.settings;
- ss.yOffset = MaterialViewPagerHelper.getAnimator(getContext()).lastYOffset;
-
- return ss;
- }
-
- @Override
- protected void onRestoreInstanceState(Parcelable state) {
- SavedState ss = (SavedState) state;
- super.onRestoreInstanceState(ss.getSuperState());
-
- this.settings = ss.settings;
- if (headerBackground != null)
- headerBackground.setBackgroundColor(this.settings.color);
-
- MaterialViewPagerAnimator animator = MaterialViewPagerHelper.getAnimator(this.getContext());
-
- //-1*ss.yOffset restore to 0
- animator.restoreScroll(-1 * ss.yOffset, ss.settings);
- MaterialViewPagerHelper.register(getContext(), animator);
+ }
}
public ViewGroup getHeaderBackgroundContainer() {
return headerBackgroundContainer;
}
- //region ViewPagerOnPageListener
-
- int lastPosition = -1;
-
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
if (positionOffset >= 0.5) {
@@ -377,14 +245,18 @@ public void notifyHeaderChanged() {
onPageSelected(position);
}
+ //region ViewPagerOnPageListener
+
@Override
public void onPageSelected(int position) {
- if (position == lastPosition || listener == null)
+ if (position == lastPosition || listener == null) {
return;
+ }
HeaderDesign headerDesign = listener.getHeaderDesign(position);
- if (headerDesign == null)
+ if (headerDesign == null) {
return;
+ }
int fadeDuration = 400;
int color = headerDesign.getColor();
@@ -410,9 +282,152 @@ public void onPageScrollStateChanged(int state) {
}
}
+ public void setMaterialViewPagerListener(Listener listener) {
+ this.listener = listener;
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ MaterialViewPagerHelper.unregister(getContext());
+ listener = null;
+ super.onDetachedFromWindow();
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+
+ //add @layout/material_view_pager_layout as child, containing all the MaterialViewPager views
+ addView(LayoutInflater.from(getContext()).inflate(R.layout.material_view_pager_layout, this, false));
+
+ headerBackgroundContainer = (ViewGroup) findViewById(R.id.headerBackgroundContainer);
+ pagerTitleStripContainer = (ViewGroup) findViewById(R.id.pagerTitleStripContainer);
+ viewpagerContainer = (ViewGroup) findViewById(R.id.viewpager_layout);
+ logoContainer = (ViewGroup) findViewById(R.id.logoContainer);
+
+ mToolbar = (Toolbar) findViewById(R.id.toolbar);
+ if (settings.disableToolbar) {
+ mToolbar.setVisibility(INVISIBLE);
+ }
+
+ { //replace the viewpager ?
+ int viewPagerLayoutId = settings.viewpagerId;
+ if (viewPagerLayoutId != -1) {
+ viewpagerContainer.removeAllViews();
+ viewpagerContainer.addView(LayoutInflater.from(getContext()).inflate(viewPagerLayoutId, viewpagerContainer, false));
+ }
+ }
+
+ mViewPager = (ViewPager) findViewById(R.id.materialviewpager_viewpager);
+
+ mViewPager.addOnPageChangeListener(this);
+
+ //inflate subviews defined in attributes
+
+ {
+ int headerId = settings.headerLayoutId;
+ if (headerId == -1) {
+ if (settings.animatedHeaderImage) {
+ headerId = R.layout.material_view_pager_moving_header;
+ } else {
+ headerId = R.layout.material_view_pager_imageview_header;
+ }
+ }
+ headerBackgroundContainer.addView(LayoutInflater.from(getContext()).inflate(headerId, headerBackgroundContainer, false));
+ }
+
+ if (isInEditMode()) { //preview titlestrip
+ //add fake tabs on edit mode
+ settings.pagerTitleStripId = R.layout.tools_material_view_pager_pagertitlestrip;
+ }
+ if (settings.pagerTitleStripId != -1) {
+ pagerTitleStripContainer.addView(LayoutInflater.from(getContext()).inflate(settings.pagerTitleStripId, pagerTitleStripContainer, false));
+ }
+
+ if (settings.logoLayoutId != -1) {
+ logoContainer.addView(LayoutInflater.from(getContext()).inflate(settings.logoLayoutId, logoContainer, false));
+ if (settings.logoMarginTop != 0) {
+ RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) logoContainer.getLayoutParams();
+ layoutParams.setMargins(0, settings.logoMarginTop, 0, 0);
+ logoContainer.setLayoutParams(layoutParams);
+ }
+ }
+
+ headerBackground = findViewById(R.id.headerBackground);
+ toolbarLayoutBackground = findViewById(R.id.toolbar_layout_background);
+
+ initialiseHeights();
+
+ //construct the materialViewPagerHeader with subviews
+ if (!isInEditMode()) {
+ materialViewPagerHeader = MaterialViewPagerHeader
+ .withToolbar(mToolbar)
+ .withToolbarLayoutBackground(toolbarLayoutBackground)
+ .withPagerSlidingTabStrip(pagerTitleStripContainer)
+ .withHeaderBackground(headerBackground)
+ .withStatusBackground(findViewById(R.id.statusBackground))
+ .withLogo(logoContainer);
+
+ //and construct the MaterialViewPagerAnimator
+ //attach it to the activity to enable MaterialViewPagerHeaderView.setMaterialHeight();
+ MaterialViewPagerHelper.register(getContext(), new MaterialViewPagerAnimator(this));
+ } else {
+
+ //if in edit mode, add fake cardsviews
+ View sample = LayoutInflater.from(getContext()).inflate(R.layout.tools_list_items, pagerTitleStripContainer, false);
+
+ FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) sample.getLayoutParams();
+ int marginTop = Math.round(Utils.dpToPx(settings.headerHeight + 10, getContext()));
+ params.setMargins(0, marginTop, 0, 0);
+ super.setLayoutParams(params);
+
+ addView(sample);
+ }
+ }
+
//endregion
+ private void initialiseHeights() {
+ if (headerBackground != null) {
+ headerBackground.setBackgroundColor(this.settings.color);
+
+ ViewGroup.LayoutParams layoutParams = headerBackground.getLayoutParams();
+ layoutParams.height = (int) Utils.dpToPx(this.settings.headerHeight + settings.headerAdditionalHeight, getContext());
+ headerBackground.setLayoutParams(layoutParams);
+ }
+ if (pagerTitleStripContainer != null) {
+ RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) pagerTitleStripContainer.getLayoutParams();
+ int marginTop = (int) Utils.dpToPx(this.settings.headerHeight - 40, getContext());
+ layoutParams.setMargins(0, marginTop, 0, 0);
+ pagerTitleStripContainer.setLayoutParams(layoutParams);
+ }
+ if (toolbarLayoutBackground != null) {
+ ViewGroup.LayoutParams layoutParams = toolbarLayoutBackground.getLayoutParams();
+ layoutParams.height = (int) Utils.dpToPx(this.settings.headerHeight, getContext());
+ toolbarLayoutBackground.setLayoutParams(layoutParams);
+ }
+ }
+
+ public interface Listener {
+ HeaderDesign getHeaderDesign(int page);
+ }
+
+ public interface OnImageLoadListener {
+ void OnImageLoad(ImageView imageView, Bitmap bitmap);
+ }
+
static class SavedState extends BaseSavedState {
+ //required field that makes Parcelables from a Parcel
+ public static final Parcelable.Creator CREATOR =
+ new Parcelable.Creator() {
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in);
+ }
+
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
public MaterialViewPagerSettings settings;
public float yOffset;
@@ -432,30 +447,6 @@ public void writeToParcel(Parcel out, int flags) {
out.writeParcelable(this.settings, flags);
out.writeFloat(this.yOffset);
}
-
- //required field that makes Parcelables from a Parcel
- public static final Parcelable.Creator CREATOR =
- new Parcelable.Creator() {
- public SavedState createFromParcel(Parcel in) {
- return new SavedState(in);
- }
-
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- };
- }
-
- public void setMaterialViewPagerListener(Listener listener) {
- this.listener = listener;
- }
-
- public interface Listener {
- HeaderDesign getHeaderDesign(int page);
- }
-
- public interface OnImageLoadListener {
- void OnImageLoad(ImageView imageView, Bitmap bitmap);
}
}
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerAnimator.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerAnimator.java
index 8d8a4373..368746bb 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerAnimator.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerAnimator.java
@@ -18,7 +18,7 @@
import com.nineoldandroids.animation.ArgbEvaluator;
import com.nineoldandroids.animation.ObjectAnimator;
import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.ViewHelper;
+import android.support.v4.view.ViewCompat;
import java.util.ArrayList;
import java.util.HashMap;
@@ -36,65 +36,49 @@
/**
* Created by florentchampigny on 24/04/15.
- *
+ *
* Listen to Scrollable inside MaterialViewPager
* When notified scroll, dispatch the current scroll to other scrollable
- *
+ *
* Note : didn't want to translate the MaterialViewPager or intercept Scroll,
* so added a ViewPager with scrollables containing a transparent placeholder on top
- *
+ *
* When scroll, animate the MaterialViewPager Header (toolbar, logo, color ...)
*/
public class MaterialViewPagerAnimator {
private static final String TAG = MaterialViewPagerAnimator.class.getSimpleName();
-
- public static Boolean ENABLE_LOG = true;
-
- private Context context;
-
- //contains MaterialViewPager subviews references
- private MaterialViewPagerHeader mHeader;
-
//duration of translate header enter animation
private static final int ENTER_TOOLBAR_ANIMATION_DURATION = 600;
-
- //reference to the current MaterialViewPager
- protected MaterialViewPager materialViewPager;
-
+ public static Boolean ENABLE_LOG = true;
//final toolbar layout elevation (if attr viewpager_enableToolbarElevation = true)
public final float elevation;
-
//max scroll which will be dispatched for all scrollable
public final float scrollMax;
-
// equals scrollMax in DP (saved to avoir convert to dp anytime I use it)
public final float scrollMaxDp;
-
+ //reference to the current MaterialViewPager
+ protected MaterialViewPager materialViewPager;
protected float lastYOffset = -1; //the current yOffset
protected float lastPercent = 0; //the current Percent
-
//contains the attributes given to MaterialViewPager from layout
protected MaterialViewPagerSettings settings;
-
//list of all registered scrollers
protected List scrollViewList = new ArrayList<>();
-
//save all yOffsets of scrollables
protected HashMap yOffsets = new HashMap<>();
-
- //the last headerYOffset during scroll
- private float headerYOffset = Float.MAX_VALUE;
-
- //the tmp headerAnimator (not null if animating, else null)
- private Object headerAnimator;
-
boolean followScrollToolbarIsVisible = false;
float firstScrollValue = Float.MIN_VALUE;
boolean justToolbarAnimated = false;
-
//intial distance between pager & toolbat
float initialDistance = -1;
+ private Context context;
+ //contains MaterialViewPager subviews references
+ private MaterialViewPagerHeader mHeader;
+ //the last headerYOffset during scroll
+ private float headerYOffset = Float.MAX_VALUE;
+ //the tmp headerAnimator (not null if animating, else null)
+ private Object headerAnimator;
public MaterialViewPagerAnimator(MaterialViewPager materialViewPager) {
@@ -113,41 +97,6 @@ public MaterialViewPagerAnimator(MaterialViewPager materialViewPager) {
elevation = dpToPx(4, context);
}
- /**
- * When notified for scroll, dispatch it to all registered scrollables
- *
- * @param source
- * @param yOffset
- */
- protected void dispatchScrollOffset(Object source, float yOffset) {
- if (scrollViewList != null) {
- for (Object scroll : scrollViewList) {
-
- //do not re-scroll the source
- if (scroll != null && scroll != source) {
- setScrollOffset(scroll, yOffset);
- }
- }
- }
- }
-
- /**
- * When notified for scroll, dispatch it to all registered scrollables
- *
- * @param scroll
- * @param yOffset
- */
- private void setScrollOffset(Object scroll, float yOffset) {
- //do not re-scroll the source
- if (scroll != null && yOffset >= 0) {
-
- scrollTo(scroll, yOffset);
-
- //save the current yOffset of the scrollable on the yOffsets hashmap
- yOffsets.put(scroll, (int) yOffset);
- }
- }
-
/**
* Called when a scroller(RecyclerView/ListView,ScrollView,WebView) scrolled by the user
*
@@ -156,13 +105,14 @@ private void setScrollOffset(Object scroll, float yOffset) {
*/
public boolean onMaterialScrolled(Object source, float yOffset) {
- if(initialDistance == -1 || initialDistance == 0) {
+ if (initialDistance == -1 || initialDistance == 0) {
initialDistance = mHeader.mPagerSlidingTabStrip.getTop() - mHeader.toolbar.getBottom();
}
//only if yOffset changed
- if (yOffset == lastYOffset)
+ if (yOffset == lastYOffset) {
return false;
+ }
float scrollTop = -yOffset;
@@ -170,44 +120,50 @@ public boolean onMaterialScrolled(Object source, float yOffset) {
//parallax scroll of the Background ImageView (the KenBurnsView)
if (mHeader.headerBackground != null) {
- if (this.settings.parallaxHeaderFactor != 0)
- ViewHelper.setTranslationY(mHeader.headerBackground, scrollTop / this.settings.parallaxHeaderFactor);
+ if (this.settings.parallaxHeaderFactor != 0) {
+ ViewCompat.setTranslationY(mHeader.headerBackground, scrollTop / this.settings.parallaxHeaderFactor);
+ }
- if (ViewHelper.getY(mHeader.headerBackground) >= 0)
- ViewHelper.setY(mHeader.headerBackground, 0);
+ if (ViewCompat.getY(mHeader.headerBackground) >= 0) {
+ ViewCompat.setY(mHeader.headerBackground, 0);
+ }
}
-
}
- if (ENABLE_LOG)
+ if (ENABLE_LOG) {
Log.d("yOffset", "" + yOffset);
+ }
//dispatch the new offset to all registered scrollables
dispatchScrollOffset(source, minMax(0, yOffset, scrollMaxDp));
float percent = yOffset / scrollMax;
- if (ENABLE_LOG)
+ if (ENABLE_LOG) {
Log.d("percent1", "" + percent);
+ }
- if(percent != 0) {
+ if (percent != 0) {
//distance between pager & toolbar
- float newDistance = ViewHelper.getY(mHeader.mPagerSlidingTabStrip) - mHeader.toolbar.getBottom();
+ float newDistance = ViewCompat.getY(mHeader.mPagerSlidingTabStrip) - mHeader.toolbar.getBottom();
percent = 1 - newDistance / initialDistance;
- if (ENABLE_LOG)
+ if (ENABLE_LOG) {
Log.d("percent2", "" + percent);
+ }
}
- if(Float.isNaN(percent)) //fix for orientation change
+ if (Float.isNaN(percent)) //fix for orientation change
+ {
return false;
+ }
//fix quick scroll
- if(percent == 0 && headerAnimator != null) {
+ if (percent == 0 && headerAnimator != null) {
cancelHeaderAnimator();
- ViewHelper.setTranslationY(mHeader.toolbarLayout,0);
+ ViewCompat.setTranslationY(mHeader.toolbarLayout, 0);
}
percent = minMax(0, percent, 1);
@@ -218,9 +174,9 @@ public boolean onMaterialScrolled(Object source, float yOffset) {
setColorPercent(percent);
} else {
if (justToolbarAnimated) {
- if (toolbarJoinsTabs())
+ if (toolbarJoinsTabs()) {
setColorPercent(1);
- else if (lastPercent != percent) {
+ } else if (lastPercent != percent) {
animateColorPercent(0, 200);
}
}
@@ -229,36 +185,35 @@ else if (lastPercent != percent) {
lastPercent = percent; //save the percent
if (mHeader.mPagerSlidingTabStrip != null) { //move the viewpager indicator
- //float newY = ViewHelper.getY(mHeader.mPagerSlidingTabStrip) + scrollTop;
+ //float newY = ViewCompat.getY(mHeader.mPagerSlidingTabStrip) + scrollTop;
- if (ENABLE_LOG)
+ if (ENABLE_LOG) {
Log.d(TAG, "" + scrollTop);
-
+ }
//mHeader.mPagerSlidingTabStrip.setTranslationY(mHeader.getToolbar().getBottom()-mHeader.mPagerSlidingTabStrip.getY());
if (scrollTop <= 0) {
- ViewHelper.setTranslationY(mHeader.mPagerSlidingTabStrip, scrollTop);
- ViewHelper.setTranslationY(mHeader.toolbarLayoutBackground, scrollTop);
+ ViewCompat.setTranslationY(mHeader.mPagerSlidingTabStrip, scrollTop);
+ ViewCompat.setTranslationY(mHeader.toolbarLayoutBackground, scrollTop);
//when
- if (ViewHelper.getY(mHeader.mPagerSlidingTabStrip) < mHeader.getToolbar().getBottom()) {
+ if (ViewCompat.getY(mHeader.mPagerSlidingTabStrip) < mHeader.getToolbar().getBottom()) {
float ty = mHeader.getToolbar().getBottom() - mHeader.mPagerSlidingTabStrip.getTop();
- ViewHelper.setTranslationY(mHeader.mPagerSlidingTabStrip, ty);
- ViewHelper.setTranslationY(mHeader.toolbarLayoutBackground, ty);
+ ViewCompat.setTranslationY(mHeader.mPagerSlidingTabStrip, ty);
+ ViewCompat.setTranslationY(mHeader.toolbarLayoutBackground, ty);
}
}
}
-
if (mHeader.mLogo != null) { //move the header logo to toolbar
if (this.settings.hideLogoWithFade) {
- ViewHelper.setAlpha(mHeader.mLogo, 1 - percent);
- ViewHelper.setTranslationY(mHeader.mLogo, (mHeader.finalTitleY - mHeader.originalTitleY) * percent);
+ ViewCompat.setAlpha(mHeader.mLogo, 1 - percent);
+ ViewCompat.setTranslationY(mHeader.mLogo, (mHeader.finalTitleY - mHeader.originalTitleY) * percent);
} else {
- ViewHelper.setTranslationY(mHeader.mLogo, (mHeader.finalTitleY - mHeader.originalTitleY) * percent);
- ViewHelper.setTranslationX(mHeader.mLogo, (mHeader.finalTitleX - mHeader.originalTitleX) * percent);
+ ViewCompat.setTranslationY(mHeader.mLogo, (mHeader.finalTitleY - mHeader.originalTitleY) * percent);
+ ViewCompat.setTranslationX(mHeader.mLogo, (mHeader.finalTitleX - mHeader.originalTitleX) * percent);
float scale = (1 - percent) * (1 - mHeader.finalScale) + mHeader.finalScale;
setScale(scale, mHeader.mLogo);
@@ -285,38 +240,6 @@ else if (lastPercent != percent) {
return true;
}
- private void cancelHeaderAnimator(){
- if(headerAnimator != null) {
- if (headerAnimator instanceof ObjectAnimator)
- ((ObjectAnimator) headerAnimator).cancel();
- else if (headerAnimator instanceof android.animation.ObjectAnimator)
- ((android.animation.ObjectAnimator) headerAnimator).cancel();
- headerAnimator = null;
- }
- }
-
- private void scrollUp(float yOffset) {
- if (ENABLE_LOG)
- Log.d(TAG, "scrollUp");
-
- followScrollToolbarLayout(yOffset);
- }
-
- private void scrollDown(float yOffset) {
- if (ENABLE_LOG)
- Log.d(TAG, "scrollDown");
- if (yOffset > mHeader.toolbarLayout.getHeight() * 1.5f) {
- animateEnterToolbarLayout(yOffset);
- } else {
- if (headerAnimator != null) {
- followScrollToolbarIsVisible = true;
- } else {
- headerYOffset = Float.MAX_VALUE;
- followScrollToolbarLayout(yOffset);
- }
- }
- }
-
/**
* Change the color of the statusbackground, toolbar, toolbarlayout and pagertitlestrip
* With a color transition animation
@@ -363,111 +286,34 @@ public void setColorPercent(float percent) {
// toolbar & viewpager indicator & statusBaground
setBackgroundColor(
- colorWithAlpha(this.settings.color, percent),
- mHeader.statusBackground
+ colorWithAlpha(this.settings.color, percent),
+ mHeader.statusBackground
);
if (percent >= 1) {
setBackgroundColor(
- colorWithAlpha(this.settings.color, percent),
- mHeader.toolbar,
- mHeader.toolbarLayoutBackground,
- mHeader.mPagerSlidingTabStrip
+ colorWithAlpha(this.settings.color, percent),
+ mHeader.toolbar,
+ mHeader.toolbarLayoutBackground,
+ mHeader.mPagerSlidingTabStrip
);
} else {
setBackgroundColor(
- colorWithAlpha(this.settings.color, 0),
- mHeader.toolbar,
- mHeader.toolbarLayoutBackground,
- mHeader.mPagerSlidingTabStrip
+ colorWithAlpha(this.settings.color, 0),
+ mHeader.toolbar,
+ mHeader.toolbarLayoutBackground,
+ mHeader.mPagerSlidingTabStrip
);
}
- if (this.settings.enableToolbarElevation && toolbarJoinsTabs())
+ if (this.settings.enableToolbarElevation && toolbarJoinsTabs()) {
setElevation(
- (percent == 1) ? elevation : 0,
- mHeader.toolbar,
- mHeader.toolbarLayoutBackground,
- mHeader.mPagerSlidingTabStrip,
- mHeader.mLogo
+ (percent == 1) ? elevation : 0,
+ mHeader.toolbar,
+ mHeader.toolbarLayoutBackground,
+ mHeader.mPagerSlidingTabStrip,
+ mHeader.mLogo
);
- }
-
- private boolean toolbarJoinsTabs() {
- return (mHeader.toolbar.getBottom() == mHeader.mPagerSlidingTabStrip.getTop() + ViewHelper.getTranslationY(mHeader.mPagerSlidingTabStrip));
- }
-
- /**
- * move the toolbarlayout (containing toolbar & tabs)
- * following the current scroll
- */
- private void followScrollToolbarLayout(float yOffset) {
- if (mHeader.toolbar.getBottom() == 0)
- return;
-
- if (toolbarJoinsTabs()) {
- if (firstScrollValue == Float.MIN_VALUE)
- firstScrollValue = yOffset;
-
- float translationY = firstScrollValue - yOffset;
-
- if(translationY > 0) {
- translationY = 0;
- }
-
- if (ENABLE_LOG)
- Log.d(TAG, "translationY " + translationY);
-
- ViewHelper.setTranslationY(mHeader.toolbarLayout, translationY);
- } else {
- ViewHelper.setTranslationY(mHeader.toolbarLayout, 0);
- justToolbarAnimated = false;
- }
-
- followScrollToolbarIsVisible = (ViewHelper.getY(mHeader.toolbarLayout) >= 0);
- }
-
- /**
- * Animate enter toolbarlayout
- *
- * @param yOffset
- */
- private void animateEnterToolbarLayout(float yOffset) {
- if (!followScrollToolbarIsVisible && headerAnimator != null) {
- if (headerAnimator instanceof ObjectAnimator)
- ((ObjectAnimator) headerAnimator).cancel();
- else if (headerAnimator instanceof android.animation.ObjectAnimator)
- ((android.animation.ObjectAnimator) headerAnimator).cancel();
- headerAnimator = null;
- }
-
- if (headerAnimator == null) {
- if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1) {
- headerAnimator = android.animation.ObjectAnimator.ofFloat(mHeader.toolbarLayout, "translationY", 0).setDuration(ENTER_TOOLBAR_ANIMATION_DURATION);
- ((android.animation.ObjectAnimator) headerAnimator).addListener(new android.animation.AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(android.animation.Animator animation) {
- super.onAnimationEnd(animation);
- followScrollToolbarIsVisible = true;
- firstScrollValue = Float.MIN_VALUE;
- justToolbarAnimated = true;
- }
- });
- ((android.animation.ObjectAnimator) headerAnimator).start();
- } else {
- headerAnimator = ObjectAnimator.ofFloat(mHeader.toolbarLayout, "translationY", 0).setDuration(ENTER_TOOLBAR_ANIMATION_DURATION);
- ((ObjectAnimator) headerAnimator).addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- super.onAnimationEnd(animation);
- followScrollToolbarIsVisible = true;
- firstScrollValue = Float.MIN_VALUE;
- justToolbarAnimated = true;
- }
- });
- ((ObjectAnimator) headerAnimator).start();
- }
- headerYOffset = yOffset;
}
}
@@ -475,15 +321,6 @@ public int getHeaderHeight() {
return this.settings.headerHeight;
}
- protected boolean isNewYOffset(int yOffset) {
- if (lastYOffset == -1)
- return true;
- else
- return yOffset != lastYOffset;
- }
-
- //region register scrollables
-
/**
* Register a RecyclerView to the current MaterialViewPagerAnimator
* Listen to RecyclerView.OnScrollListener so give to $[onScrollListener] your RecyclerView.OnScrollListener if you already use one
@@ -493,7 +330,7 @@ protected boolean isNewYOffset(int yOffset) {
* @param onScrollListener use it if you want to get a callback of the RecyclerView
*/
public void registerRecyclerView(final RecyclerView recyclerView, final RecyclerView.OnScrollListener onScrollListener) {
- if (recyclerView != null) {
+ if (recyclerView != null && !scrollViewList.contains(recyclerView)) {
scrollViewList.add(recyclerView); //add to the scrollable list
yOffsets.put(recyclerView, recyclerView.getScrollY()); //save the initial recyclerview's yOffset (0) into hashmap
//only necessary for recyclerview
@@ -506,16 +343,18 @@ public void registerRecyclerView(final RecyclerView recyclerView, final Recycler
@Override
public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
super.onScrollStateChanged(recyclerView, newState);
- if (onScrollListener != null)
+ if (onScrollListener != null) {
onScrollListener.onScrollStateChanged(recyclerView, newState);
+ }
}
@Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
super.onScrolled(recyclerView, dx, dy);
- if (onScrollListener != null)
+ if (onScrollListener != null) {
onScrollListener.onScrolled(recyclerView, dx, dy);
+ }
int yOffset = yOffsets.get(recyclerView);
@@ -529,8 +368,9 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
}
//only if yOffset changed
- if (isNewYOffset(yOffset))
+ if (isNewYOffset(yOffset)) {
onMaterialScrolled(recyclerView, yOffset);
+ }
}
});
@@ -554,16 +394,18 @@ public void run() {
public void registerScrollView(final ObservableScrollView scrollView, final ObservableScrollViewCallbacks observableScrollViewCallbacks) {
if (scrollView != null) {
scrollViewList.add(scrollView); //add to the scrollable list
- if (scrollView.getParent() != null && scrollView.getParent().getParent() != null && scrollView.getParent().getParent() instanceof ViewGroup)
+ if (scrollView.getParent() != null && scrollView.getParent().getParent() != null && scrollView.getParent().getParent() instanceof ViewGroup) {
scrollView.setTouchInterceptionViewGroup((ViewGroup) scrollView.getParent().getParent());
+ }
scrollView.setScrollViewCallbacks(new ObservableScrollViewCallbacks() {
boolean firstZeroPassed;
@Override
public void onScrollChanged(int yOffset, boolean b, boolean b2) {
- if (observableScrollViewCallbacks != null)
+ if (observableScrollViewCallbacks != null) {
observableScrollViewCallbacks.onScrollChanged(yOffset, b, b2);
+ }
//first time you get 0, don't share it to others scrolls
if (yOffset == 0 && !firstZeroPassed) {
@@ -572,20 +414,23 @@ public void onScrollChanged(int yOffset, boolean b, boolean b2) {
}
//only if yOffset changed
- if (isNewYOffset(yOffset))
+ if (isNewYOffset(yOffset)) {
onMaterialScrolled(scrollView, yOffset);
+ }
}
@Override
public void onDownMotionEvent() {
- if (observableScrollViewCallbacks != null)
+ if (observableScrollViewCallbacks != null) {
observableScrollViewCallbacks.onDownMotionEvent();
+ }
}
@Override
public void onUpOrCancelMotionEvent(ScrollState scrollState) {
- if (observableScrollViewCallbacks != null)
+ if (observableScrollViewCallbacks != null) {
observableScrollViewCallbacks.onUpOrCancelMotionEvent(scrollState);
+ }
}
});
@@ -608,29 +453,34 @@ public void run() {
*/
public void registerWebView(final ObservableWebView webView, final ObservableScrollViewCallbacks observableScrollViewCallbacks) {
if (webView != null) {
- if (scrollViewList.isEmpty())
+ if (scrollViewList.isEmpty()) {
onMaterialScrolled(webView, webView.getCurrentScrollY());
+ }
scrollViewList.add(webView); //add to the scrollable list
webView.setScrollViewCallbacks(new ObservableScrollViewCallbacks() {
@Override
public void onScrollChanged(int yOffset, boolean b, boolean b2) {
- if (observableScrollViewCallbacks != null)
+ if (observableScrollViewCallbacks != null) {
observableScrollViewCallbacks.onScrollChanged(yOffset, b, b2);
+ }
- if (isNewYOffset(yOffset))
+ if (isNewYOffset(yOffset)) {
onMaterialScrolled(webView, yOffset);
+ }
}
@Override
public void onDownMotionEvent() {
- if (observableScrollViewCallbacks != null)
+ if (observableScrollViewCallbacks != null) {
observableScrollViewCallbacks.onDownMotionEvent();
+ }
}
@Override
public void onUpOrCancelMotionEvent(ScrollState scrollState) {
- if (observableScrollViewCallbacks != null)
+ if (observableScrollViewCallbacks != null) {
observableScrollViewCallbacks.onUpOrCancelMotionEvent(scrollState);
+ }
}
});
@@ -638,18 +488,16 @@ public void onUpOrCancelMotionEvent(ScrollState scrollState) {
}
}
- //endregion
-
public void restoreScroll(final float scroll, final MaterialViewPagerSettings settings) {
//try to scroll up, on a looper to wait until restored
new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
@Override
public void run() {
- if(!onMaterialScrolled(null, scroll)){
- restoreScroll(scroll,settings);
+ if (!onMaterialScrolled(null, scroll)) {
+ restoreScroll(scroll, settings);
}
}
- },100);
+ }, 100);
}
@@ -662,4 +510,168 @@ public void onViewPagerPageChanged() {
onMaterialScrolled(visibleView, 0);
}
}
+
+ /**
+ * When notified for scroll, dispatch it to all registered scrollables
+ *
+ * @param source
+ * @param yOffset
+ */
+ protected void dispatchScrollOffset(Object source, float yOffset) {
+ if (scrollViewList != null) {
+ for (Object scroll : scrollViewList) {
+
+ //do not re-scroll the source
+ if (scroll != null && scroll != source) {
+ setScrollOffset(scroll, yOffset);
+ }
+ }
+ }
+ }
+
+ protected boolean isNewYOffset(int yOffset) {
+ if (lastYOffset == -1) {
+ return true;
+ } else {
+ return yOffset != lastYOffset;
+ }
+ }
+
+ /**
+ * When notified for scroll, dispatch it to all registered scrollables
+ *
+ * @param scroll
+ * @param yOffset
+ */
+ private void setScrollOffset(Object scroll, float yOffset) {
+ //do not re-scroll the source
+ if (scroll != null && yOffset >= 0) {
+
+ scrollTo(scroll, yOffset);
+
+ //save the current yOffset of the scrollable on the yOffsets hashmap
+ yOffsets.put(scroll, (int) yOffset);
+ }
+ }
+
+ private void cancelHeaderAnimator() {
+ if (headerAnimator != null) {
+ if (headerAnimator instanceof ObjectAnimator) {
+ ((ObjectAnimator) headerAnimator).cancel();
+ } else if (headerAnimator instanceof android.animation.ObjectAnimator) {
+ ((android.animation.ObjectAnimator) headerAnimator).cancel();
+ }
+ headerAnimator = null;
+ }
+ }
+
+ //region register scrollables
+
+ private void scrollUp(float yOffset) {
+ if (ENABLE_LOG) {
+ Log.d(TAG, "scrollUp");
+ }
+
+ followScrollToolbarLayout(yOffset);
+ }
+
+ private void scrollDown(float yOffset) {
+ if (ENABLE_LOG) {
+ Log.d(TAG, "scrollDown");
+ }
+ if (yOffset > mHeader.toolbarLayout.getHeight() * 1.5f) {
+ animateEnterToolbarLayout(yOffset);
+ } else {
+ if (headerAnimator != null) {
+ followScrollToolbarIsVisible = true;
+ } else {
+ headerYOffset = Float.MAX_VALUE;
+ followScrollToolbarLayout(yOffset);
+ }
+ }
+ }
+
+ private boolean toolbarJoinsTabs() {
+ return (mHeader.toolbar.getBottom() == mHeader.mPagerSlidingTabStrip.getTop() + ViewCompat.getTranslationY(mHeader.mPagerSlidingTabStrip));
+ }
+
+ //endregion
+
+ /**
+ * move the toolbarlayout (containing toolbar & tabs)
+ * following the current scroll
+ */
+ private void followScrollToolbarLayout(float yOffset) {
+ if (mHeader.toolbar.getBottom() == 0) {
+ return;
+ }
+
+ if (toolbarJoinsTabs()) {
+ if (firstScrollValue == Float.MIN_VALUE) {
+ firstScrollValue = yOffset;
+ }
+
+ float translationY = firstScrollValue - yOffset;
+
+ if (translationY > 0) {
+ translationY = 0;
+ }
+
+ if (ENABLE_LOG) {
+ Log.d(TAG, "translationY " + translationY);
+ }
+
+ ViewCompat.setTranslationY(mHeader.toolbarLayout, translationY);
+ } else {
+ ViewCompat.setTranslationY(mHeader.toolbarLayout, 0);
+ justToolbarAnimated = false;
+ }
+
+ followScrollToolbarIsVisible = (ViewCompat.getY(mHeader.toolbarLayout) >= 0);
+ }
+
+ /**
+ * Animate enter toolbarlayout
+ *
+ * @param yOffset
+ */
+ private void animateEnterToolbarLayout(float yOffset) {
+ if (!followScrollToolbarIsVisible && headerAnimator != null) {
+ if (headerAnimator instanceof ObjectAnimator) {
+ ((ObjectAnimator) headerAnimator).cancel();
+ } else if (headerAnimator instanceof android.animation.ObjectAnimator) {
+ ((android.animation.ObjectAnimator) headerAnimator).cancel();
+ }
+ headerAnimator = null;
+ }
+
+ if (headerAnimator == null) {
+ if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1) {
+ headerAnimator = android.animation.ObjectAnimator.ofFloat(mHeader.toolbarLayout, "translationY", 0).setDuration(ENTER_TOOLBAR_ANIMATION_DURATION);
+ ((android.animation.ObjectAnimator) headerAnimator).addListener(new android.animation.AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(android.animation.Animator animation) {
+ super.onAnimationEnd(animation);
+ followScrollToolbarIsVisible = true;
+ firstScrollValue = Float.MIN_VALUE;
+ justToolbarAnimated = true;
+ }
+ });
+ ((android.animation.ObjectAnimator) headerAnimator).start();
+ } else {
+ headerAnimator = ObjectAnimator.ofFloat(mHeader.toolbarLayout, "translationY", 0).setDuration(ENTER_TOOLBAR_ANIMATION_DURATION);
+ ((ObjectAnimator) headerAnimator).addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ super.onAnimationEnd(animation);
+ followScrollToolbarIsVisible = true;
+ firstScrollValue = Float.MIN_VALUE;
+ justToolbarAnimated = true;
+ }
+ });
+ ((ObjectAnimator) headerAnimator).start();
+ }
+ headerYOffset = yOffset;
+ }
+ }
}
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerHeader.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerHeader.java
index 67a9966a..2f2b402c 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerHeader.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerHeader.java
@@ -1,11 +1,12 @@
package com.github.florent37.materialviewpager;
import android.content.Context;
+import android.support.v4.view.ViewCompat;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.view.ViewTreeObserver;
-import com.nineoldandroids.view.ViewHelper;
+import android.support.v4.view.ViewCompat;
import static com.github.florent37.materialviewpager.Utils.dpToPx;
@@ -101,11 +102,11 @@ public MaterialViewPagerHeader withLogo(View logo) {
@Override
public boolean onPreDraw() {
//rotation fix, if not set, originalTitleY = Na
- ViewHelper.setTranslationY(mLogo,0);
- ViewHelper.setTranslationX(mLogo, 0);
+ ViewCompat.setTranslationY(mLogo,0);
+ ViewCompat.setTranslationX(mLogo, 0);
- originalTitleY = ViewHelper.getY(mLogo);
- originalTitleX = ViewHelper.getX(mLogo);
+ originalTitleY = ViewCompat.getY(mLogo);
+ originalTitleX = ViewCompat.getX(mLogo);
originalTitleHeight = mLogo.getHeight();
finalTitleHeight = dpToPx(21, context);
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerHelper.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerHelper.java
index 2670c9be..fd307bde 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerHelper.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerHelper.java
@@ -3,6 +3,7 @@
import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
+import android.support.v4.view.ViewCompat;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.webkit.WebSettings;
@@ -11,13 +12,12 @@
import com.github.ksoichiro.android.observablescrollview.ObservableScrollView;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
import com.github.ksoichiro.android.observablescrollview.ObservableWebView;
-import com.nineoldandroids.animation.ObjectAnimator;
import java.util.concurrent.ConcurrentHashMap;
/**
* Created by florentchampigny on 25/04/15.
- *
+ *
* MaterialViewPagerHelper attach a MaterialViewPagerAnimator to an activity
* You can use MaterialViewPagerHelper to retrieve MaterialViewPagerAnimator from context
* Or register a scrollable to the current activity's MaterialViewPagerAnimator
@@ -37,8 +37,9 @@ public static void register(Context context, MaterialViewPagerAnimator animator)
}
public static void unregister(Context context) {
- if (context != null)
+ if (context != null) {
hashMap.remove(context);
+ }
}
/**
@@ -46,13 +47,13 @@ public static void unregister(Context context) {
* Listen to RecyclerView.OnScrollListener so give to $[onScrollListener] your RecyclerView.OnScrollListener if you already use one
* For loadmore or anything else
*
- * @param activity current context
+ * @param context current context
* @param recyclerView the scrollable
* @param onScrollListener use it if you want to get a callback of the RecyclerView
*/
- public static void registerRecyclerView(Activity activity, RecyclerView recyclerView, RecyclerView.OnScrollListener onScrollListener) {
- if (activity != null && hashMap.containsKey(activity)) {
- MaterialViewPagerAnimator animator = hashMap.get(activity);
+ public static void registerRecyclerView(Context context, RecyclerView recyclerView, RecyclerView.OnScrollListener onScrollListener) {
+ if (context != null && hashMap.containsKey(context)) {
+ MaterialViewPagerAnimator animator = hashMap.get(context);
if (animator != null) {
animator.registerRecyclerView(recyclerView, onScrollListener);
}
@@ -105,14 +106,6 @@ public static MaterialViewPagerAnimator getAnimator(Context context) {
return hashMap.get(context);
}
- private static void webViewLoadJS(WebView webView, String js){
- if (android.os.Build.VERSION.SDK_INT >= 19) {
- webView.evaluateJavascript(js, null);
- }else{
- webView.loadUrl("javascript: " + js);
- }
- }
-
/**
* Have to be called from WebView.WebViewClient.onPageFinished
* ex : mWebView.setWebViewClient(new WebViewClient() { onPageFinished(WebView view, String url) { [HERE] }});
@@ -149,17 +142,19 @@ public static void injectHeader(final WebView webView, boolean withAnimation) {
{
final String js = "document.body.style.backround-color= white";
- webViewLoadJS(webView,js);
+ webViewLoadJS(webView, js);
}
- if (withAnimation)
+ if (withAnimation) {
webView.postDelayed(new Runnable() {
@Override
public void run() {
webView.setVisibility(View.VISIBLE);
- ObjectAnimator.ofFloat(webView, "alpha", 0, 1).start();
+ ViewCompat.setAlpha(webView, 0f);
+ ViewCompat.animate(webView).withLayer().alpha(1);
}
}, 400);
+ }
}
}
}
@@ -173,4 +168,12 @@ public static void preLoadInjectHeader(WebView mWebView) {
mWebView.setVisibility(View.INVISIBLE);
}
+ private static void webViewLoadJS(WebView webView, String js) {
+ if (android.os.Build.VERSION.SDK_INT >= 19) {
+ webView.evaluateJavascript(js, null);
+ } else {
+ webView.loadUrl("javascript: " + js);
+ }
+ }
+
}
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerSettings.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerSettings.java
index a8786f9f..cec68103 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerSettings.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/MaterialViewPagerSettings.java
@@ -10,7 +10,7 @@
/**
* Created by florentchampigny on 29/04/15.
- *
+ *
* Save attributes given to MaterialViewPager from layout
*/
public class MaterialViewPagerSettings implements Parcelable {
@@ -18,23 +18,27 @@ public class MaterialViewPagerSettings implements Parcelable {
//attributes are protected and can be used by class from the same package
//com.github.florent37.materialviewpager
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public MaterialViewPagerSettings createFromParcel(Parcel source) {
+ return new MaterialViewPagerSettings(source);
+ }
+
+ public MaterialViewPagerSettings[] newArray(int size) {
+ return new MaterialViewPagerSettings[size];
+ }
+ };
protected int headerLayoutId;
protected int pagerTitleStripId;
protected int viewpagerId;
-
protected int logoLayoutId;
protected int logoMarginTop;
-
protected int headerAdditionalHeight;
-
protected int headerHeight;
protected int headerHeightPx;
protected int color;
-
protected float headerAlpha;
protected float parallaxHeaderFactor;
protected float imageHeaderDarkLayerAlpha;
-
protected boolean hideToolbarAndTitle;
protected boolean hideLogoWithFade;
protected boolean enableToolbarElevation;
@@ -43,12 +47,60 @@ public class MaterialViewPagerSettings implements Parcelable {
protected boolean animatedHeaderImage;
protected boolean disableToolbar;
+ //region parcelable
+
+ public MaterialViewPagerSettings() {
+ }
+
+ private MaterialViewPagerSettings(Parcel in) {
+ this.headerLayoutId = in.readInt();
+ this.pagerTitleStripId = in.readInt();
+ this.viewpagerId = in.readInt();
+ this.logoLayoutId = in.readInt();
+ this.logoMarginTop = in.readInt();
+ this.headerAdditionalHeight = in.readInt();
+ this.headerHeight = in.readInt();
+ this.headerHeightPx = in.readInt();
+ this.color = in.readInt();
+ this.headerAlpha = in.readFloat();
+ this.imageHeaderDarkLayerAlpha = in.readFloat();
+ this.parallaxHeaderFactor = in.readFloat();
+ this.hideToolbarAndTitle = in.readByte() != 0;
+ this.hideLogoWithFade = in.readByte() != 0;
+ this.enableToolbarElevation = in.readByte() != 0;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(this.headerLayoutId);
+ dest.writeInt(this.pagerTitleStripId);
+ dest.writeInt(this.viewpagerId);
+ dest.writeInt(this.logoLayoutId);
+ dest.writeInt(this.logoMarginTop);
+ dest.writeInt(this.headerAdditionalHeight);
+ dest.writeInt(this.headerHeight);
+ dest.writeInt(this.headerHeightPx);
+ dest.writeInt(this.color);
+ dest.writeFloat(this.headerAlpha);
+ dest.writeFloat(this.imageHeaderDarkLayerAlpha);
+ dest.writeFloat(this.parallaxHeaderFactor);
+ dest.writeByte(hideToolbarAndTitle ? (byte) 1 : (byte) 0);
+ dest.writeByte(hideLogoWithFade ? (byte) 1 : (byte) 0);
+ dest.writeByte(enableToolbarElevation ? (byte) 1 : (byte) 0);
+ }
+
/**
* Retrieve attributes from the MaterialViewPager
+ *
* @param context
* @param attrs
*/
- protected void handleAttributes(Context context, AttributeSet attrs){
+ protected void handleAttributes(Context context, AttributeSet attrs) {
try {
TypedArray styledAttrs = context.obtainStyledAttributes(attrs, R.styleable.MaterialViewPager);
{
@@ -56,8 +108,9 @@ protected void handleAttributes(Context context, AttributeSet attrs){
}
{
pagerTitleStripId = styledAttrs.getResourceId(R.styleable.MaterialViewPager_viewpager_pagerTitleStrip, -1);
- if(pagerTitleStripId == -1)
+ if (pagerTitleStripId == -1) {
pagerTitleStripId = R.layout.material_view_pager_pagertitlestrip_standard;
+ }
}
{
viewpagerId = styledAttrs.getResourceId(R.styleable.MaterialViewPager_viewpager_viewpager, -1);
@@ -111,62 +164,5 @@ protected void handleAttributes(Context context, AttributeSet attrs){
}
}
- //region parcelable
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(this.headerLayoutId);
- dest.writeInt(this.pagerTitleStripId);
- dest.writeInt(this.viewpagerId);
- dest.writeInt(this.logoLayoutId);
- dest.writeInt(this.logoMarginTop);
- dest.writeInt(this.headerAdditionalHeight);
- dest.writeInt(this.headerHeight);
- dest.writeInt(this.headerHeightPx);
- dest.writeInt(this.color);
- dest.writeFloat(this.headerAlpha);
- dest.writeFloat(this.imageHeaderDarkLayerAlpha);
- dest.writeFloat(this.parallaxHeaderFactor);
- dest.writeByte(hideToolbarAndTitle ? (byte) 1 : (byte) 0);
- dest.writeByte(hideLogoWithFade ? (byte) 1 : (byte) 0);
- dest.writeByte(enableToolbarElevation ? (byte) 1 : (byte) 0);
- }
-
- public MaterialViewPagerSettings() {
- }
-
- private MaterialViewPagerSettings(Parcel in) {
- this.headerLayoutId = in.readInt();
- this.pagerTitleStripId = in.readInt();
- this.viewpagerId = in.readInt();
- this.logoLayoutId = in.readInt();
- this.logoMarginTop = in.readInt();
- this.headerAdditionalHeight = in.readInt();
- this.headerHeight = in.readInt();
- this.headerHeightPx = in.readInt();
- this.color = in.readInt();
- this.headerAlpha = in.readFloat();
- this.imageHeaderDarkLayerAlpha = in.readFloat();
- this.parallaxHeaderFactor = in.readFloat();
- this.hideToolbarAndTitle = in.readByte() != 0;
- this.hideLogoWithFade = in.readByte() != 0;
- this.enableToolbarElevation = in.readByte() != 0;
- }
-
- public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
- public MaterialViewPagerSettings createFromParcel(Parcel source) {
- return new MaterialViewPagerSettings(source);
- }
-
- public MaterialViewPagerSettings[] newArray(int size) {
- return new MaterialViewPagerSettings[size];
- }
- };
-
//endregion
}
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/Utils.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/Utils.java
index 117b81bd..12c9da0a 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/Utils.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/Utils.java
@@ -12,7 +12,7 @@
import android.widget.ListView;
import android.widget.ScrollView;
-import com.nineoldandroids.view.ViewHelper;
+import android.support.v4.view.ViewCompat;
import java.util.List;
@@ -53,7 +53,6 @@ public static float minMax(float min, float value, float max) {
return value;
}
-
/**
* modify the scale of multiples views
*
@@ -63,8 +62,8 @@ public static float minMax(float min, float value, float max) {
public static void setScale(float scale, View... views) {
for (View view : views) {
if (view != null) {
- ViewHelper.setScaleX(view, scale);
- ViewHelper.setScaleY(view, scale);
+ ViewCompat.setScaleX(view, scale);
+ ViewCompat.setScaleY(view, scale);
}
}
}
@@ -77,8 +76,9 @@ public static void setScale(float scale, View... views) {
*/
public static void setElevation(float elevation, View... views) {
for (View view : views) {
- if (view != null)
+ if (view != null) {
ViewCompat.setElevation(view, elevation);
+ }
}
}
@@ -90,29 +90,30 @@ public static void setElevation(float elevation, View... views) {
*/
public static void setBackgroundColor(int color, View... views) {
for (View view : views) {
- if (view != null)
+ if (view != null) {
view.setBackgroundColor(color);
+ }
}
}
public static boolean canScroll(View view) {
- if(view instanceof ScrollView) {
- ScrollView scrollView = (ScrollView)view;
+ if (view instanceof ScrollView) {
+ ScrollView scrollView = (ScrollView) view;
View child = scrollView.getChildAt(0);
if (child != null) {
int childHeight = child.getHeight();
return scrollView.getHeight() < childHeight + scrollView.getPaddingTop() + scrollView.getPaddingBottom();
}
return false;
- }else if (view instanceof RecyclerView) {
- RecyclerView recyclerView = (RecyclerView)view;
+ } else if (view instanceof RecyclerView) {
+ RecyclerView recyclerView = (RecyclerView) view;
int yOffset = recyclerView.computeVerticalScrollOffset();
return yOffset != 0;
}
return true;
}
- public static void scrollTo(Object scroll, float yOffset){
+ public static void scrollTo(Object scroll, float yOffset) {
if (scroll instanceof RecyclerView) {
//RecyclerView.scrollTo : UnsupportedOperationException
//Moved to the RecyclerView.LayoutManager.scrollToPositionWithOffset
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/adapter/RecyclerViewMaterialAdapter.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/adapter/RecyclerViewMaterialAdapter.java
index b9db9da9..325475bb 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/adapter/RecyclerViewMaterialAdapter.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/adapter/RecyclerViewMaterialAdapter.java
@@ -10,7 +10,10 @@
/**
* Created by florentchampigny on 24/04/15.
* A RecyclerView.Adapter which inject a header to the actual RecyclerView.Adapter
+ *
+ * Please use now MaterialViewPagerDecorator, or with Stagged Layout Manager
*/
+@Deprecated
public class RecyclerViewMaterialAdapter extends RecyclerView.Adapter {
//the constants value of the header view
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerHEaderDecorator.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerHEaderDecorator.java
new file mode 100644
index 00000000..a3a0a913
--- /dev/null
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerHEaderDecorator.java
@@ -0,0 +1,47 @@
+package com.github.florent37.materialviewpager.header;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.StaggeredGridLayoutManager;
+import android.view.View;
+
+import com.github.florent37.materialviewpager.MaterialViewPagerAnimator;
+import com.github.florent37.materialviewpager.MaterialViewPagerHelper;
+import com.github.florent37.materialviewpager.Utils;
+
+/**
+ * Created by florentchampigny on 27/05/2016.
+ */
+public class MaterialViewPagerHeaderDecorator extends RecyclerView.ItemDecoration {
+
+ boolean registered = false;
+
+ @Override
+ public void getItemOffsets(Rect outRect, View view, RecyclerView recyclerView, RecyclerView.State state) {
+ final RecyclerView.ViewHolder holder = recyclerView.getChildViewHolder(view);
+ final Context context = recyclerView.getContext();
+
+ if(!registered) {
+ MaterialViewPagerHelper.registerRecyclerView(context, recyclerView, null);
+ registered = true;
+ }
+
+ int headerCells = 1;
+
+ //don't work with stagged
+ RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+ if(layoutManager instanceof GridLayoutManager){
+ GridLayoutManager gridLayoutManager = (GridLayoutManager)layoutManager;
+ headerCells = gridLayoutManager.getSpanCount();
+ }
+
+ MaterialViewPagerAnimator animator = MaterialViewPagerHelper.getAnimator(context);
+ if (animator != null) {
+ if (holder.getAdapterPosition() < headerCells) {
+ outRect.top = Math.round(Utils.dpToPx(animator.getHeaderHeight() + 10, context));
+ }
+ }
+ }
+}
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerImageHeader.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerImageHeader.java
index 9d7c2e88..2988e65a 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerImageHeader.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerImageHeader.java
@@ -3,17 +3,8 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
-import android.widget.ImageView;
import com.flaviofaria.kenburnsview.KenBurnsView;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.view.ViewHelper;
-import com.squareup.picasso.Callback;
-import com.squareup.picasso.Picasso;
/**
* Created by florentchampigny on 29/04/15.
@@ -41,10 +32,9 @@ public MaterialViewPagerImageHeader(Context context, AttributeSet attrs, int def
/**
* change the image with a fade
- * @param urlImage
- * @param fadeDuration
*
- * TODO : remove Picasso
+ * @param urlImage
+ * @param fadeDuration TODO : remove Picasso
*/
public void setImageUrl(final String urlImage, final int fadeDuration) {
MaterialViewPagerImageHelper.setImageUrl(this, urlImage, fadeDuration);
@@ -52,6 +42,7 @@ public void setImageUrl(final String urlImage, final int fadeDuration) {
/**
* change the image with a fade
+ *
* @param drawable
* @param fadeDuration
*/
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerImageHelper.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerImageHelper.java
index 3daae416..5ca8d1bc 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerImageHelper.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerImageHelper.java
@@ -2,17 +2,18 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
+import android.view.View;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.widget.ImageView;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.drawable.GlideDrawable;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
import com.github.florent37.materialviewpager.MaterialViewPager;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.view.ViewHelper;
-import com.squareup.picasso.Callback;
-import com.squareup.picasso.Picasso;
/**
* Created by florentchampigny on 12/06/15.
@@ -23,75 +24,86 @@ public class MaterialViewPagerImageHelper {
/**
* change the image with a fade
- * @param urlImage
- * @param fadeDuration
*
- * TODO : remove Picasso
+ * @param urlImage
+ * @param fadeDuration TODO : remove Picasso
*/
public static void setImageUrl(final ImageView imageView, final String urlImage, final int fadeDuration) {
- final float alpha = ViewHelper.getAlpha(imageView);
+ final float alpha = ViewCompat.getAlpha(imageView);
final ImageView viewToAnimate = imageView;
//fade to alpha=0
- final ObjectAnimator fadeOut = ObjectAnimator.ofFloat(viewToAnimate, "alpha", 0).setDuration(fadeDuration);
- fadeOut.setInterpolator(new DecelerateInterpolator());
- fadeOut.addListener(new AnimatorListenerAdapter() {
+ fadeOut(viewToAnimate, fadeDuration, new ViewPropertyAnimatorListenerAdapter() {
@Override
- public void onAnimationEnd(Animator animation) {
- super.onAnimationEnd(animation);
+ public void onAnimationEnd(View view) {
+ super.onAnimationEnd(view);
//change the image when alpha=0
- Picasso.with(imageView.getContext()).load(urlImage)
- .centerCrop().fit().into(viewToAnimate, new Callback() {
- @Override
- public void onSuccess() {
-
- //then fade to alpha=1
- final ObjectAnimator fadeIn = ObjectAnimator.ofFloat(viewToAnimate, "alpha", alpha).setDuration(fadeDuration);
- fadeIn.setInterpolator(new AccelerateInterpolator());
- fadeIn.start();
- if(imageLoadListener!=null){
- imageLoadListener.OnImageLoad(imageView,((BitmapDrawable)imageView.getDrawable()).getBitmap());
+ Glide.with(imageView.getContext()).load(urlImage)
+ .centerCrop()
+ .listener(new RequestListener() {
+ @Override
+ public boolean onException(Exception e, String model, Target target, boolean isFirstResource) {
+ return false;
}
- }
-
- @Override
- public void onError() {
- }
- });
+ @Override
+ public boolean onResourceReady(GlideDrawable resource, String model, Target target, boolean isFromMemoryCache, boolean isFirstResource) {
+ //then fade to alpha=1
+ fadeIn(viewToAnimate, alpha, fadeDuration, new ViewPropertyAnimatorListenerAdapter());
+ if (imageLoadListener != null) {
+ imageLoadListener.OnImageLoad(imageView, ((BitmapDrawable) imageView.getDrawable()).getBitmap());
+ }
+ return false;
+ }
+ })
+ .into(viewToAnimate);
}
});
- fadeOut.start();
+ }
+
+ public static void fadeOut(View view, int fadeDuration, ViewPropertyAnimatorListenerAdapter listener) {
+ //fade to alpha=0
+ ViewCompat.animate(view)
+ .alpha(0)
+ .setDuration(fadeDuration)
+ .withLayer()
+ .setInterpolator(new DecelerateInterpolator())
+ .setListener(listener);
+ }
+
+ public static void fadeIn(View view, float alpha, int fadeDuration, ViewPropertyAnimatorListenerAdapter listener) {
+ //fade to alpha=0
+ ViewCompat.animate(view)
+ .alpha(alpha)
+ .setDuration(fadeDuration)
+ .withLayer()
+ .setInterpolator(new AccelerateInterpolator())
+ .setListener(listener);
}
/**
* change the image with a fade
+ *
* @param drawable
* @param fadeDuration
*/
public static void setImageDrawable(final ImageView imageView, final Drawable drawable, final int fadeDuration) {
- final float alpha = ViewHelper.getAlpha(imageView);
+ final float alpha = ViewCompat.getAlpha(imageView);
final ImageView viewToAnimate = imageView;
- //fade to alpha=0
- final ObjectAnimator fadeOut = ObjectAnimator.ofFloat(viewToAnimate, "alpha", 0).setDuration(fadeDuration);
- fadeOut.setInterpolator(new DecelerateInterpolator());
- fadeOut.addListener(new AnimatorListenerAdapter() {
+ fadeOut(viewToAnimate, fadeDuration, new ViewPropertyAnimatorListenerAdapter() {
@Override
- public void onAnimationEnd(Animator animation) {
- super.onAnimationEnd(animation);
+ public void onAnimationEnd(View view) {
+ super.onAnimationEnd(view);
//change the image when alpha=0
imageView.setImageDrawable(drawable);
//then fade to alpha=1
- final ObjectAnimator fadeIn = ObjectAnimator.ofFloat(viewToAnimate, "alpha", alpha).setDuration(fadeDuration);
- fadeIn.setInterpolator(new AccelerateInterpolator());
- fadeIn.start();
+ fadeIn(viewToAnimate, alpha, fadeDuration, new ViewPropertyAnimatorListenerAdapter());
}
});
- fadeOut.start();
}
public static void setImageLoadListener(MaterialViewPager.OnImageLoadListener imageLoadListener) {
diff --git a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerKenBurnsHeader.java b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerKenBurnsHeader.java
index a21980ad..fab20264 100644
--- a/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerKenBurnsHeader.java
+++ b/materialviewpager/src/main/java/com/github/florent37/materialviewpager/header/MaterialViewPagerKenBurnsHeader.java
@@ -3,17 +3,8 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
-import android.widget.ImageView;
import com.flaviofaria.kenburnsview.KenBurnsView;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.view.ViewHelper;
-import com.squareup.picasso.Callback;
-import com.squareup.picasso.Picasso;
/**
* Created by florentchampigny on 29/04/15.
@@ -41,10 +32,9 @@ public MaterialViewPagerKenBurnsHeader(Context context, AttributeSet attrs, int
/**
* change the image with a fade
- * @param urlImage
- * @param fadeDuration
*
- * TODO : remove Picasso
+ * @param urlImage
+ * @param fadeDuration TODO : remove Picasso
*/
public void setImageUrl(final String urlImage, final int fadeDuration) {
MaterialViewPagerImageHelper.setImageUrl(this, urlImage, fadeDuration);
@@ -52,11 +42,12 @@ public void setImageUrl(final String urlImage, final int fadeDuration) {
/**
* change the image with a fade
+ *
* @param drawable
* @param fadeDuration
*/
public void setImageDrawable(final Drawable drawable, final int fadeDuration) {
- MaterialViewPagerImageHelper.setImageDrawable(this,drawable,fadeDuration);
+ MaterialViewPagerImageHelper.setImageDrawable(this, drawable, fadeDuration);
}
}
diff --git a/materialviewpagercontroller/build.gradle b/materialviewpagercontroller/build.gradle
index b025c3be..34f71f99 100644
--- a/materialviewpagercontroller/build.gradle
+++ b/materialviewpagercontroller/build.gradle
@@ -1,16 +1,12 @@
apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-
-version = project.MAVEN_VERSION
android {
- compileSdkVersion project.ANDROID_BUILD_SDK_VERSION
- buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+ compileSdkVersion project.sdk
+ buildToolsVersion project.buildTools
defaultConfig {
- minSdkVersion project.ANDROID_BUILD_MIN_SDK_VERSION
- targetSdkVersion project.ANDROID_BUILD_TARGET_SDK_VERSION
+ minSdkVersion project.minSdk
+ targetSdkVersion project.sdk
versionCode 1
versionName "1.0"
}
@@ -24,7 +20,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:22.2.1'
+ compile 'com.android.support:appcompat-v7:'+project.supportVersion
compile ('com.github.florent37:carpaccio:1.0.1@aar') {
transitive = true
@@ -35,101 +31,32 @@ dependencies {
}
}
+ext {
+ bintrayRepo = 'maven'
+ bintrayName = 'MaterialViewPagerController'
+ orgName = 'florent37'
-def siteUrl = 'https://github.com/florent37/MaterialViewPager' // Homepage URL of the library
-def gitUrl = 'https://github.com/florent37/MaterialViewPager.git' // Git repository URL
-group = "com.github.florent37" // Maven Group ID for the artifact
-
+ publishedGroupId = 'com.github.florent37'
+ libraryName = 'MaterialViewPagerController'
+ artifact = 'materialviewpagercontroller'
-install {
- repositories.mavenInstaller {
- // This generates POM.xml with proper parameters
- pom {
- project {
- packaging 'aar'
+ libraryDescription = 'MaterialViewPagerController'
- // Add your description here
- name 'MaterialViewPagerContoller'
- description = ''
- url siteUrl
+ siteUrl = 'https://github.com/florent37/MaterialViewPagerController'
+ gitUrl = 'https://github.com/florent37/MaterialViewPagerController.git'
- // Set your license
- licenses {
- license {
- name 'The Apache Software License, Version 2.0'
- url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
- }
- }
- developers {
- developer {
- id 'florent37'
- name 'Florent Champigny'
- email 'champigny.florent@gmail.com'
- }
- }
- scm {
- connection gitUrl
- developerConnection gitUrl
- url siteUrl
+ libraryVersion = rootProject.ext.libraryVersion
- }
- }
- }
- }
-}
-
-task sourcesJar(type: Jar) {
- from android.sourceSets.main.java.srcDirs
- classifier = 'sources'
-}
-
-task javadoc(type: Javadoc) {
- source = android.sourceSets.main.java.srcDirs
- classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
+ developerId = 'florent37'
+ developerName = 'Florent Champigny'
+ developerEmail = 'champigny.florent@gmail.com'
-task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
- from javadoc.destinationDir
+ licenseName = 'The Apache Software License, Version 2.0'
+ licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ allLicenses = ["Apache-2.0"]
}
-artifacts {
- archives javadocJar
- archives sourcesJar
-}
-
-Properties properties = new Properties()
-File f = new File("local.properties")
-if(f.exists()) {
- properties.load(project.rootProject.file('local.properties').newDataInputStream())
-}
-
-// https://github.com/bintray/gradle-bintray-plugin
-bintray {
-
- user = properties.getProperty("bintray.user")
- key = properties.getProperty("bintray.apikey")
-
- configurations = ['archives']
- pkg {
- repo = "maven"
- // it is the name that appears in bintray when logged
- name = "MaterialViewPagerContoller"
- websiteUrl = siteUrl
- vcsUrl = gitUrl
- licenses = ["Apache-2.0"]
- publish = true
- version {
- gpg {
- sign = true //Determines whether to GPG sign the files. The default is false
- passphrase = properties.getProperty("bintray.gpg.password") //Optional. The passphrase for GPG signing'
- }
-// mavenCentralSync {
-// sync = true //Optional (true by default). Determines whether to sync the version to Maven Central.
-// user = properties.getProperty("bintray.oss.user") //OSS user token
-// password = properties.getProperty("bintray.oss.password") //OSS user password
-// close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
-// }
- }
- }
+if (project.rootProject.file('local.properties').exists()) {
+ apply from: rootProject.file('gradle/install-v1.gradle')
+ apply from: rootProject.file('gradle/bintray-android-v1.gradle')
}
diff --git a/materialviewpagercontroller/materialviewpagercontroller.iml b/materialviewpagercontroller/materialviewpagercontroller.iml
index 82c2eada..6119a756 100644
--- a/materialviewpagercontroller/materialviewpagercontroller.iml
+++ b/materialviewpagercontroller/materialviewpagercontroller.iml
@@ -1,5 +1,5 @@
-
+
@@ -12,10 +12,7 @@
-
-
- generateDebugAndroidTestSourcesgenerateDebugSources
@@ -29,7 +26,7 @@
-
+
@@ -37,13 +34,13 @@
-
+
-
+
@@ -51,6 +48,15 @@
+
+
+
+
+
+
+
+
+
@@ -58,6 +64,15 @@
+
+
+
+
+
+
+
+
+
@@ -65,52 +80,51 @@
-
+
+
+
-
-
-
+
+
-
+
+
-
-
-
+
+
-
-
-
-
+
-
+
-
-
+
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sample/build.gradle b/sample/build.gradle
index 8d045952..d4cb910c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,29 +1,13 @@
-apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
-
-buildscript {
- repositories {
- maven { url 'https://maven.fabric.io/public' }
- }
-
- dependencies {
- classpath 'io.fabric.tools:gradle:1.+'
- }
-}
-
apply plugin: 'io.fabric'
-repositories {
- maven { url 'https://maven.fabric.io/public' }
-}
-
android {
- compileSdkVersion project.ANDROID_BUILD_SDK_VERSION
- buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+ compileSdkVersion project.sdk
+ buildToolsVersion project.buildTools
defaultConfig {
- minSdkVersion project.ANDROID_BUILD_MIN_SDK_VERSION
- targetSdkVersion project.ANDROID_BUILD_TARGET_SDK_VERSION
+ minSdkVersion project.minSdk
+ targetSdkVersion project.sdk
versionCode 4
versionName "1.0"
}
@@ -62,8 +46,8 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:'+project.SUPPORT_VERSION
- compile 'com.android.support:cardview-v7:'+project.SUPPORT_VERSION
+ compile 'com.android.support:appcompat-v7:'+project.supportVersion
+ compile 'com.android.support:cardview-v7:'+project.supportVersion
//compile ('com.github.florent37:materialviewpager:1.0.6@aar'){
// transitive=true
diff --git a/sample/sample.iml b/sample/sample.iml
index 87ba5cef..470eaaaf 100644
--- a/sample/sample.iml
+++ b/sample/sample.iml
@@ -12,10 +12,7 @@
-
-
- generateDebugAndroidTestSourcesgenerateDebugSources
@@ -28,21 +25,22 @@