Skip to content

Commit 1b516ab

Browse files
committed
Merge branch 'develop'
Signed-off-by: Iva Horn <iva.horn@icloud.com> # Conflicts: # ActionExtension/Media.xcassets/AppIcon.appiconset/Contents.json # Source/Screens/Settings/SettingsTableViewController.swift # Source/Screens/Settings/ast.lproj/Settings.strings # Source/Screens/Settings/bg_BG.lproj/Settings.strings # Source/Screens/Settings/ca.lproj/Settings.strings # Source/Screens/Settings/cs.lproj/Settings.strings # Source/Screens/Settings/es-AR.lproj/Settings.strings # Source/Screens/Settings/es-CL.lproj/Settings.strings # Source/Screens/Settings/es.lproj/Settings.strings # Source/Screens/Settings/fa.lproj/Settings.strings # Source/Screens/Settings/fi-FI.lproj/Settings.strings # Source/Screens/Settings/hu.lproj/Settings.strings # Source/Screens/Settings/ja-JP.lproj/Settings.strings # Source/Screens/Settings/ka.lproj/Settings.strings # Source/Screens/Settings/lt_LT.lproj/Settings.strings # Source/Screens/Settings/lv.lproj/Settings.strings # Source/Screens/Settings/mk.lproj/Settings.strings # Source/Screens/Settings/oc.lproj/Settings.strings # Source/Screens/Settings/pl.lproj/Settings.strings # Source/Screens/Settings/ro.lproj/Settings.strings # Source/Screens/Settings/sl.lproj/Settings.strings # Source/Screens/Settings/sq.lproj/Settings.strings # Source/Screens/Settings/ug.lproj/Settings.strings # Source/Screens/Settings/uk.lproj/Settings.strings # Source/Screens/Settings/zh-Hans.lproj/Settings.strings # Source/Screens/Settings/zh-Hant-TW.lproj/Settings.strings # Source/Settings.bundle/Root.plist # Source/Settings.bundle/et_EE.lproj/Root.strings # Source/Settings.bundle/sr-Latn.lproj/Root.strings # Source/cs.lproj/Localizable.strings # Source/es.lproj/Localizable.strings # Source/eu.lproj/Localizable.strings # Source/lt_LT.lproj/Localizable.strings # Source/nl.lproj/Main_iPhone.strings # Source/pl.lproj/Localizable.strings # Source/ug.lproj/Localizable.strings # iOCNotes.xcconfig # iOCNotes.xcodeproj/project.pbxproj
2 parents 92bb3be + 194cdad commit 1b516ab

404 files changed

Lines changed: 34351 additions & 3810 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/.swiftlint.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# SPDX-FileCopyrightText: Nextcloud GmbH
2+
# SPDX-FileCopyrightText: 2025 Iva Horn
3+
# SPDX-License-Identifier: GPL-3.0-or-later
4+
5+
name: SwiftLint
6+
7+
on:
8+
push:
9+
branches:
10+
- main
11+
pull_request:
12+
branches:
13+
- main
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
SwiftLint:
21+
runs-on: ubuntu-latest
22+
23+
steps:
24+
- uses: actions/checkout@v4
25+
26+
- name: GitHub Action for SwiftLint
27+
uses: norio-nomura/action-swiftlint@3.2.1
28+

.swiftlint.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
disabled_rules:
2+
- line_length
3+
4+
opt_in_rules:
5+
- empty_count
6+
- empty_string
7+
- empty_xctest_method
8+
- file_header
9+
- file_name_no_space
10+
- force_unwrapping
11+
- implicit_return
12+
- local_doc_comment
13+
- missing_docs
14+
- modifier_order
15+
- multiline_arguments
16+
- multiline_function_chains
17+
- no_empty_block
18+
- operator_usage_whitespace
19+
- period_spacing
20+
- toggle_bool
21+
- sorted_enum_cases
22+
- sorted_imports
23+
- trailing_closure
24+
- weak_delegate
25+
- yoda_condition
26+
27+
included:
28+
- iOCNotes
29+
30+
strict: true
31+
32+
file_header:
33+
required_pattern: |
34+
\/\/ SPDX-FileCopyrightText: Nextcloud GmbH
35+
\/\/ SPDX-FileCopyrightText: 2025 .*?
36+
\/\/ SPDX-License-Identifier: GPL-3.0-or-later
37+
severity: error
38+
39+
large_tuple:
40+
warning: 4
41+
error: 6
42+
43+
switch_case_alignment:
44+
indented_cases: true

