diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 3e7ae1b63..ec5eaead5 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/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) { diff --git a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java index 534e63608..a5f17765b 100644 --- a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java +++ b/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; + } + } }