Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 02:39:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes text story preview sizing on pixel 2.

Browse Source
This commit is contained in:
Alex Hart
2022-03-21 14:18:32 -03:00
committed by Greyson Parrelli
parent ef6e846512
commit 65bf0aad79
5 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
View File

@@ -42,6 +42,9 @@ import org.thoughtcrime.securesms.mediasend.v2.MediaAnimations;
import org.thoughtcrime.securesms.mediasend.v2.MediaCountIndicatorButton;
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.stories.Stories;
import org.thoughtcrime.securesms.stories.viewer.page.StoryDisplay;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.Stopwatch;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -275,6 +278,20 @@ public class Camera1Fragment extends LoggingFragment implements CameraFragment,
View galleryButton = requireView().findViewById(R.id.camera_gallery_button);
View countButton = requireView().findViewById(R.id.camera_review_button);
View toggleSpacer = requireView().findViewById(R.id.toggle_spacer);
if (toggleSpacer != null) {
if (Stories.isFeatureEnabled() && FeatureFlags.storiesTextPosts()) {
StoryDisplay storyDisplay = StoryDisplay.Companion.getStoryDisplay(getResources().getDisplayMetrics().widthPixels, getResources().getDisplayMetrics().heightPixels);
if (storyDisplay == StoryDisplay.SMALL) {
toggleSpacer.setVisibility(View.VISIBLE);
} else {
toggleSpacer.setVisibility(View.GONE);
}
} else {
toggleSpacer.setVisibility(View.GONE);
}
}
captureButton.setOnClickListener(v -> {
captureButton.setEnabled(false);

17
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
View File

@@ -46,6 +46,9 @@ import org.thoughtcrime.securesms.mediasend.v2.MediaAnimations;
import org.thoughtcrime.securesms.mediasend.v2.MediaCountIndicatorButton;
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
import org.thoughtcrime.securesms.mms.MediaConstraints;
import org.thoughtcrime.securesms.stories.Stories;
import org.thoughtcrime.securesms.stories.viewer.page.StoryDisplay;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.MemoryFileDescriptor;
import org.thoughtcrime.securesms.util.Stopwatch;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -252,6 +255,20 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
View galleryButton = requireView().findViewById(R.id.camera_gallery_button);
View countButton = requireView().findViewById(R.id.camera_review_button);
CameraXFlashToggleView flashButton = requireView().findViewById(R.id.camera_flash_button);
View toggleSpacer = requireView().findViewById(R.id.toggle_spacer);
if (toggleSpacer != null) {
if ( Stories.isFeatureEnabled() && FeatureFlags.storiesTextPosts()) {
StoryDisplay storyDisplay = StoryDisplay.Companion.getStoryDisplay(getResources().getDisplayMetrics().widthPixels, getResources().getDisplayMetrics().heightPixels);
if (storyDisplay == StoryDisplay.SMALL) {
toggleSpacer.setVisibility(View.VISIBLE);
} else {
toggleSpacer.setVisibility(View.GONE);
}
} else {
toggleSpacer.setVisibility(View.GONE);
}
}
selfieFlash = requireView().findViewById(R.id.camera_selfie_flash);