v1.0.7 - Fixed outline draw glitch on certain custom views

code-mc · Dec 4, 2015 · 609dbed · 609dbed
1 parent 477916b
commit 609dbed
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ You don't have to worry about android including the file twice in your apk. Andr
 
 ```groovy
 dependencies {
-    compile 'net.steamcrafted:materialiconlib:1.0.6'
+    compile 'net.steamcrafted:materialiconlib:1.0.7'
 }
 ```
 

diff --git a/app/app.iml b/app/app.iml
@@ -70,23 +70,28 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.hdodenhof/circleimageview/2.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="circleimageview-2.0.0" level="project" />
     <orderEntry type="module" module-name="materialiconlib" exported="" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "net.steamcrafted.materialiconview"
-        minSdkVersion 7
+        minSdkVersion 8
         targetSdkVersion 22
         versionCode 1
         versionName "1.0"
@@ -24,5 +24,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'de.hdodenhof:circleimageview:2.0.0'
     compile project(':materialiconlib')
 }
diff --git a/app/src/main/java/net/steamcrafted/materialiconview/MainActivity.java b/app/src/main/java/net/steamcrafted/materialiconview/MainActivity.java
@@ -16,6 +16,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import de.hdodenhof.circleimageview.CircleImageView;
+
 public class MainActivity extends AppCompatActivity {
 
     MaterialIconView mIcon;
@@ -24,6 +26,8 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+
         setContentView(R.layout.activity_main);
 
         mListview = (GridView) findViewById(R.id.listview);
@@ -33,6 +37,17 @@ protected void onCreate(Bundle savedInstanceState) {
         mListview.setAdapter(adapt);
 
 
+        /*
+        setContentView(R.layout.circletest);
+        ((CircleImageView)findViewById(R.id.profile_image)).setImageDrawable(
+                MaterialDrawableBuilder.with(this)
+                        .setSizeDp(96)
+                        .setIcon(MaterialDrawableBuilder.IconValue.FACEBOOK_BOX)
+                        .setColor(Color.BLUE)
+                        .build()
+        );
+        */
+
 
         /*mIcon = (MaterialIconView) findViewById(R.id.icon);
         ImageView imgicon = (ImageView) findViewById(R.id.image_icon);

diff --git a/app/src/main/res/layout/circletest.xml b/app/src/main/res/layout/circletest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<de.hdodenhof.circleimageview.CircleImageView
+xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:app="http://schemas.android.com/apk/res-auto"
+android:id="@+id/profile_image"
+android:layout_width="96dp"
+android:layout_height="96dp"
+app:civ_border_width="2dp"
+app:civ_border_color="#FF000000"/>
diff --git a/materialiconlib/build.gradle b/materialiconlib/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'net.steamcrafted'
     PUBLISH_ARTIFACT_ID = 'materialiconlib'
-    PUBLISH_VERSION = '1.0.6'
+    PUBLISH_VERSION = '1.0.7'
 }
 
 android {

diff --git a/materialiconlib/materialiconlib.iml b/materialiconlib/materialiconlib.iml
@@ -65,18 +65,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/release" />
+      <excludeFolder url="file://$MODULE_DIR$/build/release-1.0.7.zip" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />

diff --git a/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialDrawableBuilder.java b/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialDrawableBuilder.java
@@ -53,7 +53,7 @@ private MaterialDrawableBuilder(Context context) {
         //this.icon = icon;
         paint = new TextPaint();
         paint.setTypeface(MaterialIconUtils.getTypeFace(context));
-        paint.setStyle(Paint.Style.STROKE);
+        paint.setStyle(Paint.Style.FILL_AND_STROKE);
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setUnderlineText(false);
         paint.setColor(Color.BLACK);