Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

http #209

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open

http #209

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions AndroidBootstrap/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply from: 'push.gradle'

android {
compileSdkVersion Integer.parseInt(TARGET_SDK_INT)
buildToolsVersion "25.0.1"
buildToolsVersion "25.0.3"

defaultConfig {
minSdkVersion Integer.parseInt(MIN_SDK_INT)
Expand All @@ -14,6 +14,6 @@ android {
}

dependencies {
compile 'com.android.support:support-annotations:25.0.1'
compile 'com.android.support:support-v4:25.0.1'
compile 'com.android.support:support-annotations:25.3.1'
compile 'com.android.support:support-v4:25.3.1'
}
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,14 @@ protected void updateBootstrapState() {
bootstrapText = null;
}

@Override
protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
super.onTextChanged(text, start, lengthBefore, lengthAfter);
if(!(text!=null && text.length()>0)){
setVisibility(GONE);
}else{
setVisibility(VISIBLE);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private void initialise(AttributeSet attrs) {
try {
this.rounded = a.getBoolean(R.styleable.BootstrapEditText_roundedCorners, false);

int typeOrdinal = a.getInt(R.styleable.AwesomeTextView_bootstrapBrand, -1);
int typeOrdinal = a.getInt(R.styleable.BootstrapEditText_bootstrapBrand, -1);
int sizeOrdinal = a.getInt(R.styleable.BootstrapEditText_bootstrapSize, -1);

this.bootstrapBrand = DefaultBootstrapBrand.fromAttributeValue(typeOrdinal);
Expand Down

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Quick Start
===========
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.beardedhen/androidbootstrap/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.beardedhen/androidbootstrap)
[![CircleCI](https://circleci.com/gh/Bearded-Hen/Android-Bootstrap/tree/develop.svg?style=shield)](https://circleci.com/gh/Bearded-Hen/Android-Bootstrap/tree/develop)
<a href="http://www.methodscount.com/?lib=com.beardedhen%3Aandroidbootstrap%3A%2B"><img src="https://img.shields.io/badge/Methods and size-core: 913 | deps: 10417 | 431 KB-e91e63.svg"/></a>

Add the following dependency to your build.gradle, ensuring you replace 'X.X.X' with the latest version on the button above:

Expand Down Expand Up @@ -44,7 +45,7 @@ The javadoc for the project is hosted on [Github](http://bearded-hen.github.io/A
Examples
============

###BootstrapButton
### BootstrapButton
A button that supports Glyph icons, and is themeable using Bootstrap Brands.
```xml
<com.beardedhen.androidbootstrap.BootstrapButton
Expand Down Expand Up @@ -87,7 +88,7 @@ Allows BootstrapButtons to be grouped together and their attributes controlled e
<img src="https://raw.github.com/Bearded-Hen/Android-Bootstrap/master/images/bootstrap_button_group.png" width="450" alt="BootstrapButtonGroup">


###AwesomeTextView
### AwesomeTextView
A text widget that displays Glyph icons, and is themeable using Bootstrap Brands.
```xml
<com.beardedhen.androidbootstrap.AwesomeTextView
Expand Down Expand Up @@ -156,7 +157,7 @@ Displays non-clickable text in a widget similar to the BootstrapButton, sizable
```
<img src="https://raw.github.com/Bearded-Hen/Android-Bootstrap/master/images/bootstrap_label.png" width="450" alt="BootstrapLabel">

###BootstrapEditText
### BootstrapEditText
Allows editing of text in a widget themed using BootstrapBrand.
```xml
<com.beardedhen.androidbootstrap.BootstrapEditText
Expand All @@ -181,7 +182,7 @@ Displays images in a center-cropped Circular View, themed with BootstrapBrand.
```
<img src="https://raw.github.com/Bearded-Hen/Android-Bootstrap/master/images/bootstrap_circle_thumbnail.png" width="450" alt="BootstrapCircleThumbnail">

###BootstrapThumbnail
### BootstrapThumbnail
Displays images in a rectangular View, themed with BootstrapBrand.
```xml
<com.beardedhen.androidbootstrap.BootstrapThumbnail
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {

}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.2'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION_NAME=2.3.1
VERSION_CODE=231
VERSION_NAME=2.3.2
VERSION_CODE=232
GROUP=com.beardedhen

MIN_SDK_INT=14
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Dec 28 10:00:20 PST 2015
#Sat Jul 22 10:14:14 BST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6 changes: 3 additions & 3 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion Integer.parseInt(TARGET_SDK_INT)
buildToolsVersion "25.0.1"
buildToolsVersion "25.0.3"

defaultConfig {
applicationId "com.fractalwrench.androidbootstrap.sample"
Expand Down Expand Up @@ -31,6 +31,6 @@ dependencies {
compile 'com.jakewharton:butterknife:8.4.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'

compile 'com.android.support:appcompat-v7:25.0.1'
compile 'com.android.support:support-annotations:25.0.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-annotations:25.3.1'
}