diff options
Diffstat (limited to 'app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java')
| -rw-r--r-- | app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java | 50 |
1 files changed, 13 insertions, 37 deletions
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 695456f1a..58807de8f 100644 --- a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java @@ -24,7 +24,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.graphics.Color; import android.graphics.Point; import android.graphics.drawable.ColorDrawable; import android.net.Uri; @@ -49,11 +48,6 @@ import androidx.fragment.app.FragmentStatePagerAdapter; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; -import com.r0adkll.slidr.Slidr; -import com.r0adkll.slidr.model.SlidrConfig; -import com.r0adkll.slidr.model.SlidrInterface; -import com.r0adkll.slidr.model.SlidrPosition; - import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -72,7 +66,7 @@ import es.dmoral.toasty.Toasty; * Media Activity */ -public class SlideMediaActivity extends BaseActivity implements OnDownloadInterface { +public class SlideMediaActivity extends BaseFragmentActivity implements OnDownloadInterface { int flags; private ArrayList<Attachment> attachments; @@ -80,13 +74,13 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf private ViewPager mPager; private long downloadID; private boolean fullscreen; - private SlidrInterface slidrInterface; private TextView media_description; private Handler handler; - private boolean swipeEnabled; private int minTouch, maxTouch; private float startX; private float startY; + private int bgColor; + private BroadcastReceiver onDownloadComplete = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -131,21 +125,24 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf media_description = findViewById(R.id.media_description); final int med_desc_timeout = sharedpreferences.getInt(Helper.SET_MED_DESC_TIMEOUT, 3) * 1000; flags = getWindow().getDecorView().getSystemUiVisibility(); + if (getIntent().getExtras() != null) { + mediaPosition = getIntent().getExtras().getInt("position", 1); + bgColor = getIntent().getExtras().getInt("bgcolor", -1); + } - swipeEnabled = true; ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { - //actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(SlideMediaActivity.this, R.color.cyanea_primary))); + actionBar.setBackgroundDrawable(new ColorDrawable(bgColor)); LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE); assert inflater != null; View view = inflater.inflate(R.layout.media_action_bar, new LinearLayout(SlideMediaActivity.this), false); - view.setBackground(new ColorDrawable(ContextCompat.getColor(SlideMediaActivity.this, R.color.cyanea_primary))); + view.setBackgroundColor(bgColor); actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close); TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title); - ImageView media_save = getSupportActionBar().getCustomView().findViewById(R.id.media_save); - ImageView media_share = getSupportActionBar().getCustomView().findViewById(R.id.media_share); + 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()); media_save.setOnClickListener(view12 -> { int position = mPager.getCurrentItem(); @@ -198,8 +195,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf } attachments = getIntent().getParcelableArrayListExtra("mediaArray"); - if (getIntent().getExtras() != null) - mediaPosition = getIntent().getExtras().getInt("position", 1); + if (attachments == null || attachments.size() == 0) finish(); @@ -246,19 +242,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf } }); - SlidrConfig config = new SlidrConfig.Builder() - .sensitivity(1f) - .scrimColor(Color.BLACK) - .scrimStartAlpha(0.8f) - .scrimEndAlpha(0f) - .position(SlidrPosition.VERTICAL) - .velocityThreshold(2400) - .distanceThreshold(0.25f) - .edgeSize(0.18f) - .build(); - - slidrInterface = Slidr.attach(SlideMediaActivity.this, config); setFullscreen(true); Display display = getWindowManager().getDefaultDisplay(); Point size = new Point(); @@ -352,15 +336,6 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf super.onPostResume(); } - public void enableSliding(boolean enable) { - if (enable && !swipeEnabled) { - slidrInterface.unlock(); - swipeEnabled = true; - } else if (!enable && swipeEnabled) { - slidrInterface.lock(); - swipeEnabled = false; - } - } public boolean getFullScreen() { return this.fullscreen; @@ -419,6 +394,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf MediaSliderFragment mediaSliderFragment = new MediaSliderFragment(); bundle.putInt("position", position); bundle.putParcelable("attachment", attachments.get(position)); + bundle.putInt("bgcolor", bgColor); mediaSliderFragment.setArguments(bundle); return mediaSliderFragment; } |