A fully functional Android app built entirely with Kotlin and Jetpack Compose
Make code style default for project (#67)
Tomáš Mlynariče470b8e69a06
diff --git a/.gitignore b/.gitignoreindex ed6a9781b..d4482596d 100644--- a/.gitignore+++ b/.gitignore@@ -29,7 +29,11 @@ local.properties*.iml.idea/*!.idea/copyright-!.idea/codeStyles/codeStyleConfig.xml+# Keep the code styles.+!/.idea/codeStyles+/.idea/codeStyles/*+!/.idea/codeStyles/Project.xml+!/.idea/codeStyles/codeStyleConfig.xml# Gradle cache.gradlediff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xmlnew file mode 100644index 000000000..a24d14540--- /dev/null+++ b/.idea/codeStyles/Project.xml@@ -0,0 +1,332 @@+<component name="ProjectCodeStyleConfiguration">+ <code_scheme name="Project" version="173">+ <JavaCodeStyleSettings>+ <option name="ANNOTATION_PARAMETER_WRAP" value="1" />+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="5" />+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="3" />+ <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">+ <value>+ <package name="java.awt" withSubpackages="false" static="false" />+ <package name="javax.swing" withSubpackages="false" static="false" />+ </value>+ </option>+ <option name="IMPORT_LAYOUT_TABLE">+ <value>+ <package name="" withSubpackages="true" static="false" />+ <emptyLine />+ <package name="javax" withSubpackages="true" static="false" />+ <package name="java" withSubpackages="true" static="false" />+ <emptyLine />+ <package name="" withSubpackages="true" static="true" />+ </value>+ </option>+ <option name="JD_P_AT_EMPTY_LINES" value="false" />+ <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />+ <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />+ <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />+ <option name="JD_KEEP_EMPTY_RETURN" value="false" />+ <option name="JD_PRESERVE_LINE_FEEDS" value="true" />+ </JavaCodeStyleSettings>+ <JetCodeStyleSettings>+ <option name="PACKAGES_TO_USE_STAR_IMPORTS">+ <value />+ </option>+ <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="99" />+ <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="99" />+ <option name="IMPORT_NESTED_CLASSES" value="true" />+ <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />+ <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="false" />+ <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="false" />+ <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" />+ <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />+ <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />+ <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />+ <option name="IF_RPAREN_ON_NEW_LINE" value="true" />+ </JetCodeStyleSettings>+ <Properties>+ <option name="KEEP_BLANK_LINES" value="true" />+ </Properties>+ <XML>+ <option name="XML_ATTRIBUTE_WRAP" value="2" />+ </XML>+ <ADDITIONAL_INDENT_OPTIONS fileType="java">+ <option name="TAB_SIZE" value="8" />+ </ADDITIONAL_INDENT_OPTIONS>+ <ADDITIONAL_INDENT_OPTIONS fileType="js">+ <option name="CONTINUATION_INDENT_SIZE" value="4" />+ </ADDITIONAL_INDENT_OPTIONS>+ <codeStyleSettings language="JAVA">+ <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />+ <option name="ALIGN_MULTILINE_FOR" value="false" />+ <option name="CALL_PARAMETERS_WRAP" value="1" />+ <option name="PREFER_PARAMETERS_WRAP" value="true" />+ <option name="METHOD_PARAMETERS_WRAP" value="1" />+ <option name="RESOURCE_LIST_WRAP" value="1" />+ <option name="EXTENDS_LIST_WRAP" value="1" />+ <option name="THROWS_LIST_WRAP" value="1" />+ <option name="EXTENDS_KEYWORD_WRAP" value="1" />+ <option name="THROWS_KEYWORD_WRAP" value="1" />+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />+ <option name="BINARY_OPERATION_WRAP" value="1" />+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />+ <option name="TERNARY_OPERATION_WRAP" value="1" />+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />+ <option name="FOR_STATEMENT_WRAP" value="1" />+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />+ <option name="ASSIGNMENT_WRAP" value="1" />+ <option name="IF_BRACE_FORCE" value="3" />+ <option name="DOWHILE_BRACE_FORCE" value="3" />+ <option name="WHILE_BRACE_FORCE" value="3" />+ <option name="FOR_BRACE_FORCE" value="3" />+ <option name="WRAP_LONG_LINES" value="true" />+ <option name="PARAMETER_ANNOTATION_WRAP" value="1" />+ <option name="VARIABLE_ANNOTATION_WRAP" value="1" />+ <option name="ENUM_CONSTANTS_WRAP" value="1" />+ </codeStyleSettings>+ <codeStyleSettings language="JSON">+ <indentOptions>+ <option name="CONTINUATION_INDENT_SIZE" value="4" />+ <option name="TAB_SIZE" value="2" />+ </indentOptions>+ </codeStyleSettings>+ <codeStyleSettings language="XML">+ <option name="FORCE_REARRANGE_MODE" value="1" />+ <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>.*:layout_width</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>+ </AND>+ </match>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*:layout_height</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>+ </AND>+ </match>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*:layout_.*</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>+ </AND>+ </match>+ <order>BY_NAME</order>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*:width</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>+ </AND>+ </match>+ <order>BY_NAME</order>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*:height</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>+ </AND>+ </match>+ <order>BY_NAME</order>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*:viewportWidth</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>+ </AND>+ </match>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*:viewportHeight</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>+ </AND>+ </match>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>+ </AND>+ </match>+ <order>BY_NAME</order>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*:layout_.*</NAME>+ <XML_ATTRIBUTE />+ <XML_NAMESPACE>http://schemas.android.com/apk/res-auto</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-auto</XML_NAMESPACE>+ </AND>+ </match>+ <order>BY_NAME</order>+ </rule>+ </section>+ <section>+ <rule>+ <match>+ <AND>+ <NAME>.*:layout_.*</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>.*</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_WRAP" value="1" />+ <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />+ <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />+ <option name="METHOD_PARAMETERS_WRAP" value="5" />+ <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />+ <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />+ <option name="EXTENDS_LIST_WRAP" value="1" />+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />+ <option name="ASSIGNMENT_WRAP" value="1" />+ <option name="FIELD_ANNOTATION_WRAP" value="1" />+ <option name="PARAMETER_ANNOTATION_WRAP" value="1" />+ <option name="VARIABLE_ANNOTATION_WRAP" value="1" />+ <option name="ENUM_CONSTANTS_WRAP" value="5" />+ <indentOptions>+ <option name="CONTINUATION_INDENT_SIZE" value="4" />+ </indentOptions>+ </codeStyleSettings>+ </code_scheme>+</component>\ No newline at end of filediff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xmlnew file mode 100644index 000000000..79ee123c2--- /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 filediff --git a/tools/setup.sh b/tools/setup.shindex 14edf5bb3..2e062838a 100755--- a/tools/setup.sh+++ b/tools/setup.sh@@ -37,12 +37,7 @@ cp "${GIT_ROOT}/tools/pre-push" "${GIT_DIR}/hooks/pre-push" \&& chmod +x "${GIT_DIR}/hooks/pre-push"cat <<-EOF-Please import the code style settings in Android Studio:- * open Settings -> Editor -> Code Style- * click the gear icon and select "Import Scheme..."- * find the file ${GIT_ROOT}/tools/nowinandroid-codestyle.xml--Additionally, checking the following settings helps avoid miscellaneous issues:+Checking the following settings helps avoid miscellaneous issues:* Settings -> Editor -> General -> Remove trailing spaces on: Modified lines* Settings -> Editor -> General -> Ensure every file ends with a line break* Settings -> Editor -> General -> Auto Import -> Optimize imports on the fly (for both Kotlin\