Skip to content

Commit

Permalink
Merge branch 'release/v3.2.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Jul 22, 2018
2 parents f2a0f7e + 06d2a95 commit b294636
Show file tree
Hide file tree
Showing 18 changed files with 155 additions and 216 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ android:
components:
- tools
- platform-tools
- build-tools-27.0.3
- android-27
- build-tools-28.0.0
- android-28
- sys-img-armeabi-v7a-android-18
before_install:
- yes | sdkmanager "platforms;android-27"
- yes | sdkmanager "build-tools;27.0.3"
- yes | sdkmanager "platforms;android-28"
- yes | sdkmanager "build-tools;28.0.0"
jdk:
- oraclejdk8
script:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# FastAdapter [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/fastadapter/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/fastadapter) [![Join the chat at https://gitter.im/mikepenz/fastadapter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mikepenz/fastadapter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
# FastAdapter [![Download](https://api.bintray.com/packages/mikepenz/maven/com.mikepenz%3Afastadapter/images/download.svg?version=3.2.7) ](https://bintray.com/mikepenz/maven/com.mikepenz%3Afastadapter/3.2.7/link) [![Join the chat at https://gitter.im/mikepenz/fastadapter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mikepenz/fastadapter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

> The RecyclerView is one of the most used widgets in the Android world, and with it you have to implement an Adapter which provides the items for the view. Most use cases require the same base logic, but require you to write everything again and again.
Expand Down Expand Up @@ -41,26 +41,26 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details

The library is split up into core, commons, and extensions. The core functions are included in the following dependency.
```gradle
implementation 'com.mikepenz:fastadapter:3.2.7'
implementation 'com.mikepenz:fastadapter:3.2.8'
implementation 'com.android.support:appcompat-v7:${latestSupportLib}'
implementation 'com.android.support:recyclerview-v7:${latestSupportLib}'
```

The commons package comes with some useful helpers (which are not needed in all cases) This one for example includes the `FastItemAdapter`
```gradle
implementation 'com.mikepenz:fastadapter-commons:3.2.7'
implementation 'com.mikepenz:fastadapter-commons:3.2.8'
```

Expandable support is included and can be added via this
```gradle
implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.7'
implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.8'
//The tiny Materialize library used for its useful helper classes
implementation 'com.mikepenz:materialize:${latestVersion}'
```

