diff --git a/.editorconfig b/.editorconfig index 999845632..e99fe5d60 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,16 +5,15 @@ charset = utf-8 end_of_line = lf indent_size = 4 indent_style = tab -insert_final_newline = true +insert_final_newline = false max_line_length = 120 tab_width = 4 # noinspection EditorConfigKeyCorrectness -disabled_rules = no-wildcard-imports, no-unused-imports +disabled_rules=no-wildcard-imports,no-unused-imports [{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}] ij_continuation_indent_size = 4 [{*.kt,*.kts}] -ij_kotlin_allow_trailing_comma_on_call_site = true ij_kotlin_allow_trailing_comma = true ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 03f83f88f..02304a073 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1 @@ -ko_fi: xtimms custom: ["https://yoomoney.ru/to/410012543938752"] diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 9af821d54..c7cc0c855 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,4 +2,4 @@ blank_issues_enabled: false contact_links: - name: ⚠️ Source issue url: https://github.com/KotatsuApp/kotatsu-parsers/issues/new - about: If you have troubles with a manga parser or want to propose new manga source, please open an issue in the kotatsu-parsers repository instead \ No newline at end of file + about: Issues and requests for sources should be opened in the kotatsu-parsers repository instead \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/report_bug.yml b/.github/ISSUE_TEMPLATE/report_bug.yml deleted file mode 100644 index 261f51945..000000000 --- a/.github/ISSUE_TEMPLATE/report_bug.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: 🐞 Bug report -description: Report a bug in Kotatsu -labels: [bug] -body: - - - type: textarea - id: summary - attributes: - label: Brief summary - description: Please describe, what went wrong - validations: - required: true - - - type: textarea - id: reproduce-steps - attributes: - label: Steps to reproduce - description: Please provide a way to reproduce this issue. Screenshots or videos can be very helpful - placeholder: | - Example: - 1. First step - 2. Second step - 3. Issue here - validations: - required: false - - - - type: input - id: kotatsu-version - attributes: - label: Kotatsu version - description: You can find your Kotatsu version in **Settings → About**. - placeholder: | - Example: "3.3" - validations: - required: true - - - type: input - id: android-version - attributes: - label: Android version - description: You can find this somewhere in your Android settings. - placeholder: | - Example: "12.0" - validations: - required: true - - - type: input - id: device - attributes: - label: Device - description: List your device and model. - placeholder: | - Example: "LG Nexus 5X" - validations: - required: false - - - type: checkboxes - id: acknowledgements - attributes: - label: Acknowledgements - options: - - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. - required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml new file mode 100644 index 000000000..4bc2d2de9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/report_issue.yml @@ -0,0 +1,91 @@ +name: 🐞 Issue report +description: Report an issue in Kotatsu +labels: [bug] +body: + + - type: textarea + id: reproduce-steps + attributes: + label: Steps to reproduce + description: Provide an example of the issue. + placeholder: | + Example: + 1. First step + 2. Second step + 3. Issue here + validations: + required: true + + - type: textarea + id: expected-behavior + attributes: + label: Expected behavior + description: Explain what you should expect to happen. + placeholder: | + Example: + "This should happen..." + validations: + required: true + + - type: textarea + id: actual-behavior + attributes: + label: Actual behavior + description: Explain what actually happens. + placeholder: | + Example: + "This happened instead..." + validations: + required: true + + - type: input + id: kotatsu-version + attributes: + label: Kotatsu version + description: You can find your Kotatsu version in **Settings → About**. + placeholder: | + Example: "3.3" + validations: + required: true + + - type: input + id: android-version + attributes: + label: Android version + description: You can find this somewhere in your Android settings. + placeholder: | + Example: "Android 12" + validations: + required: true + + - type: input + id: device + attributes: + label: Device + description: List your device and model. + placeholder: | + Example: "LG Nexus 5X" + validations: + required: true + + - type: textarea + id: other-details + attributes: + label: Other details + placeholder: | + Additional details and attachments. + + - type: checkboxes + id: acknowledgements + attributes: + label: Acknowledgements + description: Read this carefully, we will close and ignore your issue if you skimmed through this. + options: + - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. + required: true + - label: I have written a short but informative title. + required: true + - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new). + required: true + - label: I will fill out all of the requested information in this form. + required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml index a8539d394..b49ba479b 100644 --- a/.github/ISSUE_TEMPLATE/request_feature.yml +++ b/.github/ISSUE_TEMPLATE/request_feature.yml @@ -1,5 +1,5 @@ name: ⭐ Feature request -description: Suggest a new idea how to improve Kotatsu +description: Suggest a feature to improve Kotatsu labels: [feature request] body: @@ -14,6 +14,23 @@ body: validations: required: true + - type: textarea + id: other-details + attributes: + label: Other details + placeholder: | + Additional details and attachments. + + - type: input + id: kotatsu-version + attributes: + label: Kotatsu version + description: You can find your Kotatsu version in **Settings → About**. + placeholder: | + Example: "3.3" + validations: + required: true + - type: checkboxes id: acknowledgements attributes: @@ -21,4 +38,10 @@ body: description: Read this carefully, we will close and ignore your issue if you skimmed through this. options: - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. + required: true + - label: I have written a short but informative title. + required: true + - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new). + required: true + - label: I will fill out all of the requested information in this form. required: true \ No newline at end of file diff --git a/.gitignore b/.gitignore index 621f3e800..5611db9cb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,16 +7,13 @@ /.idea/modules.xml /.idea/misc.xml /.idea/discord.xml -/.idea/compiler.xml /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml /.idea/kotlinScripting.xml -/.idea/kotlinc.xml /.idea/deploymentTargetDropDown.xml /.idea/androidTestResultsUserPreferences.xml /.idea/render.experimental.xml -/.idea/inspectionProfiles/ .DS_Store /build /captures diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521a..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..fb7f4a8a4 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ae388c2a5..a0de2a152 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@