Merge branch 'refs/heads/refactor' into About-Compose

# Conflicts: # app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt # build.gradle
TeamNewPipe · Nov 16, 2024 · 226b6de · 226b6de
2 parents 4f4136c + 13585ca
commit 226b6de
Show file tree

Hide file tree

Showing 69 changed files with 1,442 additions and 1,216 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,10 +47,10 @@ jobs:
           BRANCH: ${{ github.head_ref }}
         run: git checkout -B "$BRANCH"
 
-      - name: set up JDK 17
+      - name: set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: "temurin"
           cache: 'gradle'
 
@@ -88,10 +88,10 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
-      - name: set up JDK 17
+      - name: set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: "temurin"
           cache: 'gradle'
 
@@ -121,10 +121,10 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: "temurin"
           cache: 'gradle'
 

diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ captures/
 *.class
 app/debug/
 app/release/
+.kotlin/
 
 # vscode / eclipse files
 *.classpath

diff --git a/app/build.gradle b/app/build.gradle
@@ -96,6 +96,7 @@ android {
     buildFeatures {
         viewBinding true
         compose true
+        buildConfig true
     }
 
     packagingOptions {
@@ -116,7 +117,7 @@ ext {
     androidxRoomVersion = '2.6.1'
     androidxWorkVersion = '2.8.1'
 
-    icepickVersion = '3.2.0'
+    stateSaverVersion = '1.4.1'
     exoPlayerVersion = '2.18.7'
     googleAutoServiceVersion = '1.1.1'
     groupieVersion = '2.10.1'
@@ -206,7 +207,8 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.teamnewpipe:newpipeextractor:v0.24.2'
+    // WORKAROUND: v0.24.2 can't be resolved by jitpack -> use git commit hash instead
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:176da72cb4c3ec4679211339b0e59f6b01bf2f52'
     implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
@@ -222,7 +224,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'
+    implementation 'androidx.fragment:fragment-compose:1.8.2'
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
@@ -239,8 +241,9 @@ dependencies {
 
 /** Third-party libraries **/
     // Instance state boilerplate elimination
-    implementation "frankiesardo:icepick:${icepickVersion}"
-    kapt "frankiesardo:icepick-processor:${icepickVersion}"
+    implementation 'com.github.livefront:bridge:v2.0.2'
+    implementation "com.evernote:android-state:$stateSaverVersion"
+    kapt "com.evernote:android-state-processor:$stateSaverVersion"
 
     // HTML parser
     implementation "org.jsoup:jsoup:1.17.2"
@@ -288,18 +291,19 @@ dependencies {
     // Date and time formatting
     implementation "org.ocpsoft.prettytime:prettytime:5.0.8.Final"
 
-    // Jetpack Compose BOM group
-    implementation(platform('androidx.compose:compose-bom:2024.09.03'))
+    // Jetpack Compose
+    implementation(platform('androidx.compose:compose-bom:2024.10.01'))
     implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.compose.material3.adaptive:adaptive'
+    implementation 'androidx.activity:activity-compose'
     implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose'
     implementation 'androidx.compose.ui:ui-text' // Needed for parsing HTML to AnnotatedString
+    implementation 'androidx.compose.material:material-icons-extended'
 
     // Jetpack Compose related dependencies
-    implementation 'androidx.compose.material3.adaptive:adaptive:1.0.0'
-    implementation 'androidx.activity:activity-compose:1.9.2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6'
     implementation 'androidx.paging:paging-compose:3.3.2'
-    implementation "androidx.navigation:navigation-compose:2.8.2"
+    implementation "androidx.navigation:navigation-compose:2.8.3"
 
     // Coroutines interop
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-rx3:1.8.1'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -13,15 +13,6 @@
 ## Rules for ExoPlayer
 -keep class com.google.android.exoplayer2.** { *; }
 
-## Rules for Icepick. Copy pasted from https://github.com/frankiesardo/icepick
--dontwarn icepick.**
--keep class icepick.** { *; }
--keep class **$$Icepick { *; }
--keepclasseswithmembernames class * {
-    @icepick.* <fields>;
-}
--keepnames class * { @icepick.State *;}
-
 ## Rules for OkHttp. Copy pasted from https://github.com/square/okhttp
 -dontwarn okhttp3.**
 -dontwarn okio.**

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
@@ -21,6 +21,7 @@
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.util.BridgeStateSaverInitializer;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
@@ -107,6 +108,7 @@ public void onCreate() {
             Localization.getPreferredContentCountry(this));
         Localization.initPrettyTime(Localization.resolvePrettyTime(getApplicationContext()));
 
+        BridgeStateSaverInitializer.init(this);
         StateSaver.init(this);
         initNotificationChannels();
 

diff --git a/app/src/main/java/org/schabi/newpipe/BaseFragment.java b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
@@ -10,8 +10,9 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import icepick.Icepick;
-import icepick.State;
+import com.evernote.android.state.State;
+import com.livefront.bridge.Bridge;
+
 
 public abstract class BaseFragment extends Fragment {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
@@ -48,7 +49,7 @@ public void onCreate(final Bundle savedInstanceState) {
                     + "savedInstanceState = [" + savedInstanceState + "]");
         }
         super.onCreate(savedInstanceState);
-        Icepick.restoreInstanceState(this, savedInstanceState);
+        Bridge.restoreInstanceState(this, savedInstanceState);
         if (savedInstanceState != null) {
             onRestoreInstanceState(savedInstanceState);
         }
@@ -70,7 +71,7 @@ public void onViewCreated(@NonNull final View rootView, final Bundle savedInstan
     @Override
     public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Icepick.saveInstanceState(this, outState);
+        Bridge.saveInstanceState(this, outState);
     }
 
     protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -44,15 +44,13 @@
 import android.widget.Spinner;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentContainerView;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
@@ -66,13 +64,11 @@
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
-import org.schabi.newpipe.fragments.list.comments.CommentRepliesFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.local.feed.notifications.NotificationWorker;
 import org.schabi.newpipe.player.Player;
@@ -557,39 +553,27 @@ public void onBackPressed() {
         // In case bottomSheet is not visible on the screen or collapsed we can assume that the user
         // interacts with a fragment inside fragment_holder so all back presses should be
         // handled by it
+        final var fragmentManager = getSupportFragmentManager();
+
         if (bottomSheetHiddenOrCollapsed()) {
-            final FragmentManager fm = getSupportFragmentManager();
-            final Fragment fragment = fm.findFragmentById(R.id.fragment_holder);
+            final var fragment = fragmentManager.findFragmentById(R.id.fragment_holder);
             // If current fragment implements BackPressable (i.e. can/wanna handle back press)
             // delegate the back press to it
-            if (fragment instanceof BackPressable) {
-                if (((BackPressable) fragment).onBackPressed()) {
-                    return;
-                }
-            } else if (fragment instanceof CommentRepliesFragment) {
-                // expand DetailsFragment if CommentRepliesFragment was opened
-                // to show the top level comments again
-                // Expand DetailsFragment if CommentRepliesFragment was opened
-                // and no other CommentRepliesFragments are on top of the back stack
-                // to show the top level comments again.
-                openDetailFragmentFromCommentReplies(fm, false);
+            if (fragment instanceof BackPressable backPressable && backPressable.onBackPressed()) {
+                return;
             }
-
         } else {
-            final Fragment fragmentPlayer = getSupportFragmentManager()
-                    .findFragmentById(R.id.fragment_player_holder);
+            final var player = fragmentManager.findFragmentById(R.id.fragment_player_holder);
             // If current fragment implements BackPressable (i.e. can/wanna handle back press)
             // delegate the back press to it
-            if (fragmentPlayer instanceof BackPressable) {
-                if (!((BackPressable) fragmentPlayer).onBackPressed()) {
-                    BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder)
-                            .setState(BottomSheetBehavior.STATE_COLLAPSED);
-                }
+            if (player instanceof BackPressable backPressable && !backPressable.onBackPressed()) {
+                BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder)
+                        .setState(BottomSheetBehavior.STATE_COLLAPSED);
                 return;
             }
         }
 
-        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
+        if (fragmentManager.getBackStackEntryCount() == 1) {
             finish();
         } else {
             super.onBackPressed();
@@ -648,15 +632,9 @@ public void onRequestPermissionsResult(final int requestCode,
      * </pre>
      */
     private void onHomeButtonPressed() {
-        final FragmentManager fm = getSupportFragmentManager();
-        final Fragment fragment = fm.findFragmentById(R.id.fragment_holder);
-
-        if (fragment instanceof CommentRepliesFragment) {
-            // Expand DetailsFragment if CommentRepliesFragment was opened
-            // and no other CommentRepliesFragments are on top of the back stack
-            // to show the top level comments again.
-            openDetailFragmentFromCommentReplies(fm, true);
-        } else if (!NavigationHelper.tryGotoSearchFragment(fm)) {
+        final var fm = getSupportFragmentManager();
+
+        if (!NavigationHelper.tryGotoSearchFragment(fm)) {
             // If search fragment wasn't found in the backstack go to the main fragment
             NavigationHelper.gotoMainFragment(fm);
         }
@@ -854,68 +832,6 @@ public void onReceive(final Context context, final Intent intent) {
         }
     }
 
-    private void openDetailFragmentFromCommentReplies(
-            @NonNull final FragmentManager fm,
-            final boolean popBackStack
-    ) {
-        // obtain the name of the fragment under the replies fragment that's going to be popped
-        @Nullable final String fragmentUnderEntryName;
-        if (fm.getBackStackEntryCount() < 2) {
-            fragmentUnderEntryName = null;
-        } else {
-            fragmentUnderEntryName = fm.getBackStackEntryAt(fm.getBackStackEntryCount() - 2)
-                    .getName();
-        }
-
-        // the root comment is the comment for which the user opened the replies page
-        @Nullable final CommentRepliesFragment repliesFragment =
-                (CommentRepliesFragment) fm.findFragmentByTag(CommentRepliesFragment.TAG);
-        @Nullable final CommentsInfoItem rootComment =
-                repliesFragment == null ? null : repliesFragment.getCommentsInfoItem();
-
-        // sometimes this function pops the backstack, other times it's handled by the system
-        if (popBackStack) {
-            fm.popBackStackImmediate();
-        }
-
-        // only expand the bottom sheet back if there are no more nested comment replies fragments
-        // stacked under the one that is currently being popped
-        if (CommentRepliesFragment.TAG.equals(fragmentUnderEntryName)) {
-            return;
-        }
-
-        final BottomSheetBehavior<FragmentContainerView> behavior = BottomSheetBehavior
-                .from(mainBinding.fragmentPlayerHolder);
-        // do not return to the comment if the details fragment was closed
-        if (behavior.getState() == BottomSheetBehavior.STATE_HIDDEN) {
-            return;
-        }
-
-        // scroll to the root comment once the bottom sheet expansion animation is finished
-        behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
-            @Override
-            public void onStateChanged(@NonNull final View bottomSheet,
-                                       final int newState) {
-                if (newState == BottomSheetBehavior.STATE_EXPANDED) {
-                    final Fragment detailFragment = fm.findFragmentById(
-                            R.id.fragment_player_holder);
-                    if (detailFragment instanceof VideoDetailFragment && rootComment != null) {
-                        // should always be the case
-                        ((VideoDetailFragment) detailFragment).scrollToComment(rootComment);
-                    }
-                    behavior.removeBottomSheetCallback(this);
-                }
-            }
-
-            @Override
-            public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
-                // not needed, listener is removed once the sheet is expanded
-            }
-        });
-
-        behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-    }
-
     private boolean bottomSheetHiddenOrCollapsed() {
         final BottomSheetBehavior<FrameLayout> bottomSheetBehavior =
                 BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder);

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -41,6 +41,9 @@
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceManager;
 
+import com.evernote.android.state.State;
+import com.livefront.bridge.Bridge;
+
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
 import org.schabi.newpipe.databinding.SingleChoiceDialogViewBinding;
@@ -98,8 +101,6 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 
-import icepick.Icepick;
-import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
@@ -152,7 +153,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         getWindow().setAttributes(params);
 
         super.onCreate(savedInstanceState);
-        Icepick.restoreInstanceState(this, savedInstanceState);
+        Bridge.restoreInstanceState(this, savedInstanceState);
 
         // FragmentManager will take care to recreate (Playlist|Download)Dialog when screen rotates
         // We used to .setOnDismissListener(dialog -> finish()); when creating these DialogFragments
@@ -197,7 +198,7 @@ protected void onStop() {
     @Override
     protected void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Icepick.saveInstanceState(this, outState);
+        Bridge.saveInstanceState(this, outState);
     }
 
     @Override