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

Commit c5c93c01 authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch '209-icons-color-feedback' into 'main' 

209 icons color feedback

See merge request !58
parents 08f8a2a6 fcd24a09

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

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


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

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

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

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



        fabIcon.setTint(ContextCompat.getColor(fabIcon.context, R.color.colorPrimaryDark))

        fabLabel.setTextColor(ContextCompat.getColor(fabIcon.context, R.color.colorPrimaryDark))

        fab.setBackgroundTint(ContextCompat.getColor(fabIcon.context, R.color.tools_theme))



        // Make the list titles bold

        linearLayout.children

presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt

+2 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.moez.QKSMS.common.base.QkViewHolder 
import com.moez.QKSMS.common.util.Colors

import com.moez.QKSMS.common.util.extensions.forwardTouches

import com.moez.QKSMS.common.util.extensions.setTint



import com.moez.QKSMS.extensions.associateByNotNull

import com.moez.QKSMS.model.Contact

import com.moez.QKSMS.model.ContactGroup
@@ -65,7 +66,6 @@ class ComposeItemAdapter @Inject constructor( 
        val layoutInflater = LayoutInflater.from(parent.context)

        val view = layoutInflater.inflate(R.layout.contact_list_item, parent, false)



        view.icon.setColorFilter(ContextCompat.getColor(parent.context, R.color.emphasis));

           view.index.setTextColor(ContextCompat.getColor(parent.context, R.color.emphasis))



        view.numbers.setRecycledViewPool(numbersViewPool)

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

+9 −2
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint 
import com.moez.QKSMS.common.util.extensions.setTint

import dagger.android.AndroidInjection

import kotlinx.android.synthetic.main.collapsing_toolbar.*

import kotlinx.android.synthetic.main.main_activity.*

import kotlinx.android.synthetic.main.scheduled_activity.*

import kotlinx.android.synthetic.main.scheduled_activity.compose

import kotlinx.android.synthetic.main.scheduled_activity.empty

import javax.inject.Inject
@@ -80,8 +83,12 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { 


        sampleMessage.setBackgroundTint(ContextCompat.getColor(this, R.color.tools_theme))

        sampleMessage.setTextColor(ContextCompat.getColor(this, R.color.white))

        compose.setTint(ContextCompat.getColor(this, R.color.tools_theme))

        compose.setBackgroundTint(ContextCompat.getColor(this, R.color.colorPrimaryDark))



        // Set the FAB compose icon color

        compose.setTint(ContextCompat.getColor(this, R.color.colorPrimaryDark))

        //set the FAB background color

        compose.setBackgroundTint(ContextCompat.getColor(this, R.color.tools_theme))





    }

presentation/src/main/res/drawable/ic_people_black_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ 
    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:fillColor="@color/emphasis"

        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" />

</vector>

presentation/src/main/res/drawable/ic_star_black_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ 
    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:fillColor="@color/emphasis"

        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />

</vector>