From b07048261863d7629e93c53555dd6ff326e74f82 Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Sat, 11 Apr 2026 16:01:05 -0300 Subject: [PATCH 1/7] Refactor `run_detekt.sh` script to use variables and improve flexibility - Introduce `INPUT_PATH` variable and use existing `DETEKT_CONFIG` and `DETEKT_CLI` variables in the execution command. - Update the execution command to use explicit flags (`--input`, `--config`, `--excludes`, `--debug`) instead of short-form arguments. - Simplify the error message when the Detekt CLI is not found. --- scripts/linter/run_detekt.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/linter/run_detekt.sh b/scripts/linter/run_detekt.sh index 9298f4d..5d81fe1 100644 --- a/scripts/linter/run_detekt.sh +++ b/scripts/linter/run_detekt.sh @@ -3,11 +3,12 @@ # Default configuration path DETEKT_CONFIG="../../config/detekt/detekt.yml" DETEKT_CLI="detekt" +INPUT_PATH="../../" # Check if detekt is installed if ! command -v $DETEKT_CLI &> /dev/null then - echo "Detekt CLI could not be found. Please run 'scripts/linter/install-detekt.sh' first." + echo "Detekt CLI could not be found. Please install detekt first." exit 1 fi @@ -15,4 +16,4 @@ fi # --config: path to config file # --input: path(s) to scan # --report: where to save output (xml, html, txt) -detekt -i ../../ -c "../../config/detekt/detekt.yml" -ex "**/build/**" \ No newline at end of file +$DETEKT_CLI --input "$INPUT_PATH" --config "$DETEKT_CONFIG" --excludes "**/build/**" --debug \ No newline at end of file From b8d594d54bc5c36ac8b1c1c48d2900d05a56865e Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Sat, 11 Apr 2026 16:08:50 -0300 Subject: [PATCH 2/7] Update GitHub workflow and MegaLinter configuration - Standardize quote usage in GitHub `build.yml` workflow. - Disable `MARKDOWN_MARKDOWNLINT` in MegaLinter configuration. - Remove redundant Markdown lint configuration settings and comments. - Add `JAVASCRIPT_PRETTIER_FILTER_REGEX_INCLUDE` to target the `.github/` directory in MegaLinter. --- .github/workflows/build.yml | 4 ++-- .mega-linter.yml | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83726ec..2dacf4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,7 +70,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: "temurin" java-version: 17 - name: Grant permission to gradlew @@ -98,4 +98,4 @@ jobs: build - name: Run iOS/CommonMain unit tests - run: ./gradlew iosSimulatorArm64Test \ No newline at end of file + run: ./gradlew iosSimulatorArm64Test diff --git a/.mega-linter.yml b/.mega-linter.yml index 6eff1ff..1b4a6b4 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -14,7 +14,6 @@ APPLY_FIXES: none # default ENABLE_LINTERS: - YAML_PRETTIER - - MARKDOWN_MARKDOWNLINT - KOTLIN_DETEKT DISABLE: @@ -25,10 +24,5 @@ SHOW_ELAPSED_TIME: true FILEIO_REPORTER: false -# Uncomment if you want MegaLinter to detect errors but not block CI to pass -# DISABLE_ERRORS: true -MARKDOWN_MARKDOWNLINT_CONFIG_FILE: .markdownlint.json -MARKDOWN_MARKDOWNLINT_DISABLE_ERRORS: false KOTLIN_DETEKT_ARGUMENTS: -c config/detekt/detekt.yml -ex "**/build/**" - -DISABLE_ERRORS: true +JAVASCRIPT_PRETTIER_FILTER_REGEX_INCLUDE: .github/ \ No newline at end of file From a85f2dd3084555c2b498b4020126f92d14b1b05a Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Sat, 11 Apr 2026 16:12:36 -0300 Subject: [PATCH 3/7] Add Prettier script and update Mega-Linter configuration - Add `run_prettier.sh` script to automate formatting for the `.github` directory. - Remove `JAVASCRIPT_PRETTIER_FILTER_REGEX_INCLUDE` from `.mega-linter.yml`. --- .mega-linter.yml | 3 +-- scripts/linter/run_prettier.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 scripts/linter/run_prettier.sh diff --git a/.mega-linter.yml b/.mega-linter.yml index 1b4a6b4..4c09bbe 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -24,5 +24,4 @@ SHOW_ELAPSED_TIME: true FILEIO_REPORTER: false -KOTLIN_DETEKT_ARGUMENTS: -c config/detekt/detekt.yml -ex "**/build/**" -JAVASCRIPT_PRETTIER_FILTER_REGEX_INCLUDE: .github/ \ No newline at end of file +KOTLIN_DETEKT_ARGUMENTS: -c config/detekt/detekt.yml -ex "**/build/**" \ No newline at end of file diff --git a/scripts/linter/run_prettier.sh b/scripts/linter/run_prettier.sh new file mode 100755 index 0000000..7238f80 --- /dev/null +++ b/scripts/linter/run_prettier.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Default configuration path +PRETTIER_CLI="prettier" +INPUT_PATH="../../.github" + +# Check if detekt is installed +if ! command -v $PRETTIER_CLI &> /dev/null +then + echo "Prettier CLI could not be found. Please install prettier first." + exit 1 +fi + +# Run Prettier +$PRETTIER_CLI --write "$INPUT_PATH" \ No newline at end of file From 07defb1dc0045b0daa1a3f14a62bc3d91acfabe9 Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Sat, 11 Apr 2026 16:24:15 -0300 Subject: [PATCH 4/7] Update markdown documentation and configure markdownlint - Add titles to `CONTRIBUTOR_PROJECT.md` and `CONTRIBUTOR_WIKI.md`. - Disable several rules in `.markdownlint.json`, including `MD013`, `MD045`, `MD036`, `MD051`, `MD040`, and `MD033`. - Create `run_markdownlint.sh` script to automate linting and fixing of markdown files. - Enable `MARKDOWN_MARKDOWNLINT` in `.mega-linter.yml`. --- .markdownlint.json | 9 ++++++--- .mega-linter.yml | 1 + CONTRIBUTOR_PROJECT.md | 2 ++ CONTRIBUTOR_WIKI.md | 2 ++ scripts/linter/run_markdownlint.sh | 16 ++++++++++++++++ 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100755 scripts/linter/run_markdownlint.sh diff --git a/.markdownlint.json b/.markdownlint.json index bef4aa8..3dc5dbf 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -1,5 +1,8 @@ { - "MD033": { - "allowed_elements": ["img", "a"] - } + "MD013": false, + "MD045": false, + "MD036": false, + "MD051": false, + "MD040": false, + "MD033": false } diff --git a/.mega-linter.yml b/.mega-linter.yml index 4c09bbe..deff3a3 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -14,6 +14,7 @@ APPLY_FIXES: none # default ENABLE_LINTERS: - YAML_PRETTIER + - MARKDOWN_MARKDOWNLINT - KOTLIN_DETEKT DISABLE: diff --git a/CONTRIBUTOR_PROJECT.md b/CONTRIBUTOR_PROJECT.md index f61c5c0..c347531 100644 --- a/CONTRIBUTOR_PROJECT.md +++ b/CONTRIBUTOR_PROJECT.md @@ -1,3 +1,5 @@ +# Contribuindo para o projeto + **1. Abra a parte de ISSUES do GitHub e escolha uma issue que você se identifica ou gostaria de explorá-la.** - 1.1. Caso você queira aprender algo ou quer explorar o processo de mentoria ou está na dúvida sobre o que pegar. diff --git a/CONTRIBUTOR_WIKI.md b/CONTRIBUTOR_WIKI.md index 7ab1efb..6853d9a 100644 --- a/CONTRIBUTOR_WIKI.md +++ b/CONTRIBUTOR_WIKI.md @@ -1,3 +1,5 @@ +# Criando o seu Pull Request na Wiki + **1. Faça um fork do repositório** **2. Clone o repositório** diff --git a/scripts/linter/run_markdownlint.sh b/scripts/linter/run_markdownlint.sh new file mode 100755 index 0000000..3659e86 --- /dev/null +++ b/scripts/linter/run_markdownlint.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# Default configuration path +MD_CONFIG="../../.markdownlint.json" +MD_CLI="markdownlint" +INPUT_PATH="../../" + +# Check if detekt is installed +if ! command -v $MD_CLI &> /dev/null +then + echo "Markdownlint CLI could not be found. Please install Markdownlint first." + exit 1 +fi + +# Run Prettier +$MD_CLI --config "$MD_CONFIG" --fix "$INPUT_PATH" \ No newline at end of file From 9efbbf3687d0b7c060fc4d693feeb724f757a716 Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Sat, 11 Apr 2026 16:28:10 -0300 Subject: [PATCH 5/7] Update PULL_REQUEST_TEMPLATE.md header style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Change "Descrição" header from H2 to H1 in `.github/PULL_REQUEST_TEMPLATE.md`. --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9e5b74d..6f7ccc1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ -## Descrição +# Descrição [Descrição das alterações feitas no código ou nas funcionalidades.] From 8adfd21c5b4a112588aa4899965a0e7f6b8ff525 Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Sat, 11 Apr 2026 16:30:43 -0300 Subject: [PATCH 6/7] Update Prettier script path and reformat project files - Update `INPUT_PATH` in `run_prettier.sh` to target the project root instead of the `.github` directory. - Reformat Lottie `logo.json` and iOS asset `Contents.json` files for consistent JSON formatting. - Update italicization syntax in `CODE_OF_CONDUCT.md`. - Apply minor whitespace and formatting cleanup to `detekt.yml`, `.mega-linter.yml`, and `google-services.json`. --- .mega-linter.yml | 2 +- CODE_OF_CONDUCT.md | 2 +- composeApp/kotzilla.json | 2 +- .../composeResources/files/lottie/logo.json | 4870 ++++------------- composeApp/src/google-services.json | 2 +- config/detekt/detekt.yml | 2 +- .../AccentColor.colorset/Contents.json | 12 +- .../AppIcon.appiconset/Contents.json | 16 +- .../AppIcon__.appiconset/Contents.json | 16 +- iosApp/iosApp/Assets.xcassets/Contents.json | 6 +- .../Preview Assets.xcassets/Contents.json | 8 +- scripts/linter/run_prettier.sh | 2 +- 12 files changed, 1014 insertions(+), 3926 deletions(-) diff --git a/.mega-linter.yml b/.mega-linter.yml index deff3a3..00e43fe 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -25,4 +25,4 @@ SHOW_ELAPSED_TIME: true FILEIO_REPORTER: false -KOTLIN_DETEKT_ARGUMENTS: -c config/detekt/detekt.yml -ex "**/build/**" \ No newline at end of file +KOTLIN_DETEKT_ARGUMENTS: -c config/detekt/detekt.yml -ex "**/build/**" diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index e9de9ef..655d859 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -33,4 +33,4 @@ This Code of Conduct is based on the [JetBrains Code of Conduct](https://github. --- -*Version 1.0 — This document may evolve as the project grows.* +_Version 1.0 — This document may evolve as the project grows._ diff --git a/composeApp/kotzilla.json b/composeApp/kotzilla.json index f122c2e..8ef542e 100644 --- a/composeApp/kotzilla.json +++ b/composeApp/kotzilla.json @@ -8,4 +8,4 @@ "apiKey": "ktz-sdk-_sEL6C-eAYe1KiqBm1mOv1BoKAOtOFpeK40ADc49LaA" } ] -} \ No newline at end of file +} diff --git a/composeApp/src/commonMain/composeResources/files/lottie/logo.json b/composeApp/src/commonMain/composeResources/files/lottie/logo.json index 32536ff..5242ec2 100644 --- a/composeApp/src/commonMain/composeResources/files/lottie/logo.json +++ b/composeApp/src/commonMain/composeResources/files/lottie/logo.json @@ -28,75 +28,43 @@ "k": [ { "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] + "x": [0.667], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 18, - "s": [ - 0 - ] + "s": [0] }, { "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] + "x": [0.833], + "y": [1] }, "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] + "x": [0.167], + "y": [0] }, "t": 28.666, - "s": [ - 100 - ] + "s": [100] }, { "i": { - "x": [ - 1 - ], - "y": [ - 1 - ] + "x": [1], + "y": [1] }, "o": { - "x": [ - 0.612 - ], - "y": [ - 0 - ] + "x": [0.612], + "y": [0] }, "t": 114, - "s": [ - 100 - ] + "s": [100] }, { "t": 142, - "s": [ - 0 - ] + "s": [0] } ], "ix": 11 @@ -119,40 +87,20 @@ "y": 0 }, "t": 104, - "s": [ - 256, - 256, - 0 - ], - "to": [ - -24.667, - 0, - 0 - ], - "ti": [ - 24.667, - 0, - 0 - ] + "s": [256, 256, 0], + "to": [-24.667, 0, 0], + "ti": [24.667, 0, 0] }, { "t": 154.74609375, - "s": [ - 108, - 256, - 0 - ] + "s": [108, 256, 0] } ], "ix": 2 }, "a": { "a": 0, - "k": [ - 0.209, - 0.143, - 0 - ], + "k": [0.209, 0.143, 0], "ix": 1 }, "s": { @@ -160,43 +108,19 @@ "k": [ { "i": { - "x": [ - 0.461, - 0.461, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] + "x": [0.461, 0.461, 0.667], + "y": [1, 1, 1] }, "o": { - "x": [ - 0.655, - 0.655, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] + "x": [0.655, 0.655, 0.333], + "y": [0, 0, 0] }, "t": 46, - "s": [ - 66, - 66, - 100 - ] + "s": [66, 66, 100] }, { "t": 104, - "s": [ - 21, - 21, - 100 - ] + "s": [21, 21, 100] } ], "ix": 6 @@ -227,58 +151,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - 120.607, - 218.722 - ], - [ - 31.805, - 211.525 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [120.607, 218.722], + [31.805, 211.525], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -297,58 +185,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -119.9, - -218.21 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [-34.128, -218.21], + [-119.9, -218.21], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -367,58 +219,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -119.9, - -218.21 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [-34.128, -218.21], + [-119.9, -218.21], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -429,58 +245,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 44.422, - -6.307 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [44.422, -6.307], + [0, 0] ], "v": [ - [ - -47.223, - -218.706 - ], - [ - -102.043, - -218.706 - ], - [ - 41.501, - 198.117 - ], - [ - 102.46, - 192.802 - ] + [-47.223, -218.706], + [-102.043, -218.706], + [41.501, 198.117], + [102.46, 192.802] ], "c": true } @@ -497,12 +277,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.898039215686, - 0.035294117647, - 0.078431372549, - 1 - ], + "k": [0.898039215686, 0.035294117647, 0.078431372549, 1], "ix": 4 }, "o": { @@ -520,26 +295,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -593,75 +359,43 @@ "k": [ { "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] + "x": [0.667], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 0, - "s": [ - 0 - ] + "s": [0] }, { "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] + "x": [0.833], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 10.666, - "s": [ - 100 - ] + "s": [100] }, { "i": { - "x": [ - 1 - ], - "y": [ - 1 - ] + "x": [1], + "y": [1] }, "o": { - "x": [ - 0.612 - ], - "y": [ - 0 - ] + "x": [0.612], + "y": [0] }, "t": 114, - "s": [ - 100 - ] + "s": [100] }, { "t": 142, - "s": [ - 0 - ] + "s": [0] } ], "ix": 11 @@ -673,29 +407,17 @@ }, "p": { "a": 0, - "k": [ - 77.223, - 0, - 0 - ], + "k": [77.223, 0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 77.223, - 0, - 0 - ], + "k": [77.223, 0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100, - 100 - ], + "k": [100, 100, 100], "ix": 6 } }, @@ -724,58 +446,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 1.198, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [1.198, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -0.901, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-0.901, 0], + [0, 0] ], "v": [ - [ - 34.099, - -359.119 - ], - [ - 120.288, - -359.43 - ], - [ - 120.49, - -359.888 - ], - [ - 33.164, - -359.117 - ] + [34.099, -359.119], + [120.288, -359.43], + [120.49, -359.888], + [33.164, -359.117] ], "c": true } @@ -794,58 +480,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - 0.875 - ] + [0, 0], + [0, 0], + [0, 0], + [28.673, 0.875] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-28.673, -3.601], + [0, 0] ], "v": [ - [ - 34.128, - -218.21 - ], - [ - 120.318, - -218.521 - ], - [ - 120.318, - 218.521 - ], - [ - 34.128, - 211.337 - ] + [34.128, -218.21], + [120.318, -218.521], + [120.318, 218.521], + [34.128, 211.337] ], "c": true } @@ -864,58 +514,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - 0.875 - ] + [0, 0], + [0, 0], + [0, 0], + [28.673, 0.875] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-28.673, -3.601], + [0, 0] ], "v": [ - [ - 34.128, - -218.21 - ], - [ - 120.318, - -218.521 - ], - [ - 120.318, - 218.521 - ], - [ - 34.128, - 211.337 - ] + [34.128, -218.21], + [120.318, -218.521], + [120.318, 218.521], + [34.128, 211.337] ], "c": true } @@ -926,58 +540,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.249, - -4.53 - ] + [0, 0], + [0, 0], + [0, 0], + [28.249, -4.53] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -27.545, - 1.34 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-27.545, 1.34], + [0, 0] ], "v": [ - [ - 48.414, - -218.706 - ], - [ - 114.365, - -217.965 - ], - [ - 116.869, - 194.041 - ], - [ - 44.408, - 201.102 - ] + [48.414, -218.706], + [114.365, -217.965], + [116.869, 194.041], + [44.408, 201.102] ], "c": true } @@ -994,12 +572,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.694117647059, - 0.023529411765, - 0.058823529412, - 1 - ], + "k": [0.694117647059, 0.023529411765, 0.058823529412, 1], "ix": 4 }, "o": { @@ -1017,26 +590,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -1089,75 +653,43 @@ "k": [ { "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] + "x": [0.667], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 18, - "s": [ - 0 - ] + "s": [0] }, { "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] + "x": [0.833], + "y": [1] }, "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] + "x": [0.167], + "y": [0] }, "t": 28.666, - "s": [ - 100 - ] + "s": [100] }, { "i": { - "x": [ - 1 - ], - "y": [ - 1 - ] + "x": [1], + "y": [1] }, "o": { - "x": [ - 0.612 - ], - "y": [ - 0 - ] + "x": [0.612], + "y": [0] }, "t": 114, - "s": [ - 100 - ] + "s": [100] }, { "t": 142, - "s": [ - 0 - ] + "s": [0] } ], "ix": 11 @@ -1180,40 +712,20 @@ "y": 0 }, "t": 104, - "s": [ - 256, - 256, - 0 - ], - "to": [ - -24.667, - 0, - 0 - ], - "ti": [ - 24.667, - 0, - 0 - ] + "s": [256, 256, 0], + "to": [-24.667, 0, 0], + "ti": [24.667, 0, 0] }, { "t": 154.74609375, - "s": [ - 108, - 256, - 0 - ] + "s": [108, 256, 0] } ], "ix": 2 }, "a": { "a": 0, - "k": [ - 0.209, - 0.143, - 0 - ], + "k": [0.209, 0.143, 0], "ix": 1 }, "s": { @@ -1221,43 +733,19 @@ "k": [ { "i": { - "x": [ - 0.461, - 0.461, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] + "x": [0.461, 0.461, 0.667], + "y": [1, 1, 1] }, "o": { - "x": [ - 0.655, - 0.655, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] + "x": [0.655, 0.655, 0.333], + "y": [0, 0, 0] }, "t": 46, - "s": [ - 66, - 66, - 100 - ] + "s": [66, 66, 100] }, { "t": 104, - "s": [ - 21, - 21, - 100 - ] + "s": [21, 21, 100] } ], "ix": 6 @@ -1280,12 +768,7 @@ "ix": 1, "v": { "a": 0, - "k": [ - 0.086274512112, - 0, - 0.0074725952, - 1 - ], + "k": [0.086274512112, 0, 0.0074725952, 1], "ix": 1 } }, @@ -1371,58 +854,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - 120.607, - 218.722 - ], - [ - 31.805, - 211.525 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [120.607, 218.722], + [31.805, 211.525], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -1441,58 +888,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -119.9, - -218.21 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [-34.128, -218.21], + [-119.9, -218.21], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -1511,58 +922,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -119.9, - -218.21 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [-34.128, -218.21], + [-119.9, -218.21], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -1573,58 +948,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 44.422, - -6.307 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [44.422, -6.307], + [0, 0] ], "v": [ - [ - -47.223, - -218.706 - ], - [ - -102.043, - -218.706 - ], - [ - 41.501, - 198.117 - ], - [ - 102.46, - 192.802 - ] + [-47.223, -218.706], + [-102.043, -218.706], + [41.501, 198.117], + [102.46, 192.802] ], "c": true } @@ -1641,12 +980,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.898039215686, - 0.035294117647, - 0.078431372549, - 1 - ], + "k": [0.898039215686, 0.035294117647, 0.078431372549, 1], "ix": 4 }, "o": { @@ -1664,26 +998,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -1724,26 +1049,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -1796,75 +1112,43 @@ "k": [ { "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] + "x": [0.667], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 0, - "s": [ - 0 - ] + "s": [0] }, { "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] + "x": [0.833], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 10.666, - "s": [ - 100 - ] + "s": [100] }, { "i": { - "x": [ - 1 - ], - "y": [ - 1 - ] + "x": [1], + "y": [1] }, "o": { - "x": [ - 0.612 - ], - "y": [ - 0 - ] + "x": [0.612], + "y": [0] }, "t": 114, - "s": [ - 100 - ] + "s": [100] }, { "t": 142, - "s": [ - 0 - ] + "s": [0] } ], "ix": 11 @@ -1876,29 +1160,17 @@ }, "p": { "a": 0, - "k": [ - 77.223, - 0, - 0 - ], + "k": [77.223, 0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 77.223, - 0, - 0 - ], + "k": [77.223, 0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100, - 100 - ], + "k": [100, 100, 100], "ix": 6 } }, @@ -1927,58 +1199,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 1.198, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [1.198, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -0.901, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-0.901, 0], + [0, 0] ], "v": [ - [ - 34.099, - -359.119 - ], - [ - 120.288, - -359.43 - ], - [ - 120.49, - -359.888 - ], - [ - 33.164, - -359.117 - ] + [34.099, -359.119], + [120.288, -359.43], + [120.49, -359.888], + [33.164, -359.117] ], "c": true } @@ -1997,58 +1233,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - 0.875 - ] + [0, 0], + [0, 0], + [0, 0], + [28.673, 0.875] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-28.673, -3.601], + [0, 0] ], "v": [ - [ - 34.128, - -218.21 - ], - [ - 120.318, - -218.521 - ], - [ - 120.318, - 218.521 - ], - [ - 34.128, - 211.337 - ] + [34.128, -218.21], + [120.318, -218.521], + [120.318, 218.521], + [34.128, 211.337] ], "c": true } @@ -2067,58 +1267,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - 0.875 - ] + [0, 0], + [0, 0], + [0, 0], + [28.673, 0.875] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-28.673, -3.601], + [0, 0] ], "v": [ - [ - 34.128, - -218.21 - ], - [ - 120.318, - -218.521 - ], - [ - 120.318, - 218.521 - ], - [ - 34.128, - 211.337 - ] + [34.128, -218.21], + [120.318, -218.521], + [120.318, 218.521], + [34.128, 211.337] ], "c": true } @@ -2129,58 +1293,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.249, - -4.53 - ] + [0, 0], + [0, 0], + [0, 0], + [28.249, -4.53] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -27.545, - 1.34 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-27.545, 1.34], + [0, 0] ], "v": [ - [ - 48.414, - -218.706 - ], - [ - 114.365, - -217.965 - ], - [ - 116.869, - 194.041 - ], - [ - 44.408, - 201.102 - ] + [48.414, -218.706], + [114.365, -217.965], + [116.869, 194.041], + [44.408, 201.102] ], "c": true } @@ -2197,12 +1325,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.694117647059, - 0.023529411765, - 0.058823529412, - 1 - ], + "k": [0.694117647059, 0.023529411765, 0.058823529412, 1], "ix": 4 }, "o": { @@ -2220,26 +1343,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -2293,75 +1407,43 @@ "k": [ { "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] + "x": [0.667], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 38, - "s": [ - 0 - ] + "s": [0] }, { "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] + "x": [0.833], + "y": [1] }, "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] + "x": [0.167], + "y": [0] }, "t": 48.666, - "s": [ - 100 - ] + "s": [100] }, { "i": { - "x": [ - 1 - ], - "y": [ - 1 - ] + "x": [1], + "y": [1] }, "o": { - "x": [ - 0.612 - ], - "y": [ - 0 - ] + "x": [0.612], + "y": [0] }, "t": 114, - "s": [ - 100 - ] + "s": [100] }, { "t": 142, - "s": [ - 0 - ] + "s": [0] } ], "ix": 11 @@ -2373,29 +1455,17 @@ }, "p": { "a": 0, - "k": [ - -77.223, - 0, - 0 - ], + "k": [-77.223, 0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - -77.223, - 0, - 0 - ], + "k": [-77.223, 0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100, - 100 - ], + "k": [100, 100, 100], "ix": 6 } }, @@ -2424,58 +1494,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 1.089 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 1.089] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 26.294, - 0.724 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [26.294, 0.724], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -120.318, - -218.521 - ], - [ - -120.72, - -218.979 - ], - [ - -34.705, - -218.587 - ] + [-34.128, -218.21], + [-120.318, -218.521], + [-120.72, -218.979], + [-34.705, -218.587] ], "c": true } @@ -2494,58 +1528,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.673, - 0.875 - ] + [0, 0], + [0, 0], + [0, 0], + [-28.673, 0.875] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [28.673, -3.601], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -120.318, - -218.521 - ], - [ - -120.318, - 218.521 - ], - [ - -34.128, - 211.337 - ] + [-34.128, -218.21], + [-120.318, -218.521], + [-120.318, 218.521], + [-34.128, 211.337] ], "c": true } @@ -2564,58 +1562,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.673, - 0.875 - ] + [0, 0], + [0, 0], + [0, 0], + [-28.673, 0.875] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [28.673, -3.601], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -120.318, - -218.521 - ], - [ - -120.318, - 218.521 - ], - [ - -34.128, - 211.337 - ] + [-34.128, -218.21], + [-120.318, -218.521], + [-120.318, 218.521], + [-34.128, 211.337] ], "c": true } @@ -2626,58 +1588,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.758, - -0.959 - ] + [0, 0], + [0, 0], + [0, 0], + [-28.758, -0.959] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [28.673, -3.601], + [0, 0] ], "v": [ - [ - -43.652, - -218.74 - ], - [ - -106.032, - -218.137 - ], - [ - -106.032, - 217.33 - ], - [ - -37.7, - 211.816 - ] + [-43.652, -218.74], + [-106.032, -218.137], + [-106.032, 217.33], + [-37.7, 211.816] ], "c": true } @@ -2694,12 +1620,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.694117647059, - 0.023529411765, - 0.058823529412, - 1 - ], + "k": [0.694117647059, 0.023529411765, 0.058823529412, 1], "ix": 4 }, "o": { @@ -2717,26 +1638,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -2789,75 +1701,43 @@ "k": [ { "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] + "x": [0.667], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 18, - "s": [ - 0 - ] + "s": [0] }, { "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] + "x": [0.833], + "y": [1] }, "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] + "x": [0.167], + "y": [0] }, "t": 28.666, - "s": [ - 100 - ] + "s": [100] }, { "i": { - "x": [ - 1 - ], - "y": [ - 1 - ] + "x": [1], + "y": [1] }, "o": { - "x": [ - 0.612 - ], - "y": [ - 0 - ] + "x": [0.612], + "y": [0] }, "t": 114, - "s": [ - 100 - ] + "s": [100] }, { "t": 142, - "s": [ - 0 - ] + "s": [0] } ], "ix": 11 @@ -2880,40 +1760,20 @@ "y": 0 }, "t": 104, - "s": [ - 256, - 256, - 0 - ], - "to": [ - -24.667, - 0, - 0 - ], - "ti": [ - 24.667, - 0, - 0 - ] + "s": [256, 256, 0], + "to": [-24.667, 0, 0], + "ti": [24.667, 0, 0] }, { "t": 154.74609375, - "s": [ - 108, - 256, - 0 - ] + "s": [108, 256, 0] } ], "ix": 2 }, "a": { "a": 0, - "k": [ - 0.209, - 0.143, - 0 - ], + "k": [0.209, 0.143, 0], "ix": 1 }, "s": { @@ -2921,43 +1781,19 @@ "k": [ { "i": { - "x": [ - 0.461, - 0.461, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] + "x": [0.461, 0.461, 0.667], + "y": [1, 1, 1] }, "o": { - "x": [ - 0.655, - 0.655, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] + "x": [0.655, 0.655, 0.333], + "y": [0, 0, 0] }, "t": 46, - "s": [ - 66, - 66, - 100 - ] + "s": [66, 66, 100] }, { "t": 104, - "s": [ - 21, - 21, - 100 - ] + "s": [21, 21, 100] } ], "ix": 6 @@ -2980,12 +1816,7 @@ "ix": 1, "v": { "a": 0, - "k": [ - 0.086274512112, - 0, - 0.0074725952, - 1 - ], + "k": [0.086274512112, 0, 0.0074725952, 1], "ix": 1 } }, @@ -3071,58 +1902,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - 120.607, - 218.722 - ], - [ - 31.805, - 211.525 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [120.607, 218.722], + [31.805, 211.525], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -3141,58 +1936,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -119.9, - -218.21 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [-34.128, -218.21], + [-119.9, -218.21], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -3211,58 +1970,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 42.684, - 1.078 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [42.684, 1.078], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -119.9, - -218.21 - ], - [ - 31.977, - 211.212 - ], - [ - 120.318, - 218.496 - ] + [-34.128, -218.21], + [-119.9, -218.21], + [31.977, 211.212], + [120.318, 218.496] ], "c": true } @@ -3273,58 +1996,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 44.422, - -6.307 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [44.422, -6.307], + [0, 0] ], "v": [ - [ - -47.223, - -218.706 - ], - [ - -102.043, - -218.706 - ], - [ - 41.501, - 198.117 - ], - [ - 102.46, - 192.802 - ] + [-47.223, -218.706], + [-102.043, -218.706], + [41.501, 198.117], + [102.46, 192.802] ], "c": true } @@ -3341,12 +2028,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.898039215686, - 0.035294117647, - 0.078431372549, - 1 - ], + "k": [0.898039215686, 0.035294117647, 0.078431372549, 1], "ix": 4 }, "o": { @@ -3364,26 +2046,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -3436,75 +2109,43 @@ "k": [ { "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] + "x": [0.667], + "y": [1] }, "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] + "x": [0.333], + "y": [0] }, "t": 38, - "s": [ - 0 - ] + "s": [0] }, { "i": { - "x": [ - 0.833 - ], - "y": [ - 1 - ] + "x": [0.833], + "y": [1] }, "o": { - "x": [ - 0.167 - ], - "y": [ - 0 - ] + "x": [0.167], + "y": [0] }, "t": 48.666, - "s": [ - 100 - ] + "s": [100] }, { "i": { - "x": [ - 1 - ], - "y": [ - 1 - ] + "x": [1], + "y": [1] }, "o": { - "x": [ - 0.612 - ], - "y": [ - 0 - ] + "x": [0.612], + "y": [0] }, "t": 114, - "s": [ - 100 - ] + "s": [100] }, { "t": 142, - "s": [ - 0 - ] + "s": [0] } ], "ix": 11 @@ -3516,29 +2157,17 @@ }, "p": { "a": 0, - "k": [ - -77.223, - 0, - 0 - ], + "k": [-77.223, 0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - -77.223, - 0, - 0 - ], + "k": [-77.223, 0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100, - 100 - ], + "k": [100, 100, 100], "ix": 6 } }, @@ -3567,58 +2196,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 1.089 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 1.089] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 26.294, - 0.724 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [26.294, 0.724], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -120.318, - -218.521 - ], - [ - -120.72, - -218.979 - ], - [ - -34.705, - -218.587 - ] + [-34.128, -218.21], + [-120.318, -218.521], + [-120.72, -218.979], + [-34.705, -218.587] ], "c": true } @@ -3637,58 +2230,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.673, - 0.875 - ] + [0, 0], + [0, 0], + [0, 0], + [-28.673, 0.875] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [28.673, -3.601], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -120.318, - -218.521 - ], - [ - -120.318, - 218.521 - ], - [ - -34.128, - 211.337 - ] + [-34.128, -218.21], + [-120.318, -218.521], + [-120.318, 218.521], + [-34.128, 211.337] ], "c": true } @@ -3707,58 +2264,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.673, - 0.875 - ] + [0, 0], + [0, 0], + [0, 0], + [-28.673, 0.875] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [28.673, -3.601], + [0, 0] ], "v": [ - [ - -34.128, - -218.21 - ], - [ - -120.318, - -218.521 - ], - [ - -120.318, - 218.521 - ], - [ - -34.128, - 211.337 - ] + [-34.128, -218.21], + [-120.318, -218.521], + [-120.318, 218.521], + [-34.128, 211.337] ], "c": true } @@ -3769,58 +2290,22 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -28.758, - -0.959 - ] + [0, 0], + [0, 0], + [0, 0], + [-28.758, -0.959] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 28.673, - -3.601 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [28.673, -3.601], + [0, 0] ], "v": [ - [ - -43.652, - -218.74 - ], - [ - -106.032, - -218.137 - ], - [ - -106.032, - 217.33 - ], - [ - -37.7, - 211.816 - ] + [-43.652, -218.74], + [-106.032, -218.137], + [-106.032, 217.33], + [-37.7, 211.816] ], "c": true } @@ -3837,12 +2322,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.694117647059, - 0.023529411765, - 0.058823529412, - 1 - ], + "k": [0.694117647059, 0.023529411765, 0.058823529412, 1], "ix": 4 }, "o": { @@ -3860,26 +2340,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -3940,29 +2411,17 @@ }, "p": { "a": 0, - "k": [ - 0, - 0, - 0 - ], + "k": [0, 0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0, - 0 - ], + "k": [0, 0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100, - 100 - ], + "k": [100, 100, 100], "ix": 6 } }, @@ -3994,34 +2453,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 166, - -55 - ], - [ - 165, - -52 - ] + [166, -55], + [165, -52] ], "c": false } @@ -4032,34 +2473,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 164, - -51 - ], - [ - 125, - 45.5 - ] + [164, -51], + [125, 45.5] ], "c": false } @@ -4076,12 +2499,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -4106,26 +2524,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -4182,34 +2591,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 125, - -54.5 - ], - [ - 125, - -52 - ] + [125, -54.5], + [125, -52] ], "c": false } @@ -4220,34 +2611,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 126.5, - -52 - ], - [ - 164, - 50 - ] + [126.5, -52], + [164, 50] ], "c": false } @@ -4264,12 +2637,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -4294,26 +2662,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -4351,26 +2710,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 144.5, - -1 - ], + "k": [144.5, -1], "ix": 2 }, "a": { "a": 0, - "k": [ - 144.5, - -1 - ], + "k": [144.5, -1], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -4427,34 +2777,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 100, - -51 - ], - [ - 100, - -48 - ] + [100, -51], + [100, -48] ], "c": false } @@ -4465,34 +2797,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 100, - -47 - ], - [ - 100, - 42 - ] + [100, -47], + [100, 42] ], "c": false } @@ -4509,12 +2823,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -4539,26 +2848,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -4618,34 +2918,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 37, - 29 - ], - [ - 40.5, - 29 - ] + [37, 29], + [40.5, 29] ], "c": false } @@ -4656,34 +2938,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 37, - 29 - ], - [ - 83.5, - 28.5 - ] + [37, 29], + [83.5, 28.5] ], "c": false } @@ -4700,12 +2964,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -4730,26 +2989,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -4806,34 +3056,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 49, - -50.5 - ], - [ - 49, - -48.5 - ] + [49, -50.5], + [49, -48.5] ], "c": true } @@ -4844,34 +3076,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 49, - -47.5 - ], - [ - 49.5, - 38 - ] + [49, -47.5], + [49.5, 38] ], "c": false } @@ -4888,12 +3102,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -4918,26 +3127,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -4975,26 +3175,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 60.25, - -4.75 - ], + "k": [60.25, -4.75], "ix": 2 }, "a": { "a": 0, - "k": [ - 60.25, - -4.75 - ], + "k": [60.25, -4.75], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -5054,34 +3245,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -9.5, - -7.5 - ], - [ - -11.5, - -7.5 - ] + [-9.5, -7.5], + [-11.5, -7.5] ], "c": false } @@ -5092,34 +3265,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 28, - -7.5 - ], - [ - -9.5, - -7.5 - ] + [28, -7.5], + [-9.5, -7.5] ], "c": false } @@ -5136,12 +3291,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -5166,26 +3316,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -5242,34 +3383,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 0.5, - -50 - ], - [ - 0.5, - -48 - ] + [0.5, -50], + [0.5, -48] ], "c": false } @@ -5280,34 +3403,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 0.5, - -48 - ], - [ - 0, - 37 - ] + [0.5, -48], + [0, 37] ], "c": false } @@ -5324,12 +3429,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -5354,26 +3454,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -5430,34 +3521,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -10.5, - -39.5 - ], - [ - -12, - -39.5 - ] + [-10.5, -39.5], + [-12, -39.5] ], "c": false } @@ -5468,34 +3541,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - 36, - -39.5 - ], - [ - -9, - -39.5 - ] + [36, -39.5], + [-9, -39.5] ], "c": false } @@ -5512,12 +3567,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -5542,26 +3592,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -5599,26 +3640,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 13.25, - -5.5 - ], + "k": [13.25, -5.5], "ix": 2 }, "a": { "a": 0, - "k": [ - 13.25, - -5.5 - ], + "k": [13.25, -5.5], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -5678,34 +3710,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -40.5, - -54 - ], - [ - -40.5, - -49.5 - ] + [-40.5, -54], + [-40.5, -49.5] ], "c": false } @@ -5716,34 +3730,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -38.5, - -45.5 - ], - [ - -39, - 38.5 - ] + [-38.5, -45.5], + [-39, 38.5] ], "c": false } @@ -5760,12 +3756,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -5790,26 +3781,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -5866,34 +3848,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -62.5, - -38.5 - ], - [ - -66, - -38.5 - ] + [-62.5, -38.5], + [-66, -38.5] ], "c": false } @@ -5904,34 +3868,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -14.5, - -40.5 - ], - [ - -63.5, - -38.5 - ] + [-14.5, -40.5], + [-63.5, -38.5] ], "c": false } @@ -5948,12 +3894,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -5978,26 +3919,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -6035,26 +3967,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - -39, - -3.5 - ], + "k": [-39, -3.5], "ix": 2 }, "a": { "a": 0, - "k": [ - -39, - -3.5 - ], + "k": [-39, -3.5], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -6114,34 +4037,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -114, - 32.5 - ], - [ - -119, - 32.5 - ] + [-114, 32.5], + [-119, 32.5] ], "c": false } @@ -6152,34 +4057,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -67.5, - 29 - ], - [ - -112, - 32.5 - ] + [-67.5, 29], + [-112, 32.5] ], "c": false } @@ -6196,12 +4083,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -6226,26 +4108,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -6302,34 +4175,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -115, - -6.5 - ], - [ - -119.5, - -6.5 - ] + [-115, -6.5], + [-119.5, -6.5] ], "c": true } @@ -6340,34 +4195,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -74.5, - -6 - ], - [ - -113, - -6 - ] + [-74.5, -6], + [-113, -6] ], "c": true } @@ -6384,12 +4221,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -6414,26 +4246,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -6490,34 +4313,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -103.5, - -54.5 - ], - [ - -103.5, - -49 - ] + [-103.5, -54.5], + [-103.5, -49] ], "c": false } @@ -6528,34 +4333,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -103.5, - -48.5 - ], - [ - -102.5, - 42 - ] + [-103.5, -48.5], + [-102.5, 42] ], "c": false } @@ -6572,12 +4359,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -6602,26 +4384,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -6678,34 +4451,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -117, - -38 - ], - [ - -120.5, - -38 - ] + [-117, -38], + [-120.5, -38] ], "c": false } @@ -6716,34 +4471,16 @@ "s": [ { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0] ], "v": [ - [ - -68, - -38 - ], - [ - -114.5, - -38 - ] + [-68, -38], + [-114.5, -38] ], "c": false } @@ -6760,12 +4497,7 @@ "ty": "st", "c": { "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], + "k": [1, 1, 1, 1], "ix": 3 }, "o": { @@ -6790,26 +4522,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -6847,26 +4570,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - -90, - -3.25 - ], + "k": [-90, -3.25], "ix": 2 }, "a": { "a": 0, - "k": [ - -90, - -3.25 - ], + "k": [-90, -3.25], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -6931,31 +4645,19 @@ "k": [ { "i": { - "x": [ - 0.455 - ], - "y": [ - 1 - ] + "x": [0.455], + "y": [1] }, "o": { - "x": [ - 0.684 - ], - "y": [ - 0 - ] + "x": [0.684], + "y": [0] }, "t": 104, - "s": [ - 402.75 - ] + "s": [402.75] }, { "t": 154.74609375, - "s": [ - 256 - ] + "s": [256] } ], "ix": 3 @@ -6968,20 +4670,12 @@ }, "a": { "a": 0, - "k": [ - 0, - 0, - 0 - ], + "k": [0, 0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100, - 100 - ], + "k": [100, 100, 100], "ix": 6 } }, @@ -6998,154 +4692,46 @@ "a": 0, "k": { "i": [ - [ - 0, - 0 - ], - [ - -5.131, - 0 - ], - [ - 0, - 0 - ], - [ - 5.401, - -0.27 - ], - [ - 0, - 0 - ], - [ - -8.551, - 0.27 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [-5.131, 0], + [0, 0], + [5.401, -0.27], + [0, 0], + [-8.551, 0.27], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 5.582, - 0 - ], - [ - 0, - 0 - ], - [ - -6.392, - 0 - ], - [ - 0, - 0 - ], - [ - 8.462, - -0.54 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [5.582, 0], + [0, 0], + [-6.392, 0], + [0, 0], + [8.462, -0.54], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "v": [ - [ - -95.285, - -12.333 - ], - [ - -76.021, - -12.603 - ], - [ - -76.021, - 1.8 - ], - [ - -95.285, - 2.07 - ], - [ - -95.285, - 23.495 - ], - [ - -69.81, - 21.964 - ], - [ - -69.81, - 35.826 - ], - [ - -109.689, - 38.978 - ], - [ - -109.689, - -46.09 - ], - [ - -69.81, - -46.09 - ], - [ - -69.81, - -31.687 - ], - [ - -95.285, - -31.687 - ] + [-95.285, -12.333], + [-76.021, -12.603], + [-76.021, 1.8], + [-95.285, 2.07], + [-95.285, 23.495], + [-69.81, 21.964], + [-69.81, 35.826], + [-109.689, 38.978], + [-109.689, -46.09], + [-69.81, -46.09], + [-69.81, -31.687], + [-95.285, -31.687] ], "c": true }, @@ -7163,106 +4749,34 @@ "a": 0, "k": { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 4.68, - -0.18 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [4.68, -0.18], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -4.861, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-4.861, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "v": [ - [ - -16.249, - -31.686 - ], - [ - -31.192, - -31.686 - ], - [ - -31.192, - 34.568 - ], - [ - -45.594, - 34.747 - ], - [ - -45.594, - -31.686 - ], - [ - -60.537, - -31.686 - ], - [ - -60.537, - -46.09 - ], - [ - -16.248, - -46.09 - ] + [-16.249, -31.686], + [-31.192, -31.686], + [-31.192, 34.568], + [-45.594, 34.747], + [-45.594, -31.686], + [-60.537, -31.686], + [-60.537, -46.09], + [-16.248, -46.09] ], "c": true }, @@ -7280,130 +4794,40 @@ "a": 0, "k": { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "v": [ - [ - 7.156, - -13.323 - ], - [ - 26.871, - -13.323 - ], - [ - 26.871, - 1.08 - ], - [ - 7.156, - 1.08 - ], - [ - 7.156, - 33.757 - ], - [ - -6.978, - 33.757 - ], - [ - -6.978, - -46.09 - ], - [ - 33.262, - -46.09 - ], - [ - 33.262, - -31.687 - ], - [ - 7.156, - -31.687 - ] + [7.156, -13.323], + [26.871, -13.323], + [26.871, 1.08], + [7.156, 1.08], + [7.156, 33.757], + [-6.978, 33.757], + [-6.978, -46.09], + [33.262, -46.09], + [33.262, -31.687], + [7.156, -31.687] ], "c": true }, @@ -7421,82 +4845,28 @@ "a": 0, "k": { "i": [ - [ - 0, - 0 - ], - [ - -8.012, - -0.449 - ], - [ - 0, - 0 - ], - [ - 13.143, - 0.271 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [-8.012, -0.449], + [0, 0], + [13.143, 0.271], + [0, 0], + [0, 0] ], "o": [ - [ - 8.192, - 0.18 - ], - [ - 0, - 0 - ], - [ - -12.873, - -0.811 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [8.192, 0.18], + [0, 0], + [-12.873, -0.811], + [0, 0], + [0, 0], + [0, 0] ], "v": [ - [ - 56.667, - 21.154 - ], - [ - 81.152, - 22.415 - ], - [ - 81.152, - 36.638 - ], - [ - 42.264, - 34.747 - ], - [ - 42.264, - -46.09 - ], - [ - 56.667, - -46.09 - ] + [56.667, 21.154], + [81.152, 22.415], + [81.152, 36.638], + [42.264, 34.747], + [42.264, -46.09], + [56.667, -46.09] ], "c": true }, @@ -7514,58 +4884,22 @@ "a": 0, "k": { "i": [ - [ - 0, - 0 - ], - [ - -4.681, - -0.539 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [-4.681, -0.539], + [0, 0], + [0, 0] ], "o": [ - [ - 4.591, - 0.27 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [4.591, 0.27], + [0, 0], + [0, 0], + [0, 0] ], "v": [ - [ - 93.304, - 37.628 - ], - [ - 107.437, - 38.708 - ], - [ - 107.437, - -46.09 - ], - [ - 93.304, - -46.09 - ] + [93.304, 37.628], + [107.437, 38.708], + [107.437, -46.09], + [93.304, -46.09] ], "c": true }, @@ -7583,154 +4917,46 @@ "a": 0, "k": { "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 5.401, - 0.9 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 5.22, - 0.72 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [5.401, 0.9], + [0, 0], + [0, 0], + [5.22, 0.72], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -5.403, - -0.72 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -5.222, - -0.901 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [-5.403, -0.72], + [0, 0], + [0, 0], + [-5.222, -0.901], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "v": [ - [ - 170.541, - -46.09 - ], - [ - 152.267, - -2.25 - ], - [ - 170.541, - 46.09 - ], - [ - 154.337, - 43.479 - ], - [ - 143.985, - 16.834 - ], - [ - 133.454, - 41.319 - ], - [ - 117.971, - 39.428 - ], - [ - 136.515, - -2.791 - ], - [ - 119.771, - -46.09 - ], - [ - 135.253, - -46.09 - ], - [ - 144.705, - -21.875 - ], - [ - 154.788, - -46.09 - ] + [170.541, -46.09], + [152.267, -2.25], + [170.541, 46.09], + [154.337, 43.479], + [143.985, 16.834], + [133.454, 41.319], + [117.971, 39.428], + [136.515, -2.791], + [119.771, -46.09], + [135.253, -46.09], + [144.705, -21.875], + [154.788, -46.09] ], "c": true }, @@ -7744,12 +4970,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.898039215686, - 0.035294117647, - 0.078431372549, - 1 - ], + "k": [0.898039215686, 0.035294117647, 0.078431372549, 1], "ix": 4 }, "o": { @@ -7767,26 +4988,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -7850,31 +5062,19 @@ "k": [ { "i": { - "x": [ - 0.455 - ], - "y": [ - 1 - ] + "x": [0.455], + "y": [1] }, "o": { - "x": [ - 0.684 - ], - "y": [ - 0 - ] + "x": [0.684], + "y": [0] }, "t": 104, - "s": [ - 402.75 - ] + "s": [402.75] }, { "t": 154.74609375, - "s": [ - 256 - ] + "s": [256] } ], "ix": 3 @@ -7887,20 +5087,12 @@ }, "a": { "a": 0, - "k": [ - 0, - 0, - 0 - ], + "k": [0, 0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100, - 100 - ], + "k": [100, 100, 100], "ix": 6 } }, @@ -7917,130 +5109,40 @@ "a": 0, "k": { "i": [ - [ - 0, - 0 - ], - [ - 5.401, - -0.719 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 4.861, - -0.72 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [5.401, -0.719], + [0, 0], + [0, 0], + [4.861, -0.72], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "o": [ - [ - -5.131, - 0.901 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -5.131, - 0.54 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [-5.131, 0.901], + [0, 0], + [0, 0], + [-5.131, 0.54], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0], + [0, 0] ], "v": [ - [ - -123.641, - 40.148 - ], - [ - -139.394, - 42.039 - ], - [ - -155.868, - -6.211 - ], - [ - -155.868, - 44.11 - ], - [ - -170.541, - 46.09 - ], - [ - -170.541, - -46.09 - ], - [ - -156.858, - -46.09 - ], - [ - -138.134, - 6.212 - ], - [ - -138.134, - -46.09 - ], - [ - -123.641, - -46.09 - ] + [-123.641, 40.148], + [-139.394, 42.039], + [-155.868, -6.211], + [-155.868, 44.11], + [-170.541, 46.09], + [-170.541, -46.09], + [-156.858, -46.09], + [-138.134, 6.212], + [-138.134, -46.09], + [-123.641, -46.09] ], "c": true }, @@ -8054,12 +5156,7 @@ "ty": "fl", "c": { "a": 0, - "k": [ - 0.898039215686, - 0.035294117647, - 0.078431372549, - 1 - ], + "k": [0.898039215686, 0.035294117647, 0.078431372549, 1], "ix": 4 }, "o": { @@ -8077,26 +5174,17 @@ "ty": "tr", "p": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 2 }, "a": { "a": 0, - "k": [ - 0, - 0 - ], + "k": [0, 0], "ix": 1 }, "s": { "a": 0, - "k": [ - 100, - 100 - ], + "k": [100, 100], "ix": 3 }, "r": { @@ -8138,4 +5226,4 @@ } ], "markers": [] -} \ No newline at end of file +} diff --git a/composeApp/src/google-services.json b/composeApp/src/google-services.json index e863348..c1c5488 100644 --- a/composeApp/src/google-services.json +++ b/composeApp/src/google-services.json @@ -26,4 +26,4 @@ } ], "configuration_version": "1" -} \ No newline at end of file +} diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml index d29861d..b13209d 100644 --- a/config/detekt/detekt.yml +++ b/config/detekt/detekt.yml @@ -896,4 +896,4 @@ style: WildcardImport: active: true excludeImports: - - "java.util.*" \ No newline at end of file + - "java.util.*" diff --git a/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json index ee7e3ca..0afb3cf 100644 --- a/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json @@ -1,11 +1,11 @@ { - "colors" : [ + "colors": [ { - "idiom" : "universal" + "idiom": "universal" } ], - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "author": "xcode", + "version": 1 } -} \ No newline at end of file +} diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json index 1d6328c..0200212 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,14 +1,14 @@ { - "images" : [ + "images": [ { - "filename" : "1 (1).png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" + "filename": "1 (1).png", + "idiom": "universal", + "platform": "ios", + "size": "1024x1024" } ], - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "author": "xcode", + "version": 1 } } diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon__.appiconset/Contents.json b/iosApp/iosApp/Assets.xcassets/AppIcon__.appiconset/Contents.json index 8edf56e..bdf2efb 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon__.appiconset/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/AppIcon__.appiconset/Contents.json @@ -1,14 +1,14 @@ { - "images" : [ + "images": [ { - "filename" : "app-icon-1024.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" + "filename": "app-icon-1024.png", + "idiom": "universal", + "platform": "ios", + "size": "1024x1024" } ], - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "author": "xcode", + "version": 1 } } diff --git a/iosApp/iosApp/Assets.xcassets/Contents.json b/iosApp/iosApp/Assets.xcassets/Contents.json index 73c0059..74d6a72 100644 --- a/iosApp/iosApp/Assets.xcassets/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "author": "xcode", + "version": 1 } } diff --git a/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json index 4aa7c53..74d6a72 100644 --- a/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json +++ b/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "author": "xcode", + "version": 1 } -} \ No newline at end of file +} diff --git a/scripts/linter/run_prettier.sh b/scripts/linter/run_prettier.sh index 7238f80..739dd9b 100755 --- a/scripts/linter/run_prettier.sh +++ b/scripts/linter/run_prettier.sh @@ -2,7 +2,7 @@ # Default configuration path PRETTIER_CLI="prettier" -INPUT_PATH="../../.github" +INPUT_PATH="../.." # Check if detekt is installed if ! command -v $PRETTIER_CLI &> /dev/null From db233381096f1601a0f4c81dc3a117ebacd16faa Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Sat, 11 Apr 2026 16:31:05 -0300 Subject: [PATCH 7/7] Update markdownlint configuration to disable MD059 rule - Disable the `MD059` rule in `.markdownlint.json`. --- .markdownlint.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.markdownlint.json b/.markdownlint.json index 3dc5dbf..8af247c 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -4,5 +4,6 @@ "MD036": false, "MD051": false, "MD040": false, - "MD033": false + "MD033": false, + "MD059": false }