fixed some dark theme issues in message view. fixes #2939

Daniel Gultsch created 7 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/XmppActivity.java   |  2 
src/main/java/eu/siacs/conversations/utils/ThemeHelper.java | 13 +++++++
2 files changed, 14 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/XmppActivity.java

@@ -431,7 +431,7 @@ public abstract class XmppActivity extends AppCompatActivity {
 	}
 
 	public boolean isDarkTheme() {
-		return this.mTheme == R.style.ConversationsTheme_Dark;
+		return ThemeHelper.isDark(mTheme);
 	}
 
 	public int getThemeResource(int r_attr_name, int r_drawable_def) {

src/main/java/eu/siacs/conversations/utils/ThemeHelper.java

@@ -29,10 +29,12 @@
 
 package eu.siacs.conversations.utils;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
+import android.support.annotation.StyleRes;
 
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.ui.SettingsActivity;
@@ -53,4 +55,15 @@ public class ThemeHelper {
 				return dark ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
 		}
 	}
+
+	public static boolean isDark(@StyleRes int id) {
+		switch (id) {
+			case R.style.ConversationsTheme_Dark:
+			case R.style.ConversationsTheme_Dark_Large:
+			case R.style.ConversationsTheme_Dark_Medium:
+				return true;
+			default:
+				return false;
+		}
+	}
 }