Commit 52a2acc
committed
Merge branch 'refactor' into Playlist-Compose
# Conflicts:
# app/build.gradle
# app/src/main/java/org/schabi/newpipe/MainActivity.java
# app/src/main/java/org/schabi/newpipe/error/ReCaptchaActivity.java
# app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
# app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt
# app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
# app/src/main/java/org/schabi/newpipe/ktx/Bundle.kt
# app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
# app/src/main/java/org/schabi/newpipe/paging/CommentsSource.kt
# app/src/main/java/org/schabi/newpipe/ui/components/common/DescriptionText.kt
# app/src/main/java/org/schabi/newpipe/ui/components/common/LoadingIndicator.kt
# app/src/main/java/org/schabi/newpipe/viewmodels/CommentsViewModel.kt
# build.gradle220 files changed
Lines changed: 4519 additions & 2412 deletions
File tree
- .github
- ISSUE_TEMPLATE
- workflows
- .idea
- app
- src
- main
- java
- org/schabi/newpipe
- about
- database/stream/dao
- download
- error
- fragments
- detail
- list
- channel
- comments
- kiosk
- playlist
- search
- videos
- info_list
- dialog
- holder
- ktx
- local
- bookmark
- feed
- history
- playlist
- subscription
- dialog
- item
- paging
- player
- helper
- mediasession
- seekbarpreview
- settings
- preferencesearch
- viewmodel
- ui
- components
- about
- comment
- common
- items
- playlist
- stream
- playlist
- stream
- video
- comment
- emptystate
- screens
- util
- external_communication
- image
- viewmodels
- util
- views
- us/shandian/giga/ui/fragment
- res
- layout-land
- layout
- values
- xml
- test/java/org/schabi/newpipe/error
- doc
- fastlane/metadata/android
- ar/changelogs
- az/changelogs
- cs/changelogs
- de/changelogs
- en-US/changelogs
- es/changelogs
- fa/changelogs
- fr/changelogs
- he/changelogs
- hi/changelogs
- id/changelogs
- it/changelogs
- ka/changelogs
- nl/changelogs
- pa/changelogs
- pt-BR/changelogs
- pt-PT/changelogs
- pt/changelogs
- ru/changelogs
- sv/changelogs
- tr/changelogs
- uk/changelogs
- vi/changelogs
- zh-Hans/changelogs
- zh-Hant/changelogs
- zh_Hant_HK/changelogs
- gradle
- wrapper
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
82 | | - | |
83 | | - | |
84 | | - | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
6 | 9 | | |
7 | 10 | | |
8 | 11 | | |
9 | | - | |
10 | | - | |
11 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
| 91 | + | |
92 | 92 | | |
93 | 93 | | |
94 | | - | |
| 94 | + | |
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | | - | |
| 124 | + | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
| 127 | + | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| |||
Loading
0 commit comments