From fa5f94033905fe387dbae1c3c7f303053cbfc5df Mon Sep 17 00:00:00 2001
From: Pavel Potanin <pavpotanin@gmail.com>
Date: Wed, 4 Sep 2019 21:40:11 +0300
Subject: [PATCH] Android Studio 3.5 Upgrade XML

---
 configs/codestyles/SquareAndroid.xml | 36 +++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 2ccd565..a3cb906 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -295,28 +295,40 @@
         <section>
           <rule>
             <match>
-              <NAME>class</NAME>
+              <AND>
+                <NAME>class</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
           </rule>
         </section>
         <section>
           <rule>
             <match>
-              <NAME>layout</NAME>
+              <AND>
+                <NAME>layout</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
           </rule>
         </section>
         <section>
           <rule>
             <match>
-              <NAME>xmlns:android</NAME>
+              <AND>
+                <NAME>xmlns:android</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
           </rule>
         </section>
         <section>
           <rule>
             <match>
-              <NAME>xmlns:.*</NAME>
+              <AND>
+                <NAME>xmlns:.*</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
             <order>BY_NAME</order>
           </rule>
@@ -326,6 +338,7 @@
             <match>
               <AND>
                 <NAME>.*:id</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -346,6 +359,7 @@
             <match>
               <AND>
                 <NAME>.*:layout_width</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -356,6 +370,7 @@
             <match>
               <AND>
                 <NAME>.*:layout_height</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -366,6 +381,7 @@
             <match>
               <AND>
                 <NAME>.*:layout_.*</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -377,6 +393,7 @@
             <match>
               <AND>
                 <NAME>.*</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
               </AND>
             </match>
@@ -388,6 +405,7 @@
             <match>
               <AND>
                 <NAME>app:layout_.*</NAME>
+                <XML_ATTRIBUTE />
                 <XML_NAMESPACE>http://schemas.android.com/apk/res-auto</XML_NAMESPACE>
               </AND>
             </match>
@@ -397,7 +415,10 @@
         <section>
           <rule>
             <match>
-              <NAME>.*(?&lt;!style)$</NAME>
+              <AND>
+                <NAME>.*(?&lt;!style)$</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
             <order>BY_NAME</order>
           </rule>
@@ -405,7 +426,10 @@
         <section>
           <rule>
             <match>
-              <NAME>style</NAME>
+              <AND>
+                <NAME>style</NAME>
+                <XML_ATTRIBUTE />
+              </AND>
             </match>
           </rule>
         </section>