Skip to content

Commit 1de6353

Browse files
committed
Minor Bug Fix, Release 1.1.2
1 parent 883becd commit 1de6353

File tree

7 files changed

+17
-10
lines changed

7 files changed

+17
-10
lines changed

README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ A library to display FontAwesome Icons in any View or a MenuItem
2424
Add the following code snippet to module/build.gradle
2525
```gradle
2626
dependencies {
27-
compile 'com.lmntrx.livin.library.droidawesome:droid-awesome:1.1.1'
27+
compile 'com.lmntrx.livin.library.droidawesome:droid-awesome:1.1.2'
2828
}
2929
```
3030

@@ -34,7 +34,7 @@ dependencies {
3434
<dependency>
3535
<groupId>com.lmntrx.livin.library.droidawesome</groupId>
3636
<artifactId>droid-awesome</artifactId>
37-
<version>1.1.1</version>
37+
<version>1.1.2</version>
3838
<type>pom</type>
3939
</dependency>
4040
```
@@ -111,6 +111,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
111111

112112
## ChangeLog ##
113113

114+
### 1.1.2 ###
115+
* Minor Bug Fix
116+
114117
### 1.1.1 ###
115118
* Add FontAwesome icon programmatically
116119
* Added support for MenuItem

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.2'
8+
classpath 'com.android.tools.build:gradle:2.2.3'
99

1010
classpath 'com.novoda:bintray-release:0.4.0'
1111

droid-awesome/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
minSdkVersion 15
1010
targetSdkVersion 25
1111
versionCode 1
12-
versionName "1.1.1"
12+
versionName "1.1.2"
1313

1414
}
1515

@@ -31,7 +31,7 @@ publish {
3131
groupId = 'com.lmntrx.livin.library.droidawesome'
3232
repoName = 'DroidAwesome'
3333
artifactId = 'droid-awesome'
34-
publishVersion = '1.1.1'
34+
publishVersion = '1.1.2'
3535
desc = 'Custom Views that support FontAwesome directly'
3636
website = 'https://github.com/Livin21/DroidAwesome'
3737
}

droid-awesome/src/main/java/com/lmntrx/livin/library/droidawesome/DroidAwesomeFloatingActionButton.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
7373
try{
7474
String text = typedArray.getString(R.styleable.DroidAwesomeTextDrawable_text);
7575
Float textSize = typedArray.getDimension(R.styleable.DroidAwesomeTextDrawable_textSize,14);
76-
int textColor = typedArray.getColor(R.styleable.DroidAwesomeTextDrawable_textColor, ContextCompat.getColor(context,android.R.color.primary_text_dark));
76+
int textColor = typedArray.getColor(R.styleable.DroidAwesomeTextDrawable_textColor, ContextCompat.getColor(context,R.color.primary_icon_color));
7777
TextDrawable textDrawable = new TextDrawable(context);
7878
textDrawable.setText(text);
7979
if (textColor!=0)
@@ -84,7 +84,6 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
8484
textDrawable.setTypeface(FontAwesome.getTypeface(context));
8585
setImageDrawable(textDrawable);
8686
}finally {
87-
typedArray.recycle();
88-
}
87+
typedArray.recycle(); }
8988
}
9089
}

droid-awesome/src/main/java/com/lmntrx/livin/library/droidawesome/DroidAwesomeImageButton.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
8888
try{
8989
String text = typedArray.getString(R.styleable.DroidAwesomeTextDrawable_text);
9090
Float textSize = typedArray.getDimension(R.styleable.DroidAwesomeTextDrawable_textSize,14);
91-
int textColor = typedArray.getColor(R.styleable.DroidAwesomeTextDrawable_textColor, ContextCompat.getColor(context,android.R.color.primary_text_dark));
91+
int textColor = typedArray.getColor(R.styleable.DroidAwesomeTextDrawable_textColor, ContextCompat.getColor(context,R.color.primary_icon_color));
9292
TextDrawable textDrawable = new TextDrawable(context);
9393
textDrawable.setText(text);
9494
if (textColor!=0)

droid-awesome/src/main/java/com/lmntrx/livin/library/droidawesome/DroidAwesomeImageView.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.os.Build;
2222
import android.support.annotation.Dimension;
2323
import android.support.annotation.RequiresApi;
24+
import android.support.v4.content.ContextCompat;
2425
import android.util.AttributeSet;
2526
import android.widget.ImageView;
2627
import android.widget.TextView;
@@ -87,7 +88,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
8788
try{
8889
String text = typedArray.getString(R.styleable.DroidAwesomeTextDrawable_text);
8990
Float textSize = typedArray.getDimension(R.styleable.DroidAwesomeTextDrawable_textSize,14);
90-
int textColor = typedArray.getColor(R.styleable.DroidAwesomeTextDrawable_textColor, 0);
91+
int textColor = typedArray.getColor(R.styleable.DroidAwesomeTextDrawable_textColor, ContextCompat.getColor(context,R.color.primary_icon_color));
9192
TextDrawable textDrawable = new TextDrawable(context);
9293
textDrawable.setText(text);
9394
if (textColor!=0)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="primary_icon_color">#fff</color>
4+
</resources>

0 commit comments

Comments
 (0)