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

Commit 8d4f55f7 authored by Mohit Mali's avatar Mohit Mali Committed by Amit Kumar
Browse files

Fixed white color bug, implement e theme colors

parent f9a3da3e

presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt

+3 −3
Original line number Diff line number Diff line
@@ -107,9 +107,9 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>( 


        progressBar.indeterminateTintList = ColorStateList.valueOf(progressBar.context.getColor(R.color.tools_theme))

        progressBar.progressTintList = ColorStateList.valueOf(progressBar.context.getColor(R.color.tools_theme))

        fab.setBackgroundTint(fab.context.getColor(R.color.tools_theme))

        fabIcon.setTint(fabIcon.context.getColor(R.color.white))

        fabLabel.setTextColor(fabIcon.context.getColor(R.color.textPrimary))

        fab.setBackgroundTint(fab.context.getColor(R.color.white))

        fabIcon.setTint(fabIcon.context.getColor(R.color.tools_theme))

        fabLabel.setTextColor(fabIcon.context.getColor(R.color.tools_theme))





        // Make the list titles bold

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

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ class MainActivity : QkThemedActivity(), MainView { 
        // Set the color for the drawer icons

        val states = arrayOf(intArrayOf(android.R.attr.state_activated),

                intArrayOf(-android.R.attr.state_activated))

        resolveThemeColor(android.R.attr.textColorSecondary)

        resolveThemeColor(android.R.attr.textColorPrimary)

                .let { textSecondary -> ColorStateList(states, intArrayOf(getColor(R.color.tools_theme), textSecondary)) }

                .let { tintList ->

                    inboxIcon.imageTintList = tintList

presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { 


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

        sampleMessage.setTextColor(getColor(R.color.textPrimary))

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

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

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

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



    }

presentation/src/main/res/layout/backup_controller.xml

+4 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>

  ~

  ~ This file is part of QKSMS.
@@ -160,7 +159,7 @@ 
        android:background="@drawable/rounded_rectangle_24dp"

        android:elevation="4dp"

        android:gravity="center"

        tools:backgroundTint="@color/tools_theme">

        tools:backgroundTint="@color/white">



        <ImageView

            android:id="@+id/fabIcon"
@@ -168,7 +167,7 @@ 
            android:layout_height="24dp"

            android:layout_marginStart="12dp"

            android:src="@drawable/ic_star_black_24dp"

            tools:tint="@color/textPrimaryDark" />

            app:tint="@color/tools_theme" />



        <com.moez.QKSMS.common.widget.QkTextView

            android:id="@+id/fabLabel"
@@ -177,7 +176,7 @@ 
            android:layout_marginStart="16dp"

            android:layout_marginEnd="16dp"

            android:text="@string/backup_now"

            android:textColor="@color/textPrimaryDark"

            android:textColor="@color/tools_theme"

            android:textStyle="bold"

            app:textSize="primary" />

presentation/src/main/res/layout/main_activity.xml

+2 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>

  ~

  ~ This file is part of QKSMS.
@@ -98,10 +97,8 @@ 
            android:elevation="8dp"

            android:padding="16dp"

            android:src="@drawable/ic_add_black_24dp"

            android:tint="@color/white"

            app:layout_constraintBottom_toTopOf="@id/bottom"

            app:layout_constraintEnd_toEndOf="parent"

            tools:backgroundTint="@color/tools_theme" />

            app:layout_constraintEnd_toEndOf="parent" />



        <View

            android:layout_width="0dp"