Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-02 07:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update safety number screen to be in line with design.

Browse Source
This commit is contained in:
Clark
2023-07-20 16:53:46 -04:00
committed by GitHub
parent 18337c97e2
commit 9ac12c2532
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/verify/SafetyNumberQrView.kt
View File

@@ -115,7 +115,7 @@ class SafetyNumberQrView : ConstraintLayout {
val qrCodeData = fingerprint.scannableFingerprint.serialized
val qrCodeString = String(qrCodeData, Charset.forName("ISO-8859-1"))
val qrCodeBitmap = QrCodeUtil.create(qrCodeString)
val qrCodeBitmap = QrCodeUtil.createNoPadding(qrCodeString)
qrCode.setImageBitmap(qrCodeBitmap)
shareButton.visible = true

21
app/src/main/java/org/thoughtcrime/securesms/qr/QrCodeUtil.java
View File

@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
@@ -15,6 +16,9 @@ import com.google.zxing.qrcode.QRCodeWriter;
import org.signal.core.util.logging.Log;
import org.signal.core.util.Stopwatch;
import java.util.HashMap;
import java.util.Map;
public final class QrCodeUtil {
private QrCodeUtil() {
@@ -22,13 +26,22 @@ public final class QrCodeUtil {
public static final String TAG = Log.tag(QrCodeUtil.class);
public static @NonNull Bitmap create(@Nullable String data) {
return create(data, Color.BLACK, Color.TRANSPARENT);
public static @NonNull Bitmap createNoPadding(@Nullable String data) {
Map<EncodeHintType, Integer> hints = new HashMap<>();
hints.put(EncodeHintType.MARGIN, 0);
return create(data, Color.BLACK, Color.TRANSPARENT, hints);
}
public static @NonNull Bitmap create(@Nullable String data,
@ColorInt int foregroundColor,
@ColorInt int backgroundColor)
@ColorInt int backgroundColor) {
return create(data, foregroundColor, backgroundColor, null);
}
public static @NonNull Bitmap create(@Nullable String data,
@ColorInt int foregroundColor,
@ColorInt int backgroundColor,
@Nullable Map<EncodeHintType,?> hints)
{
if (data == null || data.length() == 0) {
Log.w(TAG, "No data");
@@ -38,7 +51,7 @@ public final class QrCodeUtil {
try {
Stopwatch stopwatch = new Stopwatch("QrGen");
QRCodeWriter qrCodeWriter = new QRCodeWriter();
BitMatrix qrData = qrCodeWriter.encode(data, BarcodeFormat.QR_CODE, 512, 512);
BitMatrix qrData = qrCodeWriter.encode(data, BarcodeFormat.QR_CODE, 512, 512, hints);
int qrWidth = qrData.getWidth();
int qrHeight = qrData.getHeight();
int[] pixels = new int[qrWidth * qrHeight];