Skip to content

Commit 609dbed

Browse files
committed
v1.0.7 - Fixed outline draw glitch on certain custom views
1 parent 477916b commit 609dbed

File tree

8 files changed

+43
-4
lines changed

8 files changed

+43
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You don't have to worry about android including the file twice in your apk. Andr
3030

3131
```groovy
3232
dependencies {
33-
compile 'net.steamcrafted:materialiconlib:1.0.6'
33+
compile 'net.steamcrafted:materialiconlib:1.0.7'
3434
}
3535
```
3636

app/app.iml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,28 @@
7070
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.hdodenhof/circleimageview/2.0.0/jars" />
7374
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7475
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
7678
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
7981
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8082
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
8284
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8387
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8488
</content>
8589
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8690
<orderEntry type="sourceFolder" forTests="false" />
8791
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
8892
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
8993
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
94+
<orderEntry type="library" exported="" name="circleimageview-2.0.0" level="project" />
9095
<orderEntry type="module" module-name="materialiconlib" exported="" />
9196
</component>
9297
</module>

app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88

99
defaultConfig {
1010
applicationId "net.steamcrafted.materialiconview"
11-
minSdkVersion 7
11+
minSdkVersion 8
1212
targetSdkVersion 22
1313
versionCode 1
1414
versionName "1.0"
@@ -24,5 +24,6 @@ android {
2424
dependencies {
2525
compile fileTree(dir: 'libs', include: ['*.jar'])
2626
compile 'com.android.support:appcompat-v7:22.2.0'
27+
compile 'de.hdodenhof:circleimageview:2.0.0'
2728
compile project(':materialiconlib')
2829
}

app/src/main/java/net/steamcrafted/materialiconview/MainActivity.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import java.util.Arrays;
1717
import java.util.List;
1818

19+
import de.hdodenhof.circleimageview.CircleImageView;
20+
1921
public class MainActivity extends AppCompatActivity {
2022

2123
MaterialIconView mIcon;
@@ -24,6 +26,8 @@ public class MainActivity extends AppCompatActivity {
2426
@Override
2527
protected void onCreate(Bundle savedInstanceState) {
2628
super.onCreate(savedInstanceState);
29+
30+
2731
setContentView(R.layout.activity_main);
2832

2933
mListview = (GridView) findViewById(R.id.listview);
@@ -33,6 +37,17 @@ protected void onCreate(Bundle savedInstanceState) {
3337
mListview.setAdapter(adapt);
3438

3539

40+
/*
41+
setContentView(R.layout.circletest);
42+
((CircleImageView)findViewById(R.id.profile_image)).setImageDrawable(
43+
MaterialDrawableBuilder.with(this)
44+
.setSizeDp(96)
45+
.setIcon(MaterialDrawableBuilder.IconValue.FACEBOOK_BOX)
46+
.setColor(Color.BLUE)
47+
.build()
48+
);
49+
*/
50+
3651

3752
/*mIcon = (MaterialIconView) findViewById(R.id.icon);
3853
ImageView imgicon = (ImageView) findViewById(R.id.image_icon);
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<de.hdodenhof.circleimageview.CircleImageView
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
android:id="@+id/profile_image"
6+
android:layout_width="96dp"
7+
android:layout_height="96dp"
8+
app:civ_border_width="2dp"
9+
app:civ_border_color="#FF000000"/>

materialiconlib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'com.android.library'
44
ext {
55
PUBLISH_GROUP_ID = 'net.steamcrafted'
66
PUBLISH_ARTIFACT_ID = 'materialiconlib'
7-
PUBLISH_VERSION = '1.0.6'
7+
PUBLISH_VERSION = '1.0.7'
88
}
99

1010
android {

materialiconlib/materialiconlib.iml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,27 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6869
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7172
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7273
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7374
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7475
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
7577
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7678
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
7779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
7983
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/release" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/release-1.0.7.zip" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8089
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8190
</content>
8291
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />

materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialDrawableBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private MaterialDrawableBuilder(Context context) {
5353
//this.icon = icon;
5454
paint = new TextPaint();
5555
paint.setTypeface(MaterialIconUtils.getTypeFace(context));
56-
paint.setStyle(Paint.Style.STROKE);
56+
paint.setStyle(Paint.Style.FILL_AND_STROKE);
5757
paint.setTextAlign(Paint.Align.CENTER);
5858
paint.setUnderlineText(false);
5959
paint.setColor(Color.BLACK);

0 commit comments

Comments
 (0)