all: remove prettier from Spotless and reformat XML

This commit is contained in:
Harsh Shandilya 2021-09-23 20:07:14 +05:30
parent 8e243359ab
commit ffcb270013
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
12 changed files with 41 additions and 67 deletions

View file

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<manifest <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" package="dev.msfjarvis.claw.android">
package="dev.msfjarvis.claw.android"
>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application <application
android:label="Claw" android:name=".ClawApplication"
android:supportsRtl="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="Claw"
android:roundIcon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher"
android:name=".ClawApplication" android:supportsRtl="true"
android:theme="@style/Theme.Claw" android:theme="@style/Theme.Claw">
> <activity
<activity android:name=".MainActivity" android:exported="true"> android:name=".MainActivity"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

View file

@ -1,5 +1,4 @@
<?xml <?xml version="1.0" encoding="utf-8" ?>
version="1.0" encoding="utf-8" ?>
<resources> <resources>
<bool name="use_light_status_bar">false</bool> <bool name="use_light_status_bar">false</bool>
</resources> </resources>

View file

@ -1,5 +1,4 @@
<?xml <?xml version="1.0" encoding="utf-8" ?>
version="1.0" encoding="utf-8" ?>
<resources> <resources>
<bool name="use_light_status_bar">true</bool> <bool name="use_light_status_bar">true</bool>
</resources> </resources>

View file

@ -35,12 +35,6 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
target("**/*.gradle.kts") target("**/*.gradle.kts")
ktfmt("0.28").googleStyle() ktfmt("0.28").googleStyle()
} }
format("xml") {
target("**/*.xml")
targetExclude("**/build/**", ".idea/**")
prettier(mapOf("prettier" to "2.3.2", "@prettier/plugin-xml" to "1.0.2"))
.config(mapOf("parser" to "xml", "tabWidth" to 2))
}
} }
allprojects { allprojects {

View file

@ -1,5 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<manifest <manifest package="dev.msfjarvis.claw.common" />
xmlns:android="http://schemas.android.com/apk/res/android"
package="dev.msfjarvis.claw.common"
/>

View file

@ -1,12 +1,9 @@
<vector <vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24">
>
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
/>
</vector> </vector>

View file

@ -1,12 +1,9 @@
<vector <vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24">
>
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" />
/>
</vector> </vector>

View file

@ -1,12 +1,9 @@
<vector <vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24">
>
<path <path
android:fillColor="#000000" android:fillColor="#000000"
android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" />
/>
</vector> </vector>

View file

@ -1,4 +1 @@
<manifest <manifest package="dev.msfjarvis.claw.database" />
xmlns:android="http://schemas.android.com/apk/res/android"
package="dev.msfjarvis.claw.database"
/>

View file

@ -1,3 +0,0 @@
# This is a nix-shell configuration to load nodejs in an impure shell, which
# is required by Spotless to format XML code.
with import <nixpkgs> { }; mkShell { buildInputs = [ nodejs-16_x ]; }