some changes
This commit is contained in:
parent
c11025a8f9
commit
e63bc4711d
|
@ -25,7 +25,6 @@ import android.content.IntentFilter;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.graphics.Point;
|
import android.graphics.Point;
|
||||||
import android.graphics.PorterDuff;
|
|
||||||
import android.graphics.drawable.ColorDrawable;
|
import android.graphics.drawable.ColorDrawable;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
|
@ -41,6 +40,7 @@ import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import androidx.appcompat.app.ActionBar;
|
import androidx.appcompat.app.ActionBar;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.core.app.ActivityCompat;
|
import androidx.core.app.ActivityCompat;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.fragment.app.Fragment;
|
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);
|
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
|
||||||
ImageView media_save = actionBar.getCustomView().findViewById(R.id.media_save);
|
ImageView media_save = actionBar.getCustomView().findViewById(R.id.media_save);
|
||||||
ImageView media_share = actionBar.getCustomView().findViewById(R.id.media_share);
|
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 -> {
|
media_save.setOnClickListener(view12 -> {
|
||||||
int position = mPager.getCurrentItem();
|
int position = mPager.getCurrentItem();
|
||||||
Attachment attachment = attachments.get(position);
|
Attachment attachment = attachments.get(position);
|
||||||
|
|
|
@ -118,6 +118,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
|
||||||
private SlidrInterface slidrInterface;
|
private SlidrInterface slidrInterface;
|
||||||
private boolean swipeEnabled;
|
private boolean swipeEnabled;
|
||||||
private int bgColor;
|
private int bgColor;
|
||||||
|
private RelativeLayout media_fragment_container;
|
||||||
|
|
||||||
public MediaSliderFragment() {
|
public MediaSliderFragment() {
|
||||||
}
|
}
|
||||||
|
@ -185,7 +186,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
|
||||||
url = attachment.getRemote_url();
|
url = attachment.getRemote_url();
|
||||||
attachment.setType(type);
|
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()) {
|
switch (type.toLowerCase()) {
|
||||||
case "image":
|
case "image":
|
||||||
pbar_inf.setScaleY(1f);
|
pbar_inf.setScaleY(1f);
|
||||||
|
@ -540,7 +541,12 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSlideChange(float percent) {
|
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
|
@Override
|
||||||
|
@ -550,12 +556,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onSlideClosed() {
|
public boolean onSlideClosed() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
return false;
|
||||||
ActivityCompat.finishAfterTransition((Activity) context);
|
|
||||||
}else{
|
|
||||||
((Activity)context).finish();
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.build());
|
.build());
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
<style name="Cyanea.PopupMenu.Light" parent="@style/Widget.AppCompat.PopupMenu">
|
<style name="Cyanea.PopupMenu.Light" parent="@style/Widget.AppCompat.PopupMenu">
|
||||||
<item name="android:popupBackground">@color/cyanea_primary_dark_reference</item>
|
<item name="android:popupBackground">@color/cyanea_primary_dark_reference</item>
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
<!-- BLACK theme -->
|
<!-- BLACK theme -->
|
||||||
<style name="AppThemeBlack" parent="Theme.Cyanea.Dark">
|
<style name="AppThemeBlack" parent="Theme.Cyanea.Dark">
|
||||||
|
@ -67,7 +67,7 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
<style name="Cyanea.PopupMenu.black" parent="@style/Widget.AppCompat.PopupMenu">
|
<style name="Cyanea.PopupMenu.black" parent="@style/Widget.AppCompat.PopupMenu">
|
||||||
<item name="android:popupBackground">@color/cyanea_primary_dark_reference</item>
|
<item name="android:popupBackground">@color/cyanea_primary_dark_reference</item>
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
<style name="Cyanea.PopupMenu.Dark" parent="@style/Widget.AppCompat.PopupMenu">
|
<style name="Cyanea.PopupMenu.Dark" parent="@style/Widget.AppCompat.PopupMenu">
|
||||||
<item name="android:popupBackground">@color/cyanea_primary_dark_reference</item>
|
<item name="android:popupBackground">@color/cyanea_primary_dark_reference</item>
|
||||||
|
@ -130,7 +130,7 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
@ -180,7 +180,6 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TransparentDark" parent="Theme.Cyanea.Dark">
|
<style name="TransparentDark" parent="Theme.Cyanea.Dark">
|
||||||
|
@ -194,7 +193,6 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TransparentBlack" parent="Theme.Cyanea.Dark">
|
<style name="TransparentBlack" parent="Theme.Cyanea.Dark">
|
||||||
|
@ -209,7 +207,6 @@
|
||||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
<item name="android:windowActivityTransitions" tools:targetApi="lollipop">true</item>
|
||||||
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
<item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">@transition/anim</item>
|
||||||
<item name="android:windowSharedElementExitTransition" tools:targetApi="lollipop">@transition/anim</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Fedilab.PopupMenu.Light" parent="Cyanea.PopupMenu.Light">
|
<style name="Fedilab.PopupMenu.Light" parent="Cyanea.PopupMenu.Light">
|
||||||
|
|
Loading…
Reference in New Issue