diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt index 36b1a52b27..77cad5643f 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt @@ -41,6 +41,5 @@ class EmojiChooserFragment : VectorBaseFragment() { it.adapter = viewModel.adapter it.adapter?.notifyDataSetChanged() } - } } diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt index 7de38602cb..a0acd7b5e8 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt @@ -182,7 +182,6 @@ class EmojiReactionPickerActivity : VectorBaseActivity(), newText?.let { emitter.onNext(it) } return true } - }) } diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt index 41bcfe7be5..82f8cdf3be 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt @@ -23,12 +23,10 @@ import im.vector.riotx.core.resources.StringProvider import im.vector.riotx.core.ui.list.genericFooterItem import javax.inject.Inject - class EmojiSearchResultController @Inject constructor(val stringProvider: StringProvider, fontProvider: EmojiCompatFontProvider) : TypedEpoxyController() { - var emojiTypeface: Typeface? = fontProvider.typeface init { @@ -39,7 +37,6 @@ class EmojiSearchResultController @Inject constructor(val stringProvider: String }) } - var listener: ReactionClickListener? = null override fun buildModels(data: EmojiSearchResultViewState?) { @@ -47,20 +44,20 @@ class EmojiSearchResultController @Inject constructor(val stringProvider: String if (results.isEmpty()) { if (data.query.isEmpty()) { - //display 'Type something to find' + // display 'Type something to find' genericFooterItem { id("type.query.item") text(stringProvider.getString(R.string.reaction_search_type_hint)) } } else { - //Display no search Results + // Display no search Results genericFooterItem { id("no.results.item") text(stringProvider.getString(R.string.no_result_placeholder)) } } } else { - //Build the search results + // Build the search results results.forEach { emojiSearchResultItem { id(it.name) @@ -70,8 +67,6 @@ class EmojiSearchResultController @Inject constructor(val stringProvider: String onClickListener(listener) } } - } } - } diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt index 4a9380d452..1b117035d9 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt @@ -23,7 +23,6 @@ import com.airbnb.epoxy.EpoxyModelWithHolder import im.vector.riotx.R import im.vector.riotx.core.epoxy.VectorEpoxyHolder - @EpoxyModelClass(layout = R.layout.item_emoji_result) abstract class EmojiSearchResultItem : EpoxyModelWithHolder() { @@ -41,7 +40,7 @@ abstract class EmojiSearchResultItem : EpoxyModelWithHolder(R.id.item_emoji_keyword) } } - diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt index e0c9453e4c..d11c25a1e3 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt @@ -47,7 +47,7 @@ class EmojiSearchResultViewModel(val dataSource: EmojiDataSource, initialState: companion object : MvRxViewModelFactory { override fun create(viewModelContext: ViewModelContext, state: EmojiSearchResultViewState): EmojiSearchResultViewModel? { - //TODO get the data source from activity? share it with other fragment + // TODO get the data source from activity? share it with other fragment return EmojiSearchResultViewModel(EmojiDataSource(viewModelContext.activity), state) } }