Skip to content

Commit

Permalink
Merge pull request #19 from tylersuehr7/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
tylersuehr7 authored Feb 20, 2018
2 parents bb75381 + 7b9d14d commit 715fd7a
Show file tree
Hide file tree
Showing 23 changed files with 189 additions and 194 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Attribute | Type | Summary
`android:textColorHint` | `color` | Text color of the hint shown in the chips input.
`android:textColor` | `color` | Text color of chips input.
`app:allowCustomChips` | `boolean` | True if user is allowed to enter custom chips.
`app:hideKeyboardOnChipClick` | `boolean` | True if the keyboard should hide when a filterable chip is clicked.
`app:maxRows` | `int` | Maximum number of rows used to display chips.
`app:chip_showDetails` | `boolean` | True if clicking a chip should show its details.
`app:chip_showAvatar` | `boolean` | True if each chip should show an avatar icon.
Expand Down Expand Up @@ -97,6 +98,7 @@ Method | Summary
`setInputTextColor(ColorStateList)` | Changes text color of chips input.
`setShowDetailedChipsEnabled(boolean)` | True if clicking a chip should show its details.
`setCustomChipsEnabled(boolean)` | True if user is allowed to enter custom chips.
`setHideKeyboardOnChipClick(boolean)` | True if the keyboard should hide when filterable chip is clicked.
`setMaxRows(int)` | Changes maximum number of rows used to display chips.
`setTypeface(Typeface)` | Changes the typeface of the ChipsInputLayout and all associated textual-based components.
`setChipTitleTextColor(ColorStateList)` | Changes text color of each chips' title and subtitle.
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:26.+'
compile 'com.android.support:design:26.+'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
testCompile 'junit:junit:4.12'
compile project(':library')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.tylersuehr.chips.data.Chip;
import com.tylersuehr.chips.Chip;

/**
* Copyright © 2017 Tyler Suehr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.tylersuehr.chips.data.Chip;
import com.tylersuehr.chips.data.ChipDataSource;
import com.tylersuehr.chips.Chip;
import com.tylersuehr.chips.ChipDataSource;

/**
* Copyright © 2017 Tyler Suehr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.bumptech.glide.Glide;
import com.tylersuehr.chips.ChipImageRenderer;
import com.tylersuehr.chips.LetterTileProvider;
import com.tylersuehr.chips.data.Chip;
import com.tylersuehr.chips.Chip;

/**
* Copyright © 2017 Tyler Suehr
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -17,7 +17,7 @@ buildscript {
allprojects {
repositories {
jcenter()
mavenCentral()
google()
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri Jan 26 18:06:19 EST 2018
#Tue Feb 20 03:25:34 EST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit 715fd7a

Please sign in to comment.