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

Commit 40e8a37b authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'features/ui-ux-improvements' into develop

parents 3a5df25f 4c3854c6

.gitignore

+57 −10
Original line number Diff line number Diff line 
.gradle

/.i

/local.properties

.DS_Store

/captures

.externalNativeBuild

.idea/

*iml

# Built application files

*.apk

*.aar

*.ap_

*.aab



# Files for the ART/Dalvik VM

*.dex



# Java class files

*.class



# Generated files

bin/

gen/

out/



# Gradle files

.gradle/

build/



# Local configuration file (sdk path, etc)

/local.properties



# Log Files

*.log



# General

.DS_Store



# Android Studio captures folder

/captures



# Android Studio Navigation editor temp files

.navigation/



# IntelliJ

*iml

.idea/workspace.xml

.idea/libraries

.idea/caches

.idea/navEditor.xml

.idea/tasks.xml

.idea/modules.xml

.idea/assetWizardSettings.xml

gradle.xml



.classpath

.project

lint.xml

/dist

ktlint



# External native build folder generated in Android Studio 2.2 and later

.externalNativeBuild

.cxx/



# lint

lint/intermediates/

lint/generated/

lint/outputs/

lint/tmp/



#ktlint

ktlint

.idea/codeStyles/Project.xml

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

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

    <AndroidXmlCodeStyleSettings>

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

    </AndroidXmlCodeStyleSettings>

    <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="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

    </JetCodeStyleSettings>

    <MarkdownNavigatorCodeStyleSettings>

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

    </MarkdownNavigatorCodeStyleSettings>

    <XML>

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

    </XML>

    <codeStyleSettings language="JSON">

      <indentOptions>

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

        <option name="TAB_SIZE" value="2" />

      </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="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />

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

      <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" />

      <indentOptions>

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

      </indentOptions>

    </codeStyleSettings>

    <codeStyleSettings language="protobuf">

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

      <indentOptions>

        <option name="INDENT_SIZE" value="2" />

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

        <option name="TAB_SIZE" value="2" />

      </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

.idea/encodings.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="Encoding">

    <file url="PROJECT" charset="UTF-8" />

  </component>

</project>
 
 No newline at end of file

.idea/inspectionProfiles/ktlint.xml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<component name="InspectionProjectProfileManager">

  <profile version="1.0">

    <option name="myName" value="ktlint" />

    <inspection_tool class="KotlinUnusedImport" enabled="true" level="ERROR" enabled_by_default="true" />

    <inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" />

  </profile>

</component>
 
 No newline at end of file