From e303cbcc22c8c9699f7475f73583cc9724daa17e Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 31 Mar 2022 14:06:37 -0400
Subject: [PATCH] Fix some toolbar theming issues.
---
.../org/thoughtcrime/securesms/AvatarPreviewActivity.java | 7 +++++++
app/src/main/res/drawable-night/ic_trash_24.xml | 2 +-
app/src/main/res/drawable/ic_trash_24.xml | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
index 0c75b5fa2c..a7c67dc592 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
@@ -14,6 +14,7 @@ import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.Toolbar;
import androidx.core.app.ActivityOptionsCompat;
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
@@ -58,6 +59,12 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, from, "avatar").toBundle();
}
+ @Override
+ protected void attachBaseContext(@NonNull Context newBase) {
+ getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+ super.attachBaseContext(newBase);
+ }
+
@Override
protected void onCreate(Bundle savedInstanceState, boolean ready) {
super.onCreate(savedInstanceState, ready);
diff --git a/app/src/main/res/drawable-night/ic_trash_24.xml b/app/src/main/res/drawable-night/ic_trash_24.xml
index d8f6836059..f9e14fec19 100644
--- a/app/src/main/res/drawable-night/ic_trash_24.xml
+++ b/app/src/main/res/drawable-night/ic_trash_24.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
- android:fillColor="#FF000000"
+ android:fillColor="#FFFFFFFF"
android:pathData="M16.38,4.5a4.49,4.49 0,0 0,-8.76 0L2,4.5L2,6L3.5,6L4.86,20A2.25,2.25 0,0 0,7.1 22h9.8a2.25,2.25 0,0 0,2.24 -2L20.5,6L22,6L22,4.5ZM12,2.5a3,3 0,0 1,2.82 2L9.18,4.5A3,3 0,0 1,12 2.5ZM8,18 L7.5,8L9,8l0.5,10ZM12.75,18h-1.5L11.25,8h1.5ZM16,18L14.5,18L15,8h1.5Z"/>
</vector>
diff --git a/app/src/main/res/drawable/ic_trash_24.xml b/app/src/main/res/drawable/ic_trash_24.xml
index ef86e8190a..696b50b79c 100644
--- a/app/src/main/res/drawable/ic_trash_24.xml
+++ b/app/src/main/res/drawable/ic_trash_24.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
- android:fillColor="#FF000000"
+ android:fillColor="#FFFFFFFF"
android:pathData="M22,4.5L16.35,4.5a4.45,4.45 0,0 0,-8.7 0L2,4.5L2,6L3.5,6L4.86,20A2.25,2.25 0,0 0,7.1 22h9.8a2.25,2.25 0,0 0,2.24 -2L20.5,6L22,6ZM12,2.5a3,3 0,0 1,2.82 2L9.18,4.5A3,3 0,0 1,12 2.5ZM17.65,19.83a0.76,0.76 0,0 1,-0.75 0.67L7.1,20.5a0.76,0.76 0,0 1,-0.75 -0.67L5,6L19,6ZM11.25,18L11.25,8h1.5L12.75,18ZM14.5,18L15,8h1.5L16,18ZM8,18 L7.5,8L9,8l0.5,10Z"/>
</vector>
--
GitLab