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
Pipeline #180650 passed with stage
in 12 minutes and 4 seconds
......@@ -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
......
......@@ -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,8 +66,7 @@ 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.index.setTextColor(ContextCompat.getColor(parent.context, R.color.emphasis))
view.numbers.setRecycledViewPool(numbersViewPool)
view.numbers.adapter = PhoneNumberAdapter()
......
......@@ -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))
}
......
......@@ -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>
......@@ -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>
......@@ -24,7 +24,6 @@
android:icon="@drawable/ic_delete_white_24dp"
android:title="@string/main_menu_delete"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -32,7 +31,6 @@
android:icon="@drawable/ic_block_white_24dp"
android:title="@string/main_menu_block"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
</menu>
......@@ -31,7 +31,7 @@
android:icon="@drawable/ic_call_white_24dp"
android:title="@string/menu_call"
android:visible="false"
app:iconTint="@color/tools_theme"
app:iconTint="@color/emphasis"
app:showAsAction="always" />
<item
......@@ -39,7 +39,7 @@
android:icon="@drawable/ic_more_vert_black_24dp"
android:title="@string/menu_info"
android:visible="false"
app:iconTint="@color/tools_theme"
app:iconTint="@color/emphasis"
app:showAsAction="always" />
<item
......@@ -47,7 +47,6 @@
android:icon="@drawable/ic_info_black_24dp"
android:title="@string/compose_menu_copy"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -55,7 +54,6 @@
android:icon="@lineageos.platform:drawable/ic_bin"
android:title="@string/compose_menu_delete"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -63,7 +61,6 @@
android:icon="@drawable/ic_content_copy_black_24dp"
android:title="@string/compose_menu_copy"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -71,7 +68,6 @@
android:icon="@drawable/ic_forward_black_24dp"
android:title="@string/compose_menu_forward"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -79,7 +75,6 @@
android:icon="@drawable/ic_keyboard_arrow_up_black_24dp"
android:title="@string/compose_menu_previous"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="always" />
<item
......@@ -87,7 +82,6 @@
android:icon="@drawable/ic_keyboard_arrow_down_black_24dp"
android:title="@string/compose_menu_next"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="always" />
<item
......@@ -95,7 +89,6 @@
android:icon="@drawable/ic_clear_black_24dp"
android:title="@string/compose_menu_clear"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="always" />
</menu>
\ No newline at end of file
......@@ -25,7 +25,6 @@
android:icon="@lineageos.platform:drawable/ic_archive"
android:title="@string/main_menu_archive"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -33,7 +32,6 @@
android:icon="@drawable/ic_inbox_black_24dp"
android:title="@string/main_menu_unarchive"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -41,7 +39,6 @@
android:icon="@lineageos.platform:drawable/ic_bin"
android:title="@string/main_menu_delete"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -49,7 +46,6 @@
android:icon="@drawable/ic_person_add_black_24dp"
android:title="@string/main_menu_add_contact"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -57,7 +53,6 @@
android:icon="@drawable/ic_baseline_push_pin_24"
android:title="@string/main_menu_pin"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -65,7 +60,6 @@
android:icon="@drawable/ic_baseline_push_pin_24"
android:title="@string/main_menu_unpin"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -73,7 +67,6 @@
android:icon="@drawable/ic_drafts_black_24dp"
android:title="@string/main_menu_read"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -81,7 +74,6 @@
android:icon="@drawable/ic_markunread_black_24dp"
android:title="@string/main_menu_unread"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -89,7 +81,6 @@
android:icon="@drawable/ic_block_black_24dp"
android:title="@string/main_menu_block"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
</menu>
\ No newline at end of file
......@@ -23,14 +23,12 @@
android:id="@+id/read"
android:icon="@drawable/ic_check_white_24dp"
android:title="@string/qkreply_menu_read"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
android:id="@+id/expand"
android:icon="@drawable/ic_unfold_more_black_24dp"
android:title="@string/qkreply_menu_expand"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......@@ -38,7 +36,6 @@
android:icon="@drawable/ic_unfold_less_black_24dp"
android:title="@string/qkreply_menu_collapse"
android:visible="false"
app:iconTint="@color/tools_theme"
app:showAsAction="ifRoom" />
<item
......
......@@ -80,7 +80,7 @@
<color name="red_draft">#FF5D5D</color>
<color name="avatar_bg_color">#e0e0e0</color>
<color name="avatar_icon_color">#383838</color>
<color name="emphasis">#DE000000</color>
<color name="emphasis">#99000000</color>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment