Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 2fb7fcae authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #4293 from k9mail/ktlint 

Add ktlint and Kotlin code style settings for Android Studio
parents db405b05 e99dacbf

.idea/codeStyles/Project.xml

0 → 100644
+143 −0
Original line number Diff line number Diff line 
<component name="ProjectCodeStyleConfiguration">

  <code_scheme name="Project" version="173">

    <option name="AUTODETECT_INDENTS" value="false" />

    <option name="LINE_SEPARATOR" value="&#10;" />

    <option name="RIGHT_MARGIN" value="120" />

    <option name="SOFT_MARGINS" value="120" />

    <JetCodeStyleSettings>

      <option name="PACKAGES_TO_USE_STAR_IMPORTS">

        <value>

          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />

        </value>

      </option>

      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />

      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />

    </JetCodeStyleSettings>

    <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="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />

      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />

      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />

      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />

      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />

      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />

      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />

      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />

      <option name="ASSIGNMENT_WRAP" value="1" />

      <indentOptions>

        <option name="CONTINUATION_INDENT_SIZE" value="4" />

      </indentOptions>

    </codeStyleSettings>

  </code_scheme>

</component>
 
 No newline at end of file

.idea/codeStyles/codeStyleConfig.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<component name="ProjectCodeStyleConfiguration">

  <state>

    <option name="USE_PER_PROJECT_SETTINGS" value="true" />

  </state>

</component>
 
 No newline at end of file

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ android: 
dist: trusty

jdk: oraclejdk8



script: ./gradlew testDebug
 
script: ./gradlew ktlintCheck testDebug

app/autodiscovery/build.gradle

+1 −0
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'

apply plugin: 'org.jetbrains.kotlin.android'

apply plugin: 'org.jlleitschuh.gradle.ktlint'



dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"

app/autodiscovery/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt

+8 −9
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ import com.fsck.k9.autodiscovery.ConnectionSettingsDiscovery 
import com.fsck.k9.backend.BackendManager

import com.fsck.k9.helper.EmailHelper

import com.fsck.k9.helper.UrlEncodingHelper

import org.xmlpull.v1.XmlPullParser

import timber.log.Timber

import java.net.URI

import java.net.URISyntaxException

import org.xmlpull.v1.XmlPullParser

import timber.log.Timber



class ProvidersXmlDiscovery(

    private val backendManager: BackendManager,
@@ -108,7 +108,6 @@ class ProvidersXmlDiscovery( 
        }

    }





    internal data class Provider(

        val incomingUriTemplate: String,

        val incomingUsernameTemplate: String,