diff --git a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
index 3582d3bbf..ca7f816dd 100644
--- a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
@@ -25,7 +25,6 @@ import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.graphics.Point;
-import android.graphics.PorterDuff;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Build;
@@ -41,6 +40,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
@@ -152,7 +152,7 @@ public class SlideMediaActivity extends BaseFragmentActivity implements OnDownlo
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
ImageView media_save = actionBar.getCustomView().findViewById(R.id.media_save);
ImageView media_share = actionBar.getCustomView().findViewById(R.id.media_share);
- toolbar_close.setOnClickListener(v -> finish());
+ toolbar_close.setOnClickListener(v -> ActivityCompat.finishAfterTransition(this));
media_save.setOnClickListener(view12 -> {
int position = mPager.getCurrentItem();
Attachment attachment = attachments.get(position);
diff --git a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
index 64cdd4095..fd0e3fb28 100644
--- a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
@@ -118,6 +118,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
private SlidrInterface slidrInterface;
private boolean swipeEnabled;
private int bgColor;
+ private RelativeLayout media_fragment_container;
public MediaSliderFragment() {
}
@@ -185,7 +186,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
url = attachment.getRemote_url();
attachment.setType(type);
}
- RelativeLayout media_fragment_container = rootView.findViewById(R.id.media_fragment_container);
+ media_fragment_container = rootView.findViewById(R.id.media_fragment_container);
switch (type.toLowerCase()) {
case "image":
pbar_inf.setScaleY(1f);
@@ -540,7 +541,12 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
@Override
public void onSlideChange(float percent) {
- ((SlideMediaActivity) context).setFullscreen(true);
+ if( percent < 0.80 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ ActivityCompat.finishAfterTransition((AppCompatActivity) context);
+ }else{
+ ((SlideMediaActivity) context).setFullscreen(true);
+ }
+
}
@Override
@@ -550,12 +556,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
@Override
public boolean onSlideClosed() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- ActivityCompat.finishAfterTransition((Activity) context);
- }else{
- ((Activity)context).finish();
- }
- return true;
+ return false;
}
})
.build());
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 052eb0230..2a4fbc292 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,7 +27,7 @@
- true
- true
- @transition/anim
- - @transition/anim
+
@@ -109,7 +109,7 @@
- true
- true
- @transition/anim
- - @transition/anim
+
@@ -180,7 +180,6 @@
- true
- true
- @transition/anim
- - @transition/anim