Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9a3da3e authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'fix-e-theme' into 'master' 

Fixed white color of app

See merge request e/apps/Message!34
parents 60764c2a 2906cb50

presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt

+1 −2
Original line number Diff line number Diff line
@@ -180,10 +180,9 @@ class MainActivity : QkThemedActivity(), MainView { 
        // Miscellaneous views

        syncingProgress?.progressTintList = ColorStateList.valueOf(getColor(R.color.tools_theme))

        syncingProgress?.indeterminateTintList = ColorStateList.valueOf(getColor(R.color.tools_theme))

        compose.setBackgroundTint(getColor(R.color.tools_theme))



        // Set the FAB compose icon color

        compose.setTint(getColor(R.color.white))

        compose.setTint(getColor(R.color.tools_theme))



        itemTouchCallback.adapter = conversationsAdapter

        conversationsAdapter.autoScrollToStart(recyclerView)

presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt

+6 −3
Original line number Diff line number Diff line
@@ -41,8 +41,11 @@ import javax.inject.Inject 


class WidgetProvider : AppWidgetProvider() {



    @Inject lateinit var colors: Colors

    @Inject lateinit var prefs: Preferences

    @Inject

    lateinit var colors: Colors



    @Inject

    lateinit var prefs: Preferences



    override fun onReceive(context: Context, intent: Intent) {

        AndroidInjection.inject(this, context)
@@ -121,7 +124,7 @@ class WidgetProvider : AppWidgetProvider() { 
        remoteViews.setInt(R.id.toolbar, "setColorFilter", context.getColorCompat(when {

            night && black -> R.color.black

            night && !black -> R.color.toolbarDark

            else -> R.color.toolbarLight

            else -> R.color.colorPrimary

        }))



        remoteViews.setTextColor(R.id.title, context.getColorCompat(when (night) {

presentation/src/main/res/values/colors.xml

+4 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <color name="statusBarLight">#FFFFFF</color>

    <color name="statusBarDark">#1d262b</color>



    <color name="toolbarLight">#FFFFFF</color>

    <color name="toolbarLight">@color/colorPrimary</color>

    <color name="toolbarDark">#1d262b</color>

    <color name="toolbarTranslucent">#88000000</color>

    <color name="toolbarSearchBackgroundLight">#0D000000</color>
@@ -67,5 +67,7 @@ 
    <color name="switchTrackDisabledDark">#383838</color>



    <!-- This colour should only ever be used for attrs with the tools tag -->

    <color name="tools_theme">@lineageos.platform:color/color_default_primary</color>

    <color name="tools_theme">@lineageos.platform:color/color_default_accent</color>

    <color name="colorPrimary">@lineageos.platform:color/color_default_primary</color>

    <color name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</color>

</resources>

presentation/src/main/res/values/themes.xml

+4 −4
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ 
        <item name="android:windowContentTransitions">true</item>

        <item name="actionBarPopupTheme">@style/PopupTheme</item>

        <item name="bubbleColor">@color/bubbleLight</item>

        <item name="colorPrimary">@color/toolbarLight</item>

        <item name="colorPrimaryDark">@color/statusBarLight</item>

        <item name="colorPrimary">@color/colorPrimary</item>

        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

        <item name="composeBackground">@color/backgroundLight</item>

        <item name="selectableItemBackground">@drawable/ripple</item>

        <item name="switchThumbEnabled">@color/switchThumbEnabledLight</item>
@@ -62,8 +62,8 @@ 
        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="actionBarPopupTheme">@style/PopupTheme</item>

        <item name="bubbleColor">@color/bubbleLight</item>

        <item name="colorPrimary">@color/toolbarLight</item>

        <item name="colorPrimaryDark">@color/statusBarLight</item>

        <item name="colorPrimary">@color/colorPrimary</item>

        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

        <item name="composeBackground">@color/backgroundLight</item>

        <item name="selectableItemBackground">@drawable/ripple</item>

        <item name="windowActionBar">false</item>