Use ActivityOptionsCompat
This commit is contained in:
parent
248ac6885b
commit
c86acb4e26
|
@ -79,6 +79,7 @@ import androidx.appcompat.widget.PopupMenu;
|
|||
import androidx.appcompat.widget.SwitchCompat;
|
||||
import androidx.appcompat.widget.TooltipCompat;
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.core.app.ActivityOptionsCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
@ -2477,12 +2478,7 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
|
|||
break;
|
||||
}
|
||||
}
|
||||
int tootVisibility;
|
||||
if (ownerTootVisibility >= initialTootVisibility) {
|
||||
tootVisibility = initialTootVisibility;
|
||||
} else {
|
||||
tootVisibility = ownerTootVisibility;
|
||||
}
|
||||
int tootVisibility = Math.min(ownerTootVisibility, initialTootVisibility);
|
||||
|
||||
switch (tootVisibility) {
|
||||
case 4:
|
||||
|
@ -3414,9 +3410,10 @@ public class StatusListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
|
|||
b.putInt("bgcolor", context.getResources().getColor(R.color.cyanea_primary_dark));
|
||||
b.putInt("position", finalPosition);
|
||||
intent.putExtras(b);
|
||||
ActivityOptions options = null;
|
||||
ActivityOptionsCompat options = null;
|
||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
|
||||
options = ActivityOptions
|
||||
imageView.setTransitionName(attachment.getText_url());
|
||||
options = ActivityOptionsCompat
|
||||
.makeSceneTransitionAnimation((Activity)context, imageView, attachment.getUrl());
|
||||
// start the new activity
|
||||
context.startActivity(intent, options.toBundle());
|
||||
|
|
|
@ -243,6 +243,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
|
|||
loader.setVisibility(View.GONE);
|
||||
Glide.with(context)
|
||||
.load(url).into(imageView);
|
||||
ActivityCompat.startPostponedEnterTransition((Activity)context);
|
||||
}
|
||||
break;
|
||||
case "video":
|
||||
|
|
|
@ -90,7 +90,6 @@
|
|||
<item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
|
||||
<item name="android:itemBackground">@drawable/menu_selector</item>
|
||||
<item name="popupWindowStyle">@style/Cyanea.PopupMenu.Dark</item>
|
||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||
</style>
|
||||
<style name="Cyanea.PopupMenu.Dark" parent="@style/Widget.AppCompat.PopupMenu">
|
||||
<item name="android:popupBackground">@color/cyanea_primary_dark_reference</item>
|
||||
|
@ -108,7 +107,6 @@
|
|||
<item name="linkColor">@color/dark_link_toot</item>
|
||||
<item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
|
||||
<item name="android:itemBackground">@drawable/menu_selector</item>
|
||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||
</style>
|
||||
|
||||
|
||||
|
@ -165,7 +163,6 @@
|
|||
<item name="android:itemBackground">@drawable/menu_selector</item>
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
|
||||
</style>
|
||||
|
||||
<style name="TransparentBlack" parent="Theme.Cyanea.Dark">
|
||||
|
|
Loading…
Reference in New Issue