mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix camera zoom issue on some devices.

fork-5.53.8
Alex Hart 2022-08-30 11:00:10 -03:00 zatwierdzone przez Greyson Parrelli
rodzic f111ac7cf2
commit 8bd89d1e63
2 zmienionych plików z 8 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
Wyświetl plik

@ -25,10 +25,12 @@ import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.camera.core.AspectRatio;
import androidx.camera.core.CameraSelector;
import androidx.camera.core.ImageCapture;
import androidx.camera.core.ImageCaptureException;
import androidx.camera.core.ImageProxy;
import androidx.camera.core.Preview;
import androidx.camera.view.CameraController;
import androidx.camera.view.LifecycleCameraController;
import androidx.camera.view.PreviewView;
@ -75,7 +77,8 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
private static final String IS_VIDEO_ENABLED = "is_video_enabled";
private static final Rational ASPECT_RATIO_16_9 = new Rational(16, 9);
private static final Rational ASPECT_RATIO_16_9 = new Rational(16, 9);
private static final PreviewView.ScaleType PREVIEW_SCALE_TYPE = PreviewView.ScaleType.FILL_CENTER;
private PreviewView previewView;
private ViewGroup controlsContainer;
@ -141,7 +144,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
cameraController.setImageCaptureMode(CameraXUtil.getOptimalCaptureMode());
cameraController.setEnabledUseCases(getSupportedUseCases());
previewView.setScaleType(PreviewView.ScaleType.FIT_CENTER);
previewView.setScaleType(PREVIEW_SCALE_TYPE);
previewView.setController(cameraController);
onOrientationChanged(getResources().getConfiguration().orientation);
@ -160,6 +163,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
params.height = (int) height;
cameraParent.setLayoutParams(params);
cameraController.setPreviewTargetSize(new CameraController.OutputSize(new Size((int) width, (int) height)));
}
});
}
@ -312,7 +316,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
onCaptureClicked();
});
previewView.setScaleType(PreviewView.ScaleType.FILL_CENTER);
previewView.setScaleType(PREVIEW_SCALE_TYPE);
cameraController.getInitializationFuture()
.addListener(() -> initializeFlipButton(flipButton, flashButton), Executors.mainThreadExecutor());

2
app/src/main/res/layout/camerax_fragment.xml
Wyświetl plik

@ -9,7 +9,7 @@
<androidx.cardview.widget.CardView
android:id="@+id/camerax_camera_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
app:cardCornerRadius="18dp"
app:cardElevation="0dp"
app:layout_constraintTop_toTopOf="parent">