Merge pull request #3994 from deltachat/adb/issue-3993

fix QRShowActivity screen
This commit is contained in:
adb
2025-11-04 23:21:07 +01:00
committed by GitHub
3 changed files with 14 additions and 7 deletions
+2 -2
View File
@@ -1,7 +1,6 @@
# Delta Chat Android Changelog
## v2.24.0
2025-11
## Unreleased
* Make it possible to invite members into a channel via a QR code,
and make channels more secure
@@ -15,6 +14,7 @@
* don't show badge counter in app icon for the permanent background notification
* fix sorting of old media in gallery
* fix text direction in "x members" subtitle for RTL languages
* fix group invite QR screen's layout
* remove deprecated "companion app" code
* remove deprecated "Watch Sent Folder" preference
* remove deprecated "send self-report" preference
@@ -46,6 +46,7 @@ public class QrShowActivity extends AppCompatActivity {
ActionBar supportActionBar = getSupportActionBar();
assert supportActionBar != null;
supportActionBar.setDisplayHomeAsUpEnabled(true);
supportActionBar.setElevation(0); // edge-to-edge: avoid top shadow
if (chatId != 0) {
// verified-group
+11 -5
View File
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:name="org.thoughtcrime.securesms.qr.QrShowFragment"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="?attr/colorPrimary"
android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/qrScannerFragment">
android:layout_height="match_parent">
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:name="org.thoughtcrime.securesms.qr.QrShowFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/qrScannerFragment" />
</fragment>
</RelativeLayout>