Removed http://schemas.android.com/tools from validations

GuilhE · Dec 15, 2020 · 401cb9e · 401cb9e
1 parent 0dd3b1e
commit 401cb9e
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
 # Changelog
+
+## [2.0.1]
+
+- Versions and gradle update
+- Excluded http://schemas.android.com/tools from validations
+
 ---
 
 ## [2.0.0]
 
 - Uses lintPublish, this way you just have to import styling-lint as a gradle dependency and checks will be automatically included in you project
+
 ---
 
 ## [1.0.0]

diff --git a/buildSrc/src/main/java/Constants.kt b/buildSrc/src/main/java/Constants.kt
@@ -9,15 +9,15 @@ object AndroidConstants {
 }
 
 object Versions {
- const val build_gradle_version = "4.1.0-alpha02"
- const val kotlin_gradle_plugin_version = "1.4.0"
+ const val build_gradle_version = "4.1.1"
+ const val kotlin_gradle_plugin_version = "1.4.21"
  const val bintray_plugin_version = "1.8.5"
 
  const val bintray_version = "1.8.5"
  const val dokka_version = "1.4.0"
 
  const val kotlin_stdlib_version = "1.4.0"
- const val lint_version = "27.1.0-alpha02"
+ const val lint_version = "27.1.1"
  //If the Gradle plugin version is X.Y.Z, then the Lint library version is X+23.Y.Z.
 }
 

diff --git a/checks/src/main/java/com/github/guilhe/lint/ColorResourceInXml.kt b/checks/src/main/java/com/github/guilhe/lint/ColorResourceInXml.kt
@@ -18,9 +18,9 @@ class ColorResourceInXml : ResourceXmlDetector() {
  }
 
  override fun visitAttribute(context: XmlContext, attribute: Attr) {
- if (attribute.value != "@android:color/transparent" &&
- (attribute.value.startsWith("@color/") || (attribute.value.startsWith("@android:color/")))
- ) {
+ val ignore = attribute.namespaceURI == "http://schemas.android.com/tools"
+  || attribute.value == "@android:color/transparent"
+ if (ignore.not() && (attribute.value.startsWith("@color/") || attribute.value.startsWith("@android:color/"))) {
  reportUsage(context, attribute)
  }
  }
@@ -45,7 +45,10 @@ class ColorResourceInXml : ResourceXmlDetector() {
  priority = 7,
  severity = Severity.WARNING,
  androidSpecific = true,
- implementation = Implementation(ColorResourceInXml::class.java, Scope.RESOURCE_FILE_SCOPE)
+ implementation = Implementation(
+ ColorResourceInXml::class.java,
+ Scope.RESOURCE_FILE_SCOPE
+ )
  )
  }
 }
diff --git a/checks/src/main/java/com/github/guilhe/lint/DirectColorInXml.kt b/checks/src/main/java/com/github/guilhe/lint/DirectColorInXml.kt
@@ -15,7 +15,8 @@ class DirectColorInXml : ResourceXmlDetector() {
  }
 
  override fun visitAttribute(context: XmlContext, attribute: Attr) {
- if (attribute.value.startsWith("#")) {
+ val ignore = attribute.namespaceURI == "http://schemas.android.com/tools"
+ if (ignore.not() && attribute.value.startsWith("#")) {
  reportUsage(context, attribute)
  }
  }

diff --git a/checks/src/test/java/com/github/guilhe/lint/ColorResourceInXmlTest.kt b/checks/src/test/java/com/github/guilhe/lint/ColorResourceInXmlTest.kt
@@ -86,6 +86,27 @@ class ColorResourceInXmlTest {
  .expectClean()
  }
 
+ @Test
+ fun ignoringTools() {
+ val input = """
+ <?xml version="1.0" encoding="utf-8"?>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:background="@android:color/white"/>
+ """
+ .trimIndent()
+
+ TestLintTask.lint()
+ .files(TestFiles.xml("res/layout/test_layout.xml", input).indented())
+ .issues(ColorResourceInXml.ISSUE)
+ .run()
+ .expectClean()
+ }
+
  @Test
  fun cleanTestWithAttribute() {
  val input = """

diff --git a/checks/src/test/java/com/github/guilhe/lint/DirectColorInXmlTest.kt b/checks/src/test/java/com/github/guilhe/lint/DirectColorInXmlTest.kt
@@ -35,4 +35,25 @@ class DirectColorInXmlTest {
  .expect(output)
  .expectWarningCount(1)
  }
+
+ @Test
+ fun ignoringTools() {
+ val input = """
+ <?xml version="1.0" encoding="utf-8"?>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:custom="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ custom:background="@android:color/white"/>
+ """
+ .trimIndent()
+
+ TestLintTask.lint()
+ .files(TestFiles.xml("res/layout/test_layout.xml", input).indented())
+ .issues(ColorResourceInXml.ISSUE)
+ .run()
+ .expectClean()
+ }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:background="@android:color/white">
 
  <com.google.android.material.button.MaterialButton
  android:id="@+id/btn1"

diff --git a/styling-lint/gradle.properties b/styling-lint/gradle.properties
@@ -1,3 +1,3 @@
 artifact=styling-lint
 bintrayName=AndroidStyling-LintRules
-libraryVersion=2.0.0
+libraryVersion=2.0.1