.tx/config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ file_filter = Source/<lang>.lproj/Categories.strings
66
source_file = Source/en.lproj/Categories.strings
77
source_lang = en
88
type = STRINGS
9-
lang_map = zh_CN: zh-Hans, nb_NO: nb-NO, es_HN: es-HN, es_UY: es-UY, pt_PT: pt-PT, hu_HU: hu, es_CL: es-CL, es_EC: es-EC, es_CO: es-CO, es_PY: es-PY, es_SV: es-SV, es_419: es-419, fi_FI: fi-FI, es_AR: es-AR, sk_SK: sk-SK, es_MX: es-MX, es_CR: es-CR, es_PA: es-PA, es_GT: es-GT, es_NI: es-NI, es_PR: es-PR, ja_JP: ja-JP, pt_BR: pt-BR, cs_CZ: cs, ka_GE: ka-GE, es_PE: es-PE, en_GB: en-GB, zh_TW: zh-Hant-TW, es_DO: es-DO
9+
lang_map = zh_CN: zh-Hans, nb_NO: nb-NO, es_HN: es-HN, es_UY: es-UY, pt_PT: pt-PT, hu_HU: hu, es_CL: es-CL, es_EC: es-EC, es_CO: es-CO, es_PY: es-PY, es_SV: es-SV, es_419: es-419, fi_FI: fi-FI, es_AR: es-AR, sk_SK: sk-SK, es_MX: es-MX, es_CR: es-CR, es_PA: es-PA, es_GT: es-GT, es_NI: es-NI, es_PR: es-PR, ja_JP: ja-JP, pt_BR: pt-BR, cs_CZ: cs, ka_GE: ka-GE, es_PE: es-PE, en_GB: en-GB, zh_TW: zh-Hant-TW, es_DO: es-DO, sr@latin: sr-Latn
1010
replace_edited_strings = false
1111
keep_translations = false
1212

@@ -15,7 +15,7 @@ file_filter = Source/<lang>.lproj/Localizable.strings
1515
source_file = Source/en.lproj/Localizable.strings
1616
source_lang = en
1717
type = STRINGS
18-
lang_map = pt_BR: pt-BR, cs_CZ: cs, es_AR: es-AR, es_EC: es-EC, es_GT: es-GT, nb_NO: nb-NO, hu_HU: hu, es_419: es-419, sk_SK: sk-SK, ka_GE: ka-GE, es_PE: es-PE, es_PR: es-PR, es_PY: es-PY, ja_JP: ja-JP, es_MX: es-MX, es_CL: es-CL, es_CO: es-CO, es_PA: es-PA, es_HN: es-HN, es_UY: es-UY, zh_CN: zh-Hans, fi_FI: fi-FI, es_CR: es-CR, es_NI: es-NI, es_SV: es-SV, pt_PT: pt-PT, en_GB: en-GB, zh_TW: zh-Hant-TW, es_DO: es-DO
18+
lang_map = pt_BR: pt-BR, cs_CZ: cs, es_AR: es-AR, es_EC: es-EC, es_GT: es-GT, nb_NO: nb-NO, hu_HU: hu, es_419: es-419, sk_SK: sk-SK, ka_GE: ka-GE, es_PE: es-PE, es_PR: es-PR, es_PY: es-PY, ja_JP: ja-JP, es_MX: es-MX, es_CL: es-CL, es_CO: es-CO, es_PA: es-PA, es_HN: es-HN, es_UY: es-UY, zh_CN: zh-Hans, fi_FI: fi-FI, es_CR: es-CR, es_NI: es-NI, es_SV: es-SV, pt_PT: pt-PT, en_GB: en-GB, zh_TW: zh-Hant-TW, es_DO: es-DO, sr@latin: sr-Latn
1919
replace_edited_strings = false
2020
keep_translations = false
2121

@@ -24,7 +24,7 @@ file_filter = Source/<lang>.lproj/Main_iPhone.strings
2424
source_file = Source/en.lproj/Main_iPhone.strings
2525
source_lang = en
2626
type = STRINGS
27-
lang_map = zh_CN: zh-Hans, sk_SK: sk-SK, es_PE: es-PE, es_PY: es-PY, ja_JP: ja-JP, es_EC: es-EC, es_PA: es-PA, es_AR: es-AR, ka_GE: ka-GE, es_NI: es-NI, es_PR: es-PR, es_SV: es-SV, es_UY: es-UY, cs_CZ: cs, en_GB: en-GB, hu_HU: hu, es_CO: es-CO, es_GT: es-GT, pt_PT: pt-PT, es_HN: es-HN, nb_NO: nb-NO, es_CL: es-CL, es_DO: es-DO, es_419: es-419, pt_BR: pt-BR, fi_FI: fi-FI, es_MX: es-MX, zh_TW: zh-Hant-TW, es_CR: es-CR
27+
lang_map = zh_CN: zh-Hans, sk_SK: sk-SK, es_PE: es-PE, es_PY: es-PY, ja_JP: ja-JP, es_EC: es-EC, es_PA: es-PA, es_AR: es-AR, ka_GE: ka-GE, es_NI: es-NI, es_PR: es-PR, es_SV: es-SV, es_UY: es-UY, cs_CZ: cs, en_GB: en-GB, hu_HU: hu, es_CO: es-CO, es_GT: es-GT, pt_PT: pt-PT, es_HN: es-HN, nb_NO: nb-NO, es_CL: es-CL, es_DO: es-DO, es_419: es-419, pt_BR: pt-BR, fi_FI: fi-FI, es_MX: es-MX, zh_TW: zh-Hant-TW, es_CR: es-CR, sr@latin: sr-Latn
2828
replace_edited_strings = false
2929
keep_translations = false
3030

