diff --git a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt index eed9423d..9e91adb9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt @@ -67,8 +67,8 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private val view = layoutInflater.inflate(R.layout.menu_list_item, parent, false) val states = arrayOf( - intArrayOf(android.R.attr.state_selected), - intArrayOf(-android.R.attr.state_selected)) + intArrayOf(android.R.attr.state_activated), + intArrayOf(-android.R.attr.state_activated)) val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary) view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text)) @@ -86,7 +86,7 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private val view = holder.itemView view.title.text = menuItem.title - view.check.isSelected = (menuItem.actionId == selectedItem) + view.check.isActivated = (menuItem.actionId == selectedItem) view.check.setVisible(selectedItem != null) } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index 1a79f9a0..90343472 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt @@ -71,13 +71,13 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut } childCount.forEach { index -> - getChildAt(index).isSelected = index == pager?.currentItem + getChildAt(index).isActivated = index == pager?.currentItem } pager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() { override fun onPageSelected(position: Int) { childCount.forEach { index -> - getChildAt(index).isSelected = index == position + getChildAt(index).isActivated = index == position } } }) @@ -87,8 +87,8 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut super.onAttachedToWindow() val states = arrayOf( - intArrayOf(android.R.attr.state_selected), - intArrayOf(-android.R.attr.state_selected)) + intArrayOf(android.R.attr.state_activated), + intArrayOf(-android.R.attr.state_activated)) threadId .distinctUntilChanged() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 4bb573f4..373b377b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -147,7 +147,7 @@ class MessagesAdapter @Inject constructor( view.setOnClickListener { val message = getItem(adapterPosition)!! when (toggleSelection(message.id, false)) { - true -> view.isSelected = isSelected(message.id) + true -> view.isActivated = isSelected(message.id) false -> { clicks.onNext(message) expanded[message.id] = view.status.visibility != View.VISIBLE @@ -158,7 +158,7 @@ class MessagesAdapter @Inject constructor( view.setOnLongClickListener { val message = getItem(adapterPosition)!! toggleSelection(message.id) - view.isSelected = isSelected(message.id) + view.isActivated = isSelected(message.id) true } } @@ -172,7 +172,7 @@ class MessagesAdapter @Inject constructor( // Update the selected state - view.isSelected = isSelected(message.id) || highlight == message.id + view.isActivated = isSelected(message.id) || highlight == message.id // Bind the cancel view diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt index 2be25252..cc8a370f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt @@ -64,14 +64,14 @@ class ConversationsAdapter @Inject constructor( view.setOnClickListener { val conversation = getItem(adapterPosition)!! when (toggleSelection(conversation.id, false)) { - true -> view.isSelected = isSelected(conversation.id) + true -> view.isActivated = isSelected(conversation.id) false -> navigator.showConversation(conversation.id) } } view.setOnLongClickListener { val conversation = getItem(adapterPosition)!! toggleSelection(conversation.id) - view.isSelected = isSelected(conversation.id) + view.isActivated = isSelected(conversation.id) true } } @@ -81,7 +81,7 @@ class ConversationsAdapter @Inject constructor( val conversation = getItem(position)!! val view = viewHolder.itemView - view.isSelected = isSelected(conversation.id) + view.isActivated = isSelected(conversation.id) view.avatars.contacts = conversation.recipients view.title.text = conversation.getTitle() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 8aeffc47..fcb18e25 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -133,7 +133,7 @@ class MainActivity : QkThemedActivity(), MainView { .autoDisposable(scope()) .subscribe { theme -> // Set the color for the drawer icons - val states = arrayOf(intArrayOf(android.R.attr.state_selected), intArrayOf(-android.R.attr.state_selected)) + val states = arrayOf(intArrayOf(android.R.attr.state_activated), intArrayOf(-android.R.attr.state_activated)) resolveThemeColor(android.R.attr.textColorSecondary) .let { textSecondary -> ColorStateList(states, intArrayOf(theme.theme, textSecondary)) } .let { tintList -> @@ -235,8 +235,8 @@ class MainActivity : QkThemedActivity(), MainView { } } - inbox.isSelected = state.page is Inbox - archived.isSelected = state.page is Archived + inbox.isActivated = state.page is Inbox + archived.isActivated = state.page is Archived if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START) else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START) diff --git a/presentation/src/main/res/drawable/radio_button.xml b/presentation/src/main/res/drawable/radio_button.xml index 98f7be31..6d3c2494 100644 --- a/presentation/src/main/res/drawable/radio_button.xml +++ b/presentation/src/main/res/drawable/radio_button.xml @@ -19,7 +19,7 @@ --> - + diff --git a/presentation/src/main/res/drawable/ripple.xml b/presentation/src/main/res/drawable/ripple.xml index a4ef9eba..c70a8797 100644 --- a/presentation/src/main/res/drawable/ripple.xml +++ b/presentation/src/main/res/drawable/ripple.xml @@ -29,7 +29,7 @@ - + diff --git a/presentation/src/main/res/drawable/ripple_dark.xml b/presentation/src/main/res/drawable/ripple_dark.xml index 84803c38..6863c0ab 100644 --- a/presentation/src/main/res/drawable/ripple_dark.xml +++ b/presentation/src/main/res/drawable/ripple_dark.xml @@ -29,7 +29,7 @@ - +