Commit d8adaf40 authored by Thomas's avatar Thomas
Browse files

Fix issue #356 - Wrong background for messages

parent fd7ec5bb

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -555,8 +555,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            holder.binding.cardviewContainer.setBackgroundColor(theme_statuses_color);

            holder.binding.translationLabel.setBackgroundColor(theme_statuses_color);

        } else {

            holder.binding.cardviewContainer.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_primary_dark_reference));

            holder.binding.translationLabel.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_primary_dark_reference));

            holder.binding.cardviewContainer.setBackgroundColor(ThemeHelper.getBackgroundColor(context));

            holder.binding.translationLabel.setBackgroundColor(ThemeHelper.getBackgroundColor(context));

        }

        if (theme_boost_header_color != -1 && status.reblog != null) {

            holder.binding.statusBoosterInfo.setBackgroundColor(theme_boost_header_color);

app/src/main/res/values/styles.xml

+0 −26
Original line number Diff line number Diff line 
<resources>

    <attr name="linkColor" type="color" />

    <attr name="errorColor" type="color" />

    <attr name="successColor" type="color" />

    <attr name="cardviewColor" type="color" />

    <attr name="iconColor" type="color" />

    <attr name="iconColorMenu" type="color" />

    <attr name="textHeader" type="color" />

    <attr name="customFeature" type="color" />

    <attr name="cardviewHeaderBoostColor" type="color" />

    <attr name="statusTextColor" type="color" />

    <attr name="mTextColor" type="color" />



    <style name="AppTheme" parent="Theme.Cyanea.Light.NoActionBar">



        <item name="cardviewColor">@color/white</item>

        <item name="iconColor">@color/black</item>

        <item name="iconColorMenu">@color/black</item>

        <item name="textHeader">@color/black</item>

        <item name="customFeature">@color/mastodonC4</item>

        <item name="cardviewHeaderBoostColor">@color/mastodonC2</item>

        <item name="statusTextColor">@color/black</item>

        <item name="mTextColor">@color/black</item>

        <item name="android:textColor">@color/black</item>
@@ -45,12 +34,7 @@ 
    </style>



    <style name="AppThemeDark" parent="Theme.Cyanea.Dark.NoActionBar">

        <item name="cardviewColor">@color/mastodonC1_</item>

        <item name="iconColor">@color/dark_icon_theme</item>

        <item name="iconColorMenu">@color/dark_icon_theme</item>

        <item name="textHeader">@color/dark_text_toot_header</item>

        <item name="customFeature">@color/mastodonC4</item>

        <item name="cardviewHeaderBoostColor">@color/mastodonC1___</item>

        <item name="statusTextColor">@color/dark_text</item>

        <item name="mTextColor">@color/dark_text</item>

        <item name="android:textColor">@color/dark_text</item>
@@ -79,12 +63,7 @@ 


    <style name="AppThemeBar" parent="Theme.Cyanea.Light">



        <item name="cardviewColor">@color/white</item>

        <item name="iconColor">@color/black</item>

        <item name="iconColorMenu">@color/black</item>

        <item name="textHeader">@color/black</item>

        <item name="customFeature">@color/mastodonC4</item>

        <item name="cardviewHeaderBoostColor">@color/mastodonC2</item>

        <item name="statusTextColor">@color/black</item>

        <item name="mTextColor">@color/black</item>

        <item name="android:textColor">@color/black</item>
@@ -99,12 +78,7 @@ 
    </style>



    <style name="AppThemeBarDark" parent="Theme.Cyanea.Dark">

        <item name="cardviewColor">@color/mastodonC1_</item>

        <item name="iconColor">@color/dark_icon_theme</item>

        <item name="iconColorMenu">@color/dark_icon_theme</item>

        <item name="textHeader">@color/dark_text_toot_header</item>

        <item name="customFeature">@color/mastodonC4</item>

        <item name="cardviewHeaderBoostColor">@color/mastodonC1___</item>

        <item name="statusTextColor">@color/dark_text</item>

        <item name="mTextColor">@color/dark_text</item>

        <item name="android:textColor">@color/dark_text</item>