diff options
author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-05-10 19:21:39 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-10 19:21:39 +0530 |
commit | 041cf00510a75042223d1857660fc7f1dff958ef (patch) | |
tree | 1b56e67e2b71afe23ac51b680b62ad778272f162 /.idea | |
parent | 94dc92f8d70870b57a7f8c4fe8adef152c1211ce (diff) |
Treewide codestyle cleanup (#765)
- Updated gitignore and checked in the IDE's codestyle config
- Removed spotless as the underlying ktlint backend has failed to resolve the super frustrating import order bug[1] in nearly a year
- Reformat the entire codebase based on the previously committed code style configuration.
1: https://github.com/pinterest/ktlint/issues/527
Diffstat (limited to '.idea')
-rw-r--r-- | .idea/codeStyles/Project.xml | 168 | ||||
-rw-r--r-- | .idea/codeStyles/codeStyleConfig.xml | 5 | ||||
-rw-r--r-- | .idea/copyright/APS.xml | 6 | ||||
-rw-r--r-- | .idea/gradle.xml | 22 | ||||
-rw-r--r-- | .idea/runConfigurations.xml | 12 |
5 files changed, 213 insertions, 0 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..d365c987 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,168 @@ +<component name="ProjectCodeStyleConfiguration"> + <code_scheme name="Project" version="173"> + <option name="AUTODETECT_INDENTS" value="false" /> + <option name="LINE_SEPARATOR" value=" " /> + <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" /> + <option name="FORMATTER_TAGS_ENABLED" value="true" /> + <option name="SOFT_MARGINS" value="100" /> + <JavaCodeStyleSettings> + <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" /> + </JavaCodeStyleSettings> + <JetCodeStyleSettings> + <option name="PACKAGES_TO_USE_STAR_IMPORTS"> + <value /> + </option> + <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" /> + <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" /> + <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="true" /> + <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="true" /> + <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="true" /> + <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="true" /> + <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="true" /> + <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="true" /> + <option name="CONTINUATION_INDENT_IN_ELVIS" value="true" /> + <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="0" /> + <option name="IF_RPAREN_ON_NEW_LINE" value="false" /> + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> + </JetCodeStyleSettings> + <codeStyleSettings language="JAVA"> + <option name="METHOD_ANNOTATION_WRAP" value="0" /> + <option name="FIELD_ANNOTATION_WRAP" value="0" /> + <indentOptions> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + </indentOptions> + </codeStyleSettings> + <codeStyleSettings language="XML"> + <indentOptions> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + </indentOptions> + <arrangement> + <rules> + <section> + <rule> + <match> + <AND> + <NAME>xmlns:android</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>xmlns:.*</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:id</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*:name</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>name</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>style</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>^$</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> + </AND> + </match> + <order>ANDROID_ATTRIBUTE_ORDER</order> + </rule> + </section> + <section> + <rule> + <match> + <AND> + <NAME>.*</NAME> + <XML_ATTRIBUTE /> + <XML_NAMESPACE>.*</XML_NAMESPACE> + </AND> + </match> + <order>BY_NAME</order> + </rule> + </section> + </rules> + </arrangement> + </codeStyleSettings> + <codeStyleSettings language="kotlin"> + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> + <option name="RIGHT_MARGIN" value="100" /> + <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" /> + <option name="CALL_PARAMETERS_WRAP" value="0" /> + <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="false" /> + <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="false" /> + <option name="METHOD_PARAMETERS_WRAP" value="0" /> + <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="false" /> + <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="false" /> + <option name="EXTENDS_LIST_WRAP" value="0" /> + <option name="METHOD_CALL_CHAIN_WRAP" value="0" /> + <option name="ASSIGNMENT_WRAP" value="0" /> + <option name="METHOD_ANNOTATION_WRAP" value="0" /> + <option name="FIELD_ANNOTATION_WRAP" value="0" /> + <option name="WRAP_ON_TYPING" value="0" /> + <indentOptions> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + </indentOptions> + </codeStyleSettings> + </code_scheme> +</component>
\ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ +<component name="ProjectCodeStyleConfiguration"> + <state> + <option name="USE_PER_PROJECT_SETTINGS" value="true" /> + </state> +</component>
\ No newline at end of file diff --git a/.idea/copyright/APS.xml b/.idea/copyright/APS.xml new file mode 100644 index 00000000..d8991639 --- /dev/null +++ b/.idea/copyright/APS.xml @@ -0,0 +1,6 @@ +<component name="CopyrightManager"> + <copyright> + <option name="notice" value="/* * Copyright © 2014-&#36;today.year The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ " /> + <option name="myName" value="APS" /> + </copyright> +</component>
\ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..2df14bed --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="GradleMigrationSettings" migrationVersion="1" /> + <component name="GradleSettings"> + <option name="linkedExternalProjectsSettings"> + <GradleProjectSettings> + <option name="testRunner" value="PLATFORM" /> + <option name="distributionType" value="LOCAL" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="gradleHome" value="$USER_HOME$/.sdkman/candidates/gradle/current" /> + <option name="modules"> + <set> + <option value="$PROJECT_DIR$" /> + <option value="$PROJECT_DIR$/app" /> + </set> + </option> + <option name="resolveModulePerSourceSet" value="false" /> + <option name="useQualifiedModuleNames" value="true" /> + </GradleProjectSettings> + </option> + </component> +</project>
\ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RunConfigurationProducerService"> + <option name="ignoredProducers"> + <set> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> + <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> + </set> + </option> + </component> +</project>
\ No newline at end of file |