diff --git a/.editorconfig b/.editorconfig index 66462ef..00b9c82 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,6 @@ charset = utf-8 indent_style = space trim_trailing_whitespace = true insert_final_newline = true -disabled_rules = max_line_length ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on ij_formatter_tags_enabled = false @@ -16,7 +15,7 @@ ij_smart_tabs = false ij_wrap_on_typing = false [{*.gradle.kts,*.kt,*.kts,*.main.kts}] -ktlint_code_style = ktlint_official +ktlint_function_naming_ignore_when_annotated_with=Composable, Test ij_continuation_indent_size = 2 ij_kotlin_imports_layout = * ij_kotlin_align_in_columns_case_branch = false diff --git a/.gitignore b/.gitignore index ba5138b..740bae7 100644 --- a/.gitignore +++ b/.gitignore @@ -64,12 +64,13 @@ captures/ # Keystore files *.jks *.keystore +*.kotlin # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild # Google Services (e.g. APIs or Firebase) -# google-services.json +google-services.json # Freeline freeline.py