Android Lint changes

code-mc · Jul 26, 2016 · 6c86f31 · 6c86f31
1 parent 406a8f4
commit 6c86f31
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -73,13 +73,18 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/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-23.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <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 23 Platform" jdkType="Android SDK" />

diff --git a/materialiconlib/materialiconlib.iml b/materialiconlib/materialiconlib.iml
@@ -65,16 +65,25 @@
       <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/mockable-android-23.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <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.1.0.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 23 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
@@ -16,7 +16,7 @@
  * Builder used to create a MaterialDrawable. Provide a context and at least an icon to build.
  *
  * Example usage:
- * <p/>
+ * <p></p>
  * <pre>
  *     Drawable myDrawable = MaterialDrawableBuilder.with(context)
  *              .setIcon(IconValue.ACCESS_POINT)

diff --git a/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialIconView.java b/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialIconView.java
@@ -112,8 +112,6 @@ public void setIcon(MaterialDrawableBuilder.IconValue iconValue){
 
     /**
      * Set the size of this icon to the standard Android ActionBar.
-     *
-     * @return The current IconDrawable for chaining.
      */
     public void setToActionbarSize() {
         setSizeDp(ACTIONBAR_HEIGHT_DP);
@@ -123,7 +121,6 @@ public void setToActionbarSize() {
      * Set the size of the drawable.
      *
      * @param dimenRes The dimension resource.
-     * @return The current IconDrawable for chaining.
      */
     public void setSizeResource(int dimenRes) {
         mBuilder.setSizeResource(dimenRes);
@@ -135,7 +132,6 @@ public void setSizeResource(int dimenRes) {
      * Set the size of the drawable.
      *
      * @param size The size in density-independent pixels (dp).
-     * @return The current IconDrawable for chaining.
      */
     public void setSizeDp(int size) {
         mBuilder.setSizeDp(size);
@@ -147,7 +143,6 @@ public void setSizeDp(int size) {
      * Set the size of the drawable.
      *
      * @param size The size in pixels (px).
-     * @return The current IconDrawable for chaining.
      */
     public void setSizePx(int size) {
         mBuilder.setSizePx(size);
@@ -159,7 +154,6 @@ public void setSizePx(int size) {
      * Set the color of the drawable.
      *
      * @param color The color, usually from android.graphics.Color or 0xFF012345.
-     * @return The current IconDrawable for chaining.
      */
     public void setColor(int color) {
         mBuilder.setColor(color);
@@ -170,7 +164,6 @@ public void setColor(int color) {
      * Set the color of the drawable.
      *
      * @param colorRes The color resource, from your R file.
-     * @return The current IconDrawable for chaining.
      */
     public void setColorResource(int colorRes) {
         mBuilder.setColorResource(colorRes);

diff --git a/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialMenuInflater.java b/materialiconlib/src/main/java/net/steamcrafted/materialiconlib/MaterialMenuInflater.java
@@ -74,7 +74,7 @@ public MaterialMenuInflater setDefaultColorResource(int colorRes){
      * {@link InflateException} if there is an error.
      *
      * @param menuRes Resource ID for an XML layout resource to load (e.g.,
-     *            <code>R.menu.main_activity)
+     *            <code>R.menu.main_activity)</code>)
      * @param menu The Menu to inflate into. The items and submenus will be
      *            added to this Menu.
      */