From f097ac0854a49b14f6728dac5633e24e056bf0fd Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 23 Jun 2020 16:30:22 +0200 Subject: [PATCH] some changes --- .../android/activities/SlideMediaActivity.java | 11 ++++++++--- .../android/fragments/MediaSliderFragment.java | 2 -- app/src/main/res/values/styles.xml | 9 +++++++++ 3 files changed, 17 insertions(+), 5 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 ca7f816dd..e8d322da9 100644 --- a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java @@ -24,6 +24,7 @@ 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; @@ -35,12 +36,12 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.Window; import android.widget.ImageView; 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; @@ -128,8 +129,10 @@ public class SlideMediaActivity extends BaseFragmentActivity implements OnDownlo ActivityCompat.postponeEnterTransition(SlideMediaActivity.this); } + getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY); setContentView(R.layout.activity_media_pager); + fullscreen = false; media_description = findViewById(R.id.media_description); final int med_desc_timeout = sharedpreferences.getInt(Helper.SET_MED_DESC_TIMEOUT, 3) * 1000; @@ -141,11 +144,13 @@ public class SlideMediaActivity extends BaseFragmentActivity implements OnDownlo ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { - actionBar.setBackgroundDrawable(new ColorDrawable(bgColor)); + + actionBar.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + actionBar.setElevation(0); + 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.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); 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 fd0e3fb28..c78801abe 100644 --- a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java @@ -543,8 +543,6 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl public void onSlideChange(float percent) { if( percent < 0.80 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { ActivityCompat.finishAfterTransition((AppCompatActivity) context); - }else{ - ((SlideMediaActivity) context).setFullscreen(true); } } diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2a4fbc292..c7b99f299 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -180,6 +180,9 @@ true true @transition/anim + shortEdges + true + true