Many helper classes are included in the following dependency. (This functionality also needs the `Expandable` extension
```gradle
implementation 'com.mikepenz:fastadapter-extensions:3.2.7'
implementation 'com.mikepenz:fastadapter-extensions:3.2.8'
implementation 'com.android.support:design:${versions.supportLib}'
//The tiny Materialize library used for its useful helper classes
implementation 'com.mikepenz:materialize:${latestVersion}'
Expand Down
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ android {
defaultConfig {
minSdkVersion setup.minSdk
targetSdkVersion setup.targetSdk
versionCode 3270
versionName '3.2.7'
versionCode release.versionCode
versionName release.versionName

setProperty("archivesBaseName", "FastAdapter-v$versionName-c$versionCode")
}
Expand Down Expand Up @@ -61,12 +61,12 @@ dependencies {
// used to provide out of the box icon font support. simplifies development,
// and provides scalable icons. the core is very very light
// https://github.com/mikepenz/Android-Iconics
implementation 'com.mikepenz:iconics-core:3.0.3@aar'
implementation "com.mikepenz:iconics-views:3.0.3@aar"
implementation 'com.mikepenz:iconics-core:3.0.4@aar'
implementation "com.mikepenz:iconics-views:3.0.4@aar"

//used to generate the drawer on the left
//https://github.com/mikepenz/MaterialDrawer
implementation('com.mikepenz:materialdrawer:6.0.0@aar') {
implementation('com.mikepenz:materialdrawer:6.0.7@aar') {
transitive = true
exclude group: "com.mikepenz"
}
Expand All @@ -75,7 +75,7 @@ dependencies {
implementation 'com.mikepenz:itemanimators:1.0.2@aar'
//used to generate the Open Source section
//https://github.com/mikepenz/AboutLibraries
implementation('com.mikepenz:aboutlibraries:6.0.7@aar') {
implementation('com.mikepenz:aboutlibraries:6.0.9@aar') {
transitive = true
exclude group: "com.mikepenz"
}
Expand Down Expand Up @@ -119,8 +119,8 @@ dependencies {

configurations.all {
resolutionStrategy.force "com.mikepenz:materialize:1.1.2"
resolutionStrategy.force "com.mikepenz:iconics-core:3.0.0"
resolutionStrategy.force "com.mikepenz:fastadapter:3.0.0"
resolutionStrategy.force "com.mikepenz:iconics-core:3.0.4"
resolutionStrategy.force "com.mikepenz:aboutlibraries:6.0.9"
resolutionStrategy.force "com.android.support:support-v4:${versions.supportLib}"
resolutionStrategy.force "com.android.support:appcompat-v7:${versions.supportLib}"
resolutionStrategy.force "com.android.support:recyclerview-v7:${versions.supportLib}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import android.content.Context;
import android.graphics.Color;
import android.support.v4.view.ViewCompat;

import com.mikepenz.fastadapter.IExpandable;
import com.mikepenz.fastadapter.IItem;
import com.mikepenz.fastadapter.ISubItem;
import com.mikepenz.fastadapter.app.items.expandable.SimpleSubExpandableItem;
import com.mikepenz.fastadapter.commons.utils.FastAdapterUIUtils;
import com.mikepenz.materialdrawer.holder.StringHolder;
import com.mikepenz.materialize.util.UIUtils;

import java.util.List;

Expand All @@ -34,7 +34,8 @@ public void bindView(ViewHolder viewHolder, List<Object> payloads) {
Context ctx = viewHolder.itemView.getContext();

//set the background for the item
UIUtils.setBackground(viewHolder.view, FastAdapterUIUtils.getSelectableBackground(ctx, Color.RED, true));
viewHolder.view.clearAnimation();
ViewCompat.setBackground(viewHolder.view, FastAdapterUIUtils.getSelectableBackground(ctx, Color.RED, true));
//set the text for the name
StringHolder.applyTo(name, viewHolder.name);
//set the text for the description or hide
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ public void bindView(SimpleImageItem.ViewHolder viewHolder, List<Object> payload

//set the background for the item
int color = UIUtils.getThemeColor(ctx, R.attr.colorPrimary);

viewHolder.view.clearAnimation();
viewHolder.view.setForeground(FastAdapterUIUtils.getSelectablePressedBackground(ctx, FastAdapterUIUtils.adjustAlpha(color, 100), 50, true));

//load glide
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.mikepenz.fastadapter.expandable.items.AbstractExpandableItem;
import com.mikepenz.fastadapter.listeners.OnClickListener;
import com.mikepenz.materialdrawer.holder.StringHolder;
import com.mikepenz.materialize.util.UIUtils;

import java.util.List;

Expand Down Expand Up @@ -136,7 +135,8 @@ public void bindView(ViewHolder viewHolder, List<Object> payloads) {
Context ctx = viewHolder.itemView.getContext();

//set the background for the item
UIUtils.setBackground(viewHolder.view, FastAdapterUIUtils.getSelectableBackground(ctx, Color.RED, true));
viewHolder.view.clearAnimation();
ViewCompat.setBackground(viewHolder.view, FastAdapterUIUtils.getSelectableBackground(ctx, Color.RED, true));
//set the text for the name
StringHolder.applyTo(name, viewHolder.name);
//set the text for the description or hide
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
import android.content.Context;
import android.graphics.Color;
import android.support.annotation.StringRes;
import android.support.v4.view.ViewCompat;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;

import com.mikepenz.fastadapter.IClickable;
import com.mikepenz.fastadapter_extensions.drag.IDraggable;
import com.mikepenz.fastadapter.IExpandable;
import com.mikepenz.fastadapter.IItem;
import com.mikepenz.fastadapter.ISubItem;
import com.mikepenz.fastadapter.app.R;
import com.mikepenz.fastadapter.expandable.items.AbstractExpandableItem;
import com.mikepenz.fastadapter.commons.utils.FastAdapterUIUtils;
import com.mikepenz.fastadapter.expandable.items.AbstractExpandableItem;
import com.mikepenz.fastadapter_extensions.drag.IDraggable;
import com.mikepenz.materialdrawer.holder.StringHolder;
import com.mikepenz.materialize.util.UIUtils;

import java.util.List;

Expand Down Expand Up @@ -100,7 +100,8 @@ public void bindView(ViewHolder viewHolder, List<Object> payloads) {
Context ctx = viewHolder.itemView.getContext();

//set the background for the item
UIUtils.setBackground(viewHolder.view, FastAdapterUIUtils.getSelectableBackground(ctx, Color.RED, true));
viewHolder.view.clearAnimation();
ViewCompat.setBackground(viewHolder.view, FastAdapterUIUtils.getSelectableBackground(ctx, Color.RED, true));
//set the text for the name
StringHolder.applyTo(name, viewHolder.name);
//set the text for the description or hide
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
buildscript {
ext {
release = [
versionName: "3.2.7",
versionCode: 3270
versionName: "3.2.8",
versionCode: 3280
]

setup = [
compileSdk: 27,
buildTools: "27.0.3",
compileSdk: 28,
buildTools: "28.0.0",
minSdk : 14,
targetSdk : 27
targetSdk : 28
]

versions = [
Expand All @@ -23,7 +23,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
Expand Down
Loading

0 comments on commit b294636

Please sign in to comment.