From 546711db74e43517b3672c08be12584a33933f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Fri, 24 Jan 2025 22:23:51 +0300 Subject: [PATCH 1/8] Update README.md * change links * organize and give more credits * remove unnecessary comment lines * add general information about project * add MaintainTeam f-droid repo link --- README.md | 241 +++++++----------------------------------------------- 1 file changed, 31 insertions(+), 210 deletions(-) diff --git a/README.md b/README.md index 5a2e40b7e..b53222698 100644 --- a/README.md +++ b/README.md @@ -1,55 +1,42 @@ -[Project Status](https://github.com/maintainteam/lastpipebender/discussions/6) -
-[Join Matrix Channel](https://matrix.to/#/!tYUpeILeZnyZspckwY:matrix.org?via=matrix.org) - -
-

+

LastPipeBender

-

A libre lightweight streaming front-end for Android.

+

A libre lightweight streaming front-end for Android - Fork of NewPipe & Tubular

- +

Get it on F-Droid
(F-Droid Repo Hosted by us, import it to Repositories)

-GitHub release -License: GPLv3 -Build Status -Translation Status -IRC channel: #newpipe -Matrix channel: #newpipe +GitHub release +License: GPLv3 +Build Status +Upstream Translation Status + +Matrix channel: #newpipe

-### Upstream Projects that Merged -- Completely Merged - - [NewPipe](https://github.com/TeamNewPipe/NewPipe) - - [Tubular](https://github.com/polymorphicshade/Tubular) -- Will be Merged - - [BraveNewPipe](https://github.com/bravenewpipe/NewPipe) -- Other apps to get some other features from - - [PipePipe](https://github.com/InfinityLoop1308/PipePipe) - - [SmartTube](https://github.com/yuliskov/SmartTube) - - [FreeTube](https://github.com/FreeTubeApp/FreeTube/) - - -Note: This readme will be updated and more citations will be given +### Upstream Projects +- [NewPipe](https://github.com/TeamNewPipe/NewPipe) + - This is the core of our Project ! + - Thanks to TeamNewPipe Maintainers and [Contributors](https://github.com/TeamNewPipe/NewPipe/graphs/contributors) + - [Donate](https://newpipe.net/donate/) +- [Tubular](https://github.com/polymorphicshade/Tubular) + - This is the fork that we merged RYD and SponsorBlock features + - Thanks to @polymorphicshade +- [Other forks/apps to merge other cool features from](https://github.com/MaintainTeam/LastPipeBender/wiki/Alternative-YouTube-Clients-List) -### APK Info +### APK Info & Security + +Both Debug and Release versions built by GitHub Actions. You can check checksum notice in Release Actions or/and checksum.txt in releases to compare with Application's This is the SHA fingerprint of LastPipeBender's signing key to verify downloaded APKs which are signed by us. ``` 1B:00:8D:64:BB:95:AB:47:74:D6:8B:87:F2:2B:8B:E9:A2:72:F4:92:4D:F5:20:29:D7:E6:18:38:35:D9:18:CC ``` -You should also check checksums in releases. Also you can compare checksums with GitHub Actions notices to ensure the apk file built with CI - - ### Project Management ```mermaid @@ -57,184 +44,18 @@ You should also check checksums in releases. Also you can compare checksums with title: Project Management --- graph TD - A[master_newpipe] --> D[dev] - B[master_tubular] --> D - C[dev_brave] --> D - D --> | Test & Mini Changes | E[master] - D --> X[A-feature] - D --> Y[B-feature] + A[NewPipe] --> D[dev] + B[Tubular] --> D + C[features from other forks/apps] --> F + D --> | test & mini changes | E[master] + D --> X[unique features] X --> | REVIEW | F[extended] - Y --> | REVIEW | F - F --> | Pre-Release | G(v0.xx.x-extended) + F --> G(Extended Version) - F --> | Ensure Long-Term Compatibility | E - E --> | Stable Release | K(v0.xx.x) + F --> | ensure long-term compatibility | E + E --> K(Stable Version) ``` --to be updated- ## License [![GNU GPLv3](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.en.html) - - - - - From 310d030a7f86ce4e656a3aae838dee1864250551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Fri, 24 Jan 2025 22:24:48 +0300 Subject: [PATCH 2/8] Update README.md * ._. * why github ui does not have amend feature ... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b53222698..c195c639b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

LastPipeBender

A libre lightweight streaming front-end for Android - Fork of NewPipe & Tubular

-

Get it on F-Droid
(F-Droid Repo Hosted by us, import it to Repositories)

+

Get it on F-Droid
(F-Droid repo hosted by us, import it to "Repositories")

From 1ff50915e89153311c8267152031c25c7d4cb7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Fri, 24 Jan 2025 22:26:47 +0300 Subject: [PATCH 3/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c195c639b..60a288edd 100644 --- a/README.md +++ b/README.md @@ -46,10 +46,10 @@ title: Project Management graph TD A[NewPipe] --> D[dev] B[Tubular] --> D - C[features from other forks/apps] --> F + C[features from other forks/apps] --> | review | F D --> | test & mini changes | E[master] D --> X[unique features] - X --> | REVIEW | F[extended] + X --> | review | F[extended] F --> G(Extended Version) From 74c1c3f177f6e3c79f0728a60b473d7ccc27971e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Fri, 24 Jan 2025 22:33:26 +0300 Subject: [PATCH 4/8] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 60a288edd..2f2e4419e 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,9 @@

### General Information -This project has been started for merging Tubular features with latest NewPipe fixes. Later I decided to improve it and created [extended version](https://github.com/MaintainTeam/LastPipeBender/wiki/Extended-Version) to implement new features. While both versions will be the soft-fork (backward-compatible) of NewPipe project, extended version may include some minor bugs. +This project has been started for merging Tubular features with latest NewPipe fixes. Later we decided to improve it and created [extended version](https://github.com/MaintainTeam/LastPipeBender/wiki/Extended-Version) to implement new features. While both versions will be the soft-fork (backward-compatible) of NewPipe project, extended version has [new features](https://github.com/MaintainTeam/LastPipeBender/wiki/Extended-Version#list-of-extended-features) and may include some minor bugs. + +We created a Roadmap with mostly feature requests. These features will be added to project after passive maintenance mode ends. See the related [discussion](https://github.com/maintainteam/lastpipebender/discussions/6) for more information about **Roadmap & Project Status** ### Upstream Projects - [NewPipe](https://github.com/TeamNewPipe/NewPipe) From 3f889658c79355a4eaeb5fa42c1dcd70a1a3e9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Fri, 24 Jan 2025 22:36:22 +0300 Subject: [PATCH 5/8] Update README.md - already rate limiting often - btw if anyone reading this, sorry for updating readme so often and making commit history complex.... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f2e4419e..18bf01120 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ GitHub release License: GPLv3 Build Status -Upstream Translation Status + Matrix channel: #newpipe

From bb6130bd7246e23244d47a8caa6789eac3acfe30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Fri, 7 Feb 2025 16:01:34 +0300 Subject: [PATCH 6/8] revert deleted state library --- .../fragments/list/sponsorblock/SponsorBlockFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/sponsorblock/SponsorBlockFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/sponsorblock/SponsorBlockFragment.java index e95bec467..470428251 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/sponsorblock/SponsorBlockFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/sponsorblock/SponsorBlockFragment.java @@ -26,7 +26,7 @@ import org.schabi.newpipe.local.sponsorblock.SponsorBlockDataManager; import org.schabi.newpipe.util.SponsorBlockHelper; import org.schabi.newpipe.util.SponsorBlockMode; -//import icepick.State; +import com.evernote.android.state.State; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; @@ -35,7 +35,7 @@ public class SponsorBlockFragment extends BaseFragment implements CompoundButton.OnCheckedChangeListener, SponsorBlockSegmentListAdapterListener { - //@State + @State StreamInfo streamInfo = null; FragmentSponsorBlockBinding binding; private Integer markedStartTime = null; From 5eb09473412f5218357dc9716ce32c48000075ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Sat, 1 Mar 2025 13:40:57 +0300 Subject: [PATCH 7/8] update project management mermaid --- README.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 18bf01120..a1f2ca913 100644 --- a/README.md +++ b/README.md @@ -46,17 +46,21 @@ This is the SHA fingerprint of LastPipeBender's signing key to verify downloaded title: Project Management --- graph TD - A[NewPipe] --> D[dev] - B[Tubular] --> D - C[features from other forks/apps] --> | review | F + B([Tubular]) --> D + A([NewPipe]) --> D[dev] + C([features from other forks/apps]) --> | review | F D --> | test & mini changes | E[master] - D --> X[unique features] - X --> | review | F[extended] + D --> | unique features | F[extended-dev] - F --> G(Extended Version) + G .-> | ensure long-term compatibility | E + E --> K>Stable Version] - F --> | ensure long-term compatibility | E - E --> K(Stable Version) + F --> | review | G[extended] + G --> H>Extended Version] + + F --> P[extended-refactor] + A --> | refactor branch changes | P + P --> Y>Refactor Build - WIP] ``` ## License From d9ad111a17aaca7273f32625611781562d919f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliberk=20Sand=C4=B1k=C3=A7=C4=B1?= Date: Sat, 1 Mar 2025 13:41:51 +0300 Subject: [PATCH 8/8] add new branches to ci --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79cbd79d8..7d6604754 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,8 @@ on: - dev - master - extended + - extended-dev + - extended-refactor - '**-feature-**' paths-ignore: - 'README.md' @@ -21,6 +23,8 @@ on: - dev - master - extended + - extended-dev + - extended-refactor - '**-feature-**' paths-ignore: - 'README.md'