Commit 5e88ac4
committed
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.toml336 files changed
Lines changed: 7767 additions & 3518 deletions
File tree
- .github
- app
- schemas/org.schabi.newpipe.database.AppDatabase
- src
- androidTest/java/org/schabi/newpipe
- database
- error
- local/history
- ui/components
- common
- video/comment
- main
- java
- org/schabi/newpipe
- database
- feed/dao
- history
- dao
- model
- playlist
- dao
- model
- stream
- dao
- model
- subscription
- error
- fragments
- detail
- list
- channel
- search
- local
- bookmark
- dialog
- feed
- holder
- playlist
- subscription
- workers
- paging
- player
- event
- helper
- mediabrowser
- notification
- playqueue
- ui
- settings
- notifications
- preferencesearch
- viewmodel
- streams
- ui/components
- common
- items/stream
- video/comment
- util
- external_communication
- text
- us/shandian/giga
- get
- service
- res
- layout
- values-ar
- values-az
- values-be
- values-bg
- values-bs
- values-ca
- values-cs
- values-da
- values-de
- values-el
- values-en-rGB
- values-es
- values-et
- values-fr
- values-he
- values-hr
- values-hu
- values-in
- values-is
- values-it
- values-kab
- values-ka
- values-ko
- values-lmo
- values-lv
- values-nl-rBE
- values-nl
- values-pl
- values-pt-rBR
- values-pt-rPT
- values-pt
- values-ro
- values-ru
- values-sc
- values-sk
- values-sl
- values-sr
- values-sv
- values-th
- values-ti
- values-tr
- values-uk
- values-vi
- values-zh-rCN
- values-zh-rTW
- test/java/org/schabi/newpipe
- database/playlist
- streams
- buildSrc
- src/main/kotlin
- fastlane/metadata/android
- bg/changelogs
- bs/changelogs
- de
- changelogs
- el/changelogs
- en_GB/changelogs
- es/changelogs
- fr/changelogs
- id/changelogs
- ka/changelogs
- ko/changelogs
- pt-BR/changelogs
- pt-PT/changelogs
- pt/changelogs
- ru/changelogs
- sr/changelogs
- sv/changelogs
- th
- changelogs
- tr/changelogs
- vi
- changelogs
- zh-Hans/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 | + | |
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
0 commit comments