Commit efcd3fe
committed
Merge branch 'dev' into Refactor-extractor-date
# Conflicts:
# app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt
# app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt
# app/src/main/java/org/schabi/newpipe/database/Converters.kt
# app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
# app/src/main/java/org/schabi/newpipe/database/feed/model/FeedLastUpdatedEntity.kt
# app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.kt
# app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
# app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt
# app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt
# app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt
# app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.kt
# app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
# app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt
# app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
# app/src/main/java/org/schabi/newpipe/local/feed/FeedState.kt
# app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt
# app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt
# app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
# app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
# app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
# app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
# app/src/main/res/values/strings.xml
# app/src/test/java/org/schabi/newpipe/util/LocalizationTest.kt
# gradle/libs.versions.toml1,058 files changed
Lines changed: 18722 additions & 11611 deletions
File tree
- .github
- ISSUE_TEMPLATE
- workflows
- app
- schemas/org.schabi.newpipe.database.AppDatabase
- src
- androidTest/java/org/schabi/newpipe
- database
- local
- history
- playlist
- testUtil
- util
- main
- java
- org/schabi/newpipe
- about
- database
- feed
- dao
- model
- history
- dao
- model
- playlist
- dao
- model
- stream
- dao
- model
- subscription
- download
- error
- fragments
- detail
- list
- channel
- comments
- kiosk
- playlist
- search
- info_list
- dialog
- holder
- ktx
- local
- bookmark
- dialog
- feed
- item
- notifications
- service
- history
- holder
- playlist
- subscription
- dialog
- item
- services
- workers
- player
- datasource
- gesture
- helper
- mediabrowser
- notification
- playback
- playqueue
- events
- resolver
- seekbarpreview
- ui
- settings
- export
- migration
- notifications
- preferencesearch
- tabs
- streams
- util
- external_communication
- image
- potoken
- text
- views
- player
- us/shandian/giga
- get
- sqlite
- postprocessing
- service
- ui
- adapter
- fragment
- res
- drawable
- layout-land
- layout
- values-aeb
- values-ang
- values-ar-rLY
- values-ars
- values-ar
- values-ayc
- values-ay
- values-azb
- values-az
- values-b+ast
- values-b+uz+Latn
- values-be
- values-bg
- values-bn-rBD
- values-bn-rIN
- values-bn
- values-bqi
- values-br
- values-bs
- values-ca
- values-ckb
- values-cs
- values-da
- values-de
- values-el
- values-en-rGB
- values-enm
- values-eo
- values-es
- values-et
- values-eu
- values-fa
- values-fil
- values-fi
- values-frc
- values-fr
- values-gl
- values-he
- values-hi
- values-hr
- values-hu
- values-hy
- values-ia
- values-in
- values-is
- values-it
- values-ja
- values-kab
- values-ka
- values-kmr
- values-ko
- values-ks
- values-ku
- values-lmo
- values-lt
- values-lv
- values-mk
- values-ml
- values-mr
- values-ms
- values-nb-rNO
- values-nds
- values-ne
- values-nl-rBE
- values-nl
- values-nqo
- values-or
- values-pa
- values-pl
- values-pt-rBR
- values-pt-rPT
- values-pt
- values-ro
- values-ru
- values-ryu
- values-sat
- values-scn
- values-sc
- values-sk
- values-sl
- values-so
- values-sq
- values-sr
- values-sv
- values-ta
- values-te
- values-th
- values-ti
- values-tr
- values-tzm
- values-uk
- values-ur
- values-vi
- values-vmf
- values-zh-rCN
- values-zh-rHK
- values-zh-rTW
- values
- xml
- test/java/org/schabi/newpipe
- database/playlist
- ktx
- local
- playlist
- subscription
- services
- settings
- streams
- util
- buildSrc
- src/main/kotlin
- fastlane/metadata/android
- ar/changelogs
- azb
- az/changelogs
- bg/changelogs
- bn-IN
- bs/changelogs
- cs/changelogs
- de
- changelogs
- el/changelogs
- en-US/changelogs
- en_GB/changelogs
- es/changelogs
- eu/changelogs
- fa/changelogs
- fr/changelogs
- he/changelogs
- hi/changelogs
- hu/changelogs
- id/changelogs
- it/changelogs
- ja/changelogs
- ka/changelogs
- ko/changelogs
- lmo
- lv/changelogs
- my-MM
- nl/changelogs
- pa/changelogs
- pl/changelogs
- pt-BR/changelogs
- pt-PT/changelogs
- pt/changelogs
- ro/changelogs
- ru/changelogs
- sat
- sk/changelogs
- sq
- changelogs
- sr/changelogs
- sv
- changelogs
- ta/changelogs
- th
- changelogs
- tr/changelogs
- uk/changelogs
- uz-Latn/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 | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
6 | 19 | | |
7 | 20 | | |
8 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
| 30 | + | |
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
| 29 | + | |
28 | 30 | | |
29 | 31 | | |
30 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
| 36 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
| 40 | + | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
| 83 | + | |
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
| |||
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
92 | | - | |
| 92 | + | |
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| |||
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
107 | | - | |
| 107 | + | |
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
| 121 | + | |
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
126 | | - | |
| 126 | + | |
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
133 | | - | |
| 133 | + | |
134 | 134 | | |
135 | 135 | | |
136 | 136 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
0 commit comments