1 files changed, 34 insertions, 34 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 08686bd02..6a38f8f0a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -11,16 +11,16 @@ import android.database.DataSetObserver;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
@@ -47,7 +47,6 @@ import de.danoeh.antennapod.adapter.NavListAdapter;
 import de.danoeh.antennapod.core.asynctask.FeedRemover;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.event.MessageEvent;
-import de.danoeh.antennapod.core.event.ProgressEvent;
 import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
@@ -70,6 +69,7 @@ import de.danoeh.antennapod.fragment.FeedItemlistFragment;
 import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
+import de.danoeh.antennapod.fragment.TransitionEffect;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
 import de.danoeh.antennapod.preferences.PreferenceUpgrader;
 import io.reactivex.Observable;
@@ -378,15 +378,34 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
         }
     }
 
-    public void loadChildFragment(Fragment fragment) {
+    public void loadChildFragment(Fragment fragment, TransitionEffect transition) {
         Validate.notNull(fragment);
-        FragmentManager fm = getSupportFragmentManager();
-        fm.beginTransaction()
-                .replace(R.id.main_view, fragment, "main")
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+
+        switch (transition) {
+            case FADE:
+                transaction.setCustomAnimations(R.anim.fade_in, R.anim.fade_out);
+                break;
+            case FLIP:
+                transaction.setCustomAnimations(
+                    R.anim.card_flip_left_in,
+                    R.anim.card_flip_left_out,
+                    R.anim.card_flip_right_in,
+                    R.anim.card_flip_right_out);
+                break;
+        }
+
+        transaction
+                .hide(getSupportFragmentManager().findFragmentByTag("main"))
+                .add(R.id.main_view, fragment, "main")
                 .addToBackStack(null)
                 .commit();
     }
 
+    public void loadChildFragment(Fragment fragment) {
+        loadChildFragment(fragment, TransitionEffect.NONE);
+    }
+
     public void dismissChildFragment() {
         getSupportFragmentManager().popBackStack();
     }
@@ -788,25 +807,6 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(ProgressEvent event) {
-        Log.d(TAG, "onEvent(" + event + ")");
-        switch(event.action) {
-            case START:
-                pd = new ProgressDialog(this);
-                pd.setMessage(event.message);
-                pd.setIndeterminate(true);
-                pd.setCancelable(false);
-                pd.show();
-                break;
-            case END:
-                if(pd != null) {
-                    pd.dismiss();
-                }
-                break;
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(MessageEvent event) {
         Log.d(TAG, "onEvent(" + event + ")");
         View parentLayout = findViewById(R.id.drawer_layout);