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 dbc2d7888..0f08adaf3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -55,7 +55,6 @@ import de.danoeh.antennapod.storage.databasemaintenanceservice.DatabaseMaintenan
import de.danoeh.antennapod.storage.importexport.AutomaticDatabaseExportWorker;
import de.danoeh.antennapod.storage.preferences.PlaybackPreferences;
import de.danoeh.antennapod.storage.preferences.UserPreferences;
-import de.danoeh.antennapod.ui.TransitionEffect;
import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter;
import de.danoeh.antennapod.ui.appstartintent.MediaButtonStarter;
import de.danoeh.antennapod.ui.common.NavigationToolbarActivity;
@@ -513,24 +512,12 @@ public class MainActivity extends CastEnabledActivity implements NavigationToolb
updateMainBackCallbackEnabledState();
}
- public void loadChildFragment(Fragment fragment, TransitionEffect transition, String navigationTag) {
+ public void loadChildFragment(Fragment fragment, String navigationTag) {
Objects.requireNonNull(fragment);
if (navigationTag != null && bottomNavigation != null) {
bottomNavigation.updateSelectedItem(navigationTag);
}
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-
- if (transition == TransitionEffect.FADE) {
- transaction.setCustomAnimations(R.anim.fade_in, R.anim.fade_out);
- } else if (transition == TransitionEffect.SLIDE) {
- transaction.setCustomAnimations(
- R.anim.slide_right_in,
- R.anim.slide_left_out,
- R.anim.slide_left_in,
- R.anim.slide_right_out);
- }
-
- transaction
+ getSupportFragmentManager().beginTransaction()
.hide(getSupportFragmentManager().findFragmentByTag(MAIN_FRAGMENT_TAG))
.add(R.id.main_content_view, fragment, MAIN_FRAGMENT_TAG)
.addToBackStack(null)
@@ -538,12 +525,8 @@ public class MainActivity extends CastEnabledActivity implements NavigationToolb
updateMainBackCallbackEnabledState();
}
- public void loadChildFragment(Fragment fragment, TransitionEffect transition) {
- loadChildFragment(fragment, transition, null);
- }
-
public void loadChildFragment(Fragment fragment) {
- loadChildFragment(fragment, TransitionEffect.NONE);
+ loadChildFragment(fragment, null);
}
@Override
@@ -760,7 +743,7 @@ public class MainActivity extends CastEnabledActivity implements NavigationToolb
if (intent.getBooleanExtra(MainActivityStarter.EXTRA_CLEAR_BACK_STACK, true)) {
loadFragment(tag, null);
} else {
- loadChildFragment(createFragmentInstance(tag, args), TransitionEffect.NONE, tag);
+ loadChildFragment(createFragmentInstance(tag, args), tag);
}
}
sheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/TransitionEffect.java b/app/src/main/java/de/danoeh/antennapod/ui/TransitionEffect.java
deleted file mode 100644
index 092aeb3a5..000000000
--- a/app/src/main/java/de/danoeh/antennapod/ui/TransitionEffect.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.danoeh.antennapod.ui;
-
-public enum TransitionEffect {
- NONE, FADE, SLIDE
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java
index 8522e398b..c4f15a26d 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java
@@ -23,7 +23,6 @@ import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.databinding.FeedinfoBinding;
import de.danoeh.antennapod.event.MessageEvent;
import de.danoeh.antennapod.storage.database.DBWriter;
-import de.danoeh.antennapod.ui.TransitionEffect;
import de.danoeh.antennapod.storage.database.DBReader;
import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter;
import de.danoeh.antennapod.ui.common.ClipboardUtils;
@@ -107,8 +106,7 @@ public class FeedInfoFragment extends Fragment implements MaterialToolbar.OnMenu
.show(getChildFragmentManager().beginTransaction(), "FeedStatistics"));
viewBinding.statisticsButton.setOnClickListener(view -> {
- StatisticsFragment fragment = new StatisticsFragment();
- ((MainActivity) getActivity()).loadChildFragment(fragment, TransitionEffect.SLIDE);
+ ((MainActivity) getActivity()).loadChildFragment(new StatisticsFragment());
});
viewBinding.header.txtvTitle.setOnLongClickListener(v -> {
ClipboardUtils.copyText(viewBinding.header.txtvTitle);
@@ -241,8 +239,7 @@ public class FeedInfoFragment extends Fragment implements MaterialToolbar.OnMenu
.commitAllowingStateLoss();
viewBinding.statisticsButton.setOnClickListener(view -> {
- StatisticsFragment fragment = new StatisticsFragment();
- ((MainActivity) getActivity()).loadChildFragment(fragment, TransitionEffect.SLIDE);
+ ((MainActivity) getActivity()).loadChildFragment(new StatisticsFragment());
});
}
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java
index 768bd67cf..06d73e52a 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java
@@ -43,7 +43,6 @@ import de.danoeh.antennapod.storage.preferences.UserPreferences;
import de.danoeh.antennapod.ui.CoverLoader;
import de.danoeh.antennapod.ui.FeedItemFilterDialog;
import de.danoeh.antennapod.ui.MenuItemUtils;
-import de.danoeh.antennapod.ui.TransitionEffect;
import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter;
import de.danoeh.antennapod.ui.cleaner.HtmlToPlainText;
import de.danoeh.antennapod.ui.common.ClipboardUtils;
@@ -567,8 +566,7 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
if (feed == null) {
return;
}
- FeedSettingsFragment fragment = FeedSettingsFragment.newInstance(feed);
- ((MainActivity) getActivity()).loadChildFragment(fragment, TransitionEffect.SLIDE);
+ ((MainActivity) getActivity()).loadChildFragment(FeedSettingsFragment.newInstance(feed));
});
viewBinding.header.butFilter.setOnClickListener(v -> {
if (feed == null) {
@@ -611,7 +609,7 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
}
FeedInfoFragment fragment = FeedInfoFragment.newInstance(feed);
if (getActivity() instanceof MainActivity) {
- ((MainActivity) getActivity()).loadChildFragment(fragment, TransitionEffect.SLIDE);
+ ((MainActivity) getActivity()).loadChildFragment(fragment);
} else {
getActivity().getSupportFragmentManager()
.beginTransaction()
diff --git a/ui/common/src/main/res/anim/slide_left_in.xml b/ui/common/src/main/res/anim/slide_left_in.xml
deleted file mode 100644
index 288e06dd8..000000000
--- a/ui/common/src/main/res/anim/slide_left_in.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/ui/common/src/main/res/anim/slide_left_out.xml b/ui/common/src/main/res/anim/slide_left_out.xml
deleted file mode 100644
index 873947de4..000000000
--- a/ui/common/src/main/res/anim/slide_left_out.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/ui/common/src/main/res/anim/slide_right_in.xml b/ui/common/src/main/res/anim/slide_right_in.xml
deleted file mode 100644
index a00815052..000000000
--- a/ui/common/src/main/res/anim/slide_right_in.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/ui/common/src/main/res/anim/slide_right_out.xml b/ui/common/src/main/res/anim/slide_right_out.xml
deleted file mode 100644
index 46de69db3..000000000
--- a/ui/common/src/main/res/anim/slide_right_out.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/ui/preferences/src/main/res/layout/gpodnetauth_dialog.xml b/ui/preferences/src/main/res/layout/gpodnetauth_dialog.xml
index b5814a4e5..77777cae9 100644
--- a/ui/preferences/src/main/res/layout/gpodnetauth_dialog.xml
+++ b/ui/preferences/src/main/res/layout/gpodnetauth_dialog.xml
@@ -10,9 +10,7 @@
android:id="@+id/viewflipper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:measureAllChildren="false"
- android:inAnimation="@anim/slide_right_in"
- android:outAnimation="@anim/slide_left_out">
+ android:measureAllChildren="false">