Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 19:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Media Preview V2 Visual Redesign

Browse Source
This commit is contained in:
Nicholas
2022-10-21 17:31:50 -04:00
committed by Alex Hart
parent 6c0b63d72c
commit 469cab284e
13 changed files with 254 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/mediapreview/ImageMediaPreviewFragment.java
View File

@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import androidx.annotation.Nullable;
@@ -15,6 +16,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.util.MediaUtil;
public final class ImageMediaPreviewFragment extends MediaPreviewFragment {
private View bottomBarControlView;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -39,6 +41,26 @@ public final class ImageMediaPreviewFragment extends MediaPreviewFragment {
zoomingImageView.setOnClickListener(v -> events.singleTapOnMedia());
bottomBarControlView = getLayoutInflater().inflate(R.layout.image_media_preview_bottom_bar, null);
return zoomingImageView;
}
@Override
public void setShareButtonListener(View.OnClickListener listener) {
ImageButton forwardButton = bottomBarControlView.findViewById(R.id.image_preview_forward);
forwardButton.setOnClickListener(listener);
}
@Override
public void setForwardButtonListener(View.OnClickListener listener) {
ImageButton shareButton = bottomBarControlView.findViewById(R.id.image_preview_share);
shareButton.setOnClickListener(listener);
}
@Nullable
@Override
public View getBottomBarControls() {
return bottomBarControlView;
}
}

6
app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
View File

