diff --git a/app/build.gradle b/app/build.gradle index 25d3f6573..a4b6a559b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,7 +61,6 @@ ext.evernoteLibraryVersion = '1.3.0-rc1' ext.gsonLibraryVersion = '2.8.2' ext.guavaLibraryVersion = '24.1-android' ext.photoViewLibraryVersion = '2.3.0' -ext.swipebackLibraryVersion = '1.0.3' ext.ratethisappLibraryVersion = '1.2.0' ext.uploadServiceVersion = "3.5.2" ext.torrentstreamVersion = "2.5.0" 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 e84090347..b80fdbfe7 100644 --- a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java @@ -36,6 +36,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.appcompat.app.ActionBar; @@ -80,7 +81,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf private ViewPager mPager; private long downloadID; private boolean fullscreen; - public SlidrInterface slidrInterface; + private SlidrInterface slidrInterface; int flags; private TextView media_description; private Handler handler; @@ -104,7 +105,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf setTheme(R.style.TransparentDark); } setContentView(R.layout.activity_media_pager); - CoordinatorLayout swipeBackLayout = findViewById(R.id.swipeBackLayout); + RelativeLayout swipeBackLayout = findViewById(R.id.swipeBackLayout); if (theme == Helper.THEME_LIGHT) { swipeBackLayout.setBackgroundResource(R.color.white); } else if (theme == Helper.THEME_BLACK) { @@ -116,11 +117,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf media_description = findViewById(R.id.media_description); flags = getWindow().getDecorView().getSystemUiVisibility(); - if (getSupportActionBar() != null) - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - if (getSupportActionBar() != null) - getSupportActionBar().setDisplayHomeAsUpEnabled(true); ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE); @@ -388,6 +385,14 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf super.onPostResume(); } + + public void enableSliding(boolean enable){ + if (enable) + slidrInterface.unlock(); + else + slidrInterface.lock(); + } + public boolean getFullScreen(){ return this.fullscreen; } diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java index 0b25640e1..7af800d3a 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -481,7 +481,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA Intent intent = new Intent(context, SlideMediaActivity.class); Bundle b = new Bundle(); intent.putParcelableArrayListExtra("mediaArray", status.getMedia_attachments()); - b.putInt("position", 0); + b.putInt("position", 1); intent.putExtras(b); context.startActivity(intent); } 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 6a442937b..9eff7c83d 100644 --- a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java @@ -164,6 +164,9 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl if( ! ((SlideMediaActivity)context).getFullScreen()) { ((SlideMediaActivity) context).setFullscreen(true); } + ((SlideMediaActivity) context).enableSliding(false); + }else{ + ((SlideMediaActivity) context).enableSliding(true); } } }); diff --git a/app/src/main/res/layout/activity_media_pager.xml b/app/src/main/res/layout/activity_media_pager.xml index 3ea38b51f..6abefb708 100644 --- a/app/src/main/res/layout/activity_media_pager.xml +++ b/app/src/main/res/layout/activity_media_pager.xml @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see . --> - - \ No newline at end of file + \ No newline at end of file