@@ -33,7 +33,7 @@ file_filter = Source/Screens/Settings/<lang>.lproj/Settings.strings
3333
source_file = Source/Screens/Settings/en.lproj/Settings.strings
3434
source_lang = en
3535
type = STRINGS
36-
lang_map = fi_FI: fi-FI, hu_HU: hu, zh_TW: zh-Hant-TW, es_GT: es-GT, es_HN: es-HN, es_PR: es-PR, ja_JP: ja-JP, es_MX: es-MX, en_GB: en-GB, es_CR: es-CR, es_419: es-419, zh_CN: zh-Hans, es_NI: es-NI, cs_CZ: cs, sk_SK: sk-SK, es_CO: es-CO, es_DO: es-DO, pt_BR: pt-BR, es_AR: es-AR, ka_GE: ka-GE, es_SV: es-SV, es_UY: es-UY, pt_PT: pt-PT, es_PE: es-PE, es_PY: es-PY, es_CL: es-CL, nb_NO: nb-NO, es_EC: es-EC, es_PA: es-PA
36+
lang_map = fi_FI: fi-FI, hu_HU: hu, zh_TW: zh-Hant-TW, es_GT: es-GT, es_HN: es-HN, es_PR: es-PR, ja_JP: ja-JP, es_MX: es-MX, en_GB: en-GB, es_CR: es-CR, es_419: es-419, zh_CN: zh-Hans, es_NI: es-NI, cs_CZ: cs, sk_SK: sk-SK, es_CO: es-CO, es_DO: es-DO, pt_BR: pt-BR, es_AR: es-AR, ka_GE: ka-GE, es_SV: es-SV, es_UY: es-UY, pt_PT: pt-PT, es_PE: es-PE, es_PY: es-PY, es_CL: es-CL, nb_NO: nb-NO, es_EC: es-EC, es_PA: es-PA, sr@latin: sr-Latn
3737
replace_edited_strings = false
3838
keep_translations = false
3939

@@ -42,7 +42,7 @@ file_filter = Source/Settings.bundle/<lang>.lproj/Root.strings
4242
source_file = Source/Settings.bundle/en.lproj/Root.strings
4343
source_lang = en
4444
type = STRINGS
45-
lang_map = zh_CN: zh-Hans, en_GB: en-GB, hu_HU: hu, ka_GE: ka-GE, es_PE: es-PE, es_419: es-419, pt_BR: pt-BR, es_CO: es-CO, fi_FI: fi-FI, es_CL: es-CL, es_NI: es-NI, es_SV: es-SV, nb_NO: nb-NO, sk_SK: sk-SK, es_PR: es-PR, es_PY: es-PY, es_PA: es-PA, es_AR: es-AR, es_GT: es-GT, es_UY: es-UY, cs_CZ: cs, es_DO: es-DO, es_EC: es-EC, es_HN: es-HN, pt_PT: pt-PT, ja_JP: ja-JP, es_MX: es-MX, zh_TW: zh-Hant-TW, es_CR: es-CR
45+
lang_map = zh_CN: zh-Hans, en_GB: en-GB, hu_HU: hu, ka_GE: ka-GE, es_PE: es-PE, es_419: es-419, pt_BR: pt-BR, es_CO: es-CO, fi_FI: fi-FI, es_CL: es-CL, es_NI: es-NI, es_SV: es-SV, nb_NO: nb-NO, sk_SK: sk-SK, es_PR: es-PR, es_PY: es-PY, es_PA: es-PA, es_AR: es-AR, es_GT: es-GT, es_UY: es-UY, cs_CZ: cs, es_DO: es-DO, es_EC: es-EC, es_HN: es-HN, pt_PT: pt-PT, ja_JP: ja-JP, es_MX: es-MX, zh_TW: zh-Hant-TW, es_CR: es-CR, sr@latin: sr-Latn
4646
replace_edited_strings = false
4747
keep_translations = false
4848

ActionExtension/ActionViewController.swift

Lines changed: 0 additions & 77 deletions
This file was deleted.

ActionExtension/Base.lproj/Info.plist

Lines changed: 0 additions & 55 deletions
This file was deleted.

ActionExtension/Base.lproj/MainInterface.storyboard

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)