Skip to content

Commit 5e88ac4

Browse files
Merge branch 'refactor' into History-Compose
# Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java # app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt # app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamStateDAO.kt # app/src/main/java/org/schabi/newpipe/settings/BackupRestoreSettingsFragment.java # app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamUtils.kt # gradle/libs.versions.toml
2 parents d7953d6 + 1bca5f3 commit 5e88ac4

336 files changed

Lines changed: 7767 additions & 3518 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.

.editorconfig

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
3+
# SPDX-License-Identifier: GPL-3.0-or-later
4+
#
5+
6+
root = true
7+
8+
[*.{kt,kts}]
9+
ktlint_function_naming_ignore_when_annotated_with = Composable
10+
ktlint_standard_annotation = disabled
11+
ktlint_standard_argument-list-wrapping = disabled
12+
ktlint_standard_backing-property-naming = disabled
13+
ktlint_standard_blank-line-before-declaration = disabled
14+
ktlint_standard_blank-line-between-when-conditions = disabled
15+
ktlint_standard_chain-method-continuation = disabled
16+
ktlint_standard_class-signature = disabled
17+
ktlint_standard_comment-wrapping = disabled
18+
ktlint_standard_enum-wrapping = disabled
19+
ktlint_standard_function-expression-body = disabled
20+
ktlint_standard_function-literal = disabled
21+
ktlint_standard_function-signature = disabled
22+
ktlint_standard_indent = disabled
23+
ktlint_standard_kdoc = disabled
24+
ktlint_standard_max-line-length = disabled
25+
ktlint_standard_mixed-condition-operators = disabled
26+
ktlint_standard_multiline-expression-wrapping = disabled
27+
ktlint_standard_multiline-if-else = disabled
28+
ktlint_standard_no-blank-line-in-list = disabled
29+
ktlint_standard_no-consecutive-comments = disabled
30+
ktlint_standard_no-empty-first-line-in-class-body = disabled
31+
ktlint_standard_no-empty-first-line-in-method-block = disabled
32+
ktlint_standard_no-line-break-after-else = disabled
33+
ktlint_standard_no-semi = disabled
34+
ktlint_standard_no-single-line-block-comment = disabled
35+
ktlint_standard_package-name = disabled
36+
ktlint_standard_parameter-list-wrapping = disabled
37+
ktlint_standard_property-naming = disabled
38+
ktlint_standard_spacing-between-declarations-with-annotations = disabled
39+
ktlint_standard_spacing-between-declarations-with-comments = disabled
40+
ktlint_standard_statement-wrapping = disabled
41+
ktlint_standard_string-template-indent = disabled
42+
ktlint_standard_trailing-comma-on-call-site = disabled
43+
ktlint_standard_trailing-comma-on-declaration-site = disabled
44+
ktlint_standard_try-catch-finally-spacing = disabled
45+
ktlint_standard_when-entry-bracing = disabled

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#### What is it?
44
- [ ] Bugfix (user facing)
5-
- [ ] Feature (user facing)
5+
- [ ] Feature (user facing) ⚠️ **Your PR must target the [`refactor`](https://github.com/TeamNewPipe/NewPipe/tree/refactor) branch**
66
- [ ] Codebase improvement (dev facing)
77
- [ ] Meta improvement to the project (dev facing)
88

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ captures/
77
*.iml
88
*~
99
.weblate
10+
.kotlin
1011
*.class
1112
app/debug/
1213
app/release/
@@ -19,3 +20,6 @@ app/release/
1920
bin/
2021
.vscode/
2122
*.code-workspace
23+
24+
# logs
25+
*.log

0 commit comments

Comments
 (0)