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

Commit

Permalink
1.2.0 added header decorator,
Browse files Browse the repository at this point in the history
removed some nineold usages
  • Loading branch information
florent champigny committed May 27, 2016
1 parent 8b7081b commit 69f2126
Show file tree
Hide file tree
Showing 33 changed files with 1,173 additions and 1,027 deletions.
14 changes: 11 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
*.apk
*.ap_

.idea/workspace.xml

# Files for the Dalvik VM
*.dex

Expand All @@ -17,7 +15,6 @@ gen/
# Gradle files
.gradle/
build/
/*/build/

# Local configuration file (sdk path, etc)
local.properties
Expand All @@ -27,3 +24,14 @@ proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

.gradle
.idea
*.iml
**/build/*
20 changes: 17 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions .idea/scopes/scope_settings.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions MaterialViewPager.iml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
Expand Down
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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.1.3@aar'){
compile ('com.github.florent37:materialviewpager:1.2.0@aar'){
transitive = true
}
```
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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
Expand Down
35 changes: 15 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
}
52 changes: 52 additions & 0 deletions gradle/bintray-android-v1.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
}
}
}
49 changes: 49 additions & 0 deletions gradle/bintray-java-v1.gradle
Original file line number Diff line number Diff line change
@@ -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
44 changes: 44 additions & 0 deletions gradle/install-v1.gradle
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 69f2126

Please sign in to comment.