@@ -87,9 +87,9 @@ public abstract class MediaPreviewFragment extends Fragment {
public void pause() {
}
public @Nullable PlayerControlView getPlaybackControls() {
return null;
}
abstract public void setShareButtonListener(View.OnClickListener listener);
abstract public void setForwardButtonListener(View.OnClickListener listener);
abstract public @Nullable View getBottomBarControls();
private void checkMediaStillAvailable() {
if (attachmentId == null) {

42
app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
View File

@@ -7,6 +7,7 @@ import android.content.DialogInterface
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.Menu
import android.view.View
import android.view.ViewGroup
@@ -20,7 +21,6 @@ import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.viewpager2.widget.ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
import com.google.android.exoplayer2.ui.PlayerControlView
import com.google.android.material.appbar.MaterialToolbar
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
@@ -35,7 +35,6 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs
import org.thoughtcrime.securesms.database.MediaDatabase
import org.thoughtcrime.securesms.databinding.FragmentMediaPreviewV2Binding
import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity
import org.thoughtcrime.securesms.mediasend.Media
import org.thoughtcrime.securesms.mms.GlideApp
import org.thoughtcrime.securesms.mms.PartAuthority
@@ -64,13 +63,18 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
fullscreenHelper = FullscreenHelper(requireActivity())
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
lifecycleDisposable.bindTo(viewLifecycleOwner)
return super.onCreateView(inflater, container, savedInstanceState)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val args = MediaIntentFactory.requireArguments(requireArguments())
initializeViewModel(args)
initializeToolbar(binding.toolbar, args)
initializeToolbar(binding.toolbar)
initializeViewPager()
initializeFullScreenUi()
initializeAlbumRail()
@@ -96,19 +100,12 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
viewModel.fetchAttachments(PartAuthority.requireAttachmentId(args.initialMediaUri), args.threadId, sorting)
}
private fun initializeToolbar(toolbar: MaterialToolbar, args: MediaIntentFactory.MediaPreviewArgs) {
private fun initializeToolbar(toolbar: MaterialToolbar) {
toolbar.setNavigationOnClickListener {
requireActivity().onBackPressed()
}
binding.toolbar.inflateMenu(R.menu.media_preview)
// Restricted to API26 because of MemoryFileUtil not supporting lower API levels well
binding.toolbar.menu.findItem(R.id.media_preview__share).isVisible = Build.VERSION.SDK_INT >= 26
if (args.hideAllMedia) {
binding.toolbar.menu.findItem(R.id.media_preview__overview).isVisible = false
}
}
private fun initializeViewPager() {
@@ -175,15 +172,11 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
val menu: Menu = binding.toolbar.menu
if (currentItem.threadId == MediaIntentFactory.NOT_IN_A_THREAD.toLong()) {
menu.findItem(R.id.media_preview__overview).isVisible = false
menu.findItem(R.id.delete).isVisible = false
}
binding.toolbar.setOnMenuItemClickListener {
when (it.itemId) {
R.id.media_preview__overview -> showOverview(currentItem.threadId)
R.id.media_preview__forward -> forward(currentItem)
R.id.media_preview__share -> share(currentItem)
R.id.save -> saveToDisk(currentItem)
R.id.delete -> deleteMedia(currentItem)
android.R.id.home -> requireActivity().finish()
@@ -214,12 +207,16 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
(binding.mediaPreviewAlbumRail.adapter as MediaRailAdapter).setMedia(albumThumbnailMedia, currentState.position)
binding.mediaPreviewAlbumRail.smoothScrollToPosition(currentState.position)
binding.mediaPreviewCaptionContainer.visibility = if (caption == null) View.GONE else View.VISIBLE
binding.mediaPreviewCaption.text = caption
if (caption != null) {
binding.mediaPreviewCaption.text = caption
binding.mediaPreviewCaption.visibility = View.VISIBLE
} else {
binding.mediaPreviewCaption.visibility = View.GONE
}
val fragmentTag = "f${currentState.position}"
val currentFragment: Fragment? = childFragmentManager.findFragmentByTag(fragmentTag)
val playbackControls: PlayerControlView? = (currentFragment as? MediaPreviewFragment)?.playbackControls
val currentFragment: MediaPreviewFragment? = childFragmentManager.findFragmentByTag(fragmentTag) as? MediaPreviewFragment
val playbackControls: View? = currentFragment?.bottomBarControls
if (albumThumbnailMedia.size <= 1 && caption == null && playbackControls == null) {
binding.mediaPreviewDetailsContainer.visibility = View.GONE
} else {
@@ -231,6 +228,8 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
playbackControls.layoutParams = params
binding.mediaPreviewPlaybackControlsContainer.addView(playbackControls)
}
currentFragment?.setShareButtonListener { share(currentItem) }
currentFragment?.setForwardButtonListener { forward(currentItem) }
}
private fun getTitleText(mediaRecord: MediaDatabase.MediaRecord, showThread: Boolean): String {
@@ -319,11 +318,6 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
Log.d(TAG, "onMediaReady()")
}
private fun showOverview(threadId: Long) {
val context = requireContext()
context.startActivity(MediaOverviewActivity.forThread(context, threadId))
}
private fun forward(mediaItem: MediaDatabase.MediaRecord) {
val attachment = mediaItem.attachment
val uri = attachment?.uri

23
app/src/main/java/org/thoughtcrime/securesms/mediapreview/VideoMediaPreviewFragment.java
View File

@@ -6,6 +6,7 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -29,6 +30,8 @@ public final class VideoMediaPreviewFragment extends MediaPreviewFragment {
private VideoPlayer videoView;
private boolean isVideoGif;
private ImageButton shareButton;
private ImageButton forwardButton;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -92,12 +95,16 @@ public final class VideoMediaPreviewFragment extends MediaPreviewFragment {
}
videoView.setOnClickListener(v -> events.singleTapOnMedia());
final PlayerControlView controlView = videoView.getControlView();
if (controlView != null) {
shareButton = controlView.findViewById(R.id.exo_share);
forwardButton = controlView.findViewById(R.id.exo_forward);
}
return itemView;
}
private void updateSkipButtonState() {
final PlayerControlView playbackControls = getPlaybackControls();
final PlayerControlView playbackControls = getBottomBarControls();
if (playbackControls != null) {
boolean shouldShowSkipButtons = videoView.getDuration() > MINIMUM_DURATION_FOR_SKIP_MS;
playbackControls.setShowFastForwardButton(shouldShowSkipButtons);
@@ -142,9 +149,19 @@ public final class VideoMediaPreviewFragment extends MediaPreviewFragment {
}
}
@Override
public void setShareButtonListener(View.OnClickListener listener) {
shareButton.setOnClickListener(listener);
}
@Override
public void setForwardButtonListener(View.OnClickListener listener) {
forwardButton.setOnClickListener(listener);
}
@Nullable
@Override
public PlayerControlView getPlaybackControls() {
public PlayerControlView getBottomBarControls() {
return videoView != null && !isVideoGif ? videoView.getControlView() : null;
}