klint cleaning
This commit is contained in:
parent
199456487c
commit
de4c389c76
|
@ -41,6 +41,5 @@ class EmojiChooserFragment : VectorBaseFragment() {
|
||||||
it.adapter = viewModel.adapter
|
it.adapter = viewModel.adapter
|
||||||
it.adapter?.notifyDataSetChanged()
|
it.adapter?.notifyDataSetChanged()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -182,7 +182,6 @@ class EmojiReactionPickerActivity : VectorBaseActivity(),
|
||||||
newText?.let { emitter.onNext(it) }
|
newText?.let { emitter.onNext(it) }
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,12 +23,10 @@ import im.vector.riotx.core.resources.StringProvider
|
||||||
import im.vector.riotx.core.ui.list.genericFooterItem
|
import im.vector.riotx.core.ui.list.genericFooterItem
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
|
||||||
class EmojiSearchResultController @Inject constructor(val stringProvider: StringProvider,
|
class EmojiSearchResultController @Inject constructor(val stringProvider: StringProvider,
|
||||||
fontProvider: EmojiCompatFontProvider)
|
fontProvider: EmojiCompatFontProvider)
|
||||||
: TypedEpoxyController<EmojiSearchResultViewState>() {
|
: TypedEpoxyController<EmojiSearchResultViewState>() {
|
||||||
|
|
||||||
|
|
||||||
var emojiTypeface: Typeface? = fontProvider.typeface
|
var emojiTypeface: Typeface? = fontProvider.typeface
|
||||||
|
|
||||||
init {
|
init {
|
||||||
|
@ -39,7 +37,6 @@ class EmojiSearchResultController @Inject constructor(val stringProvider: String
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var listener: ReactionClickListener? = null
|
var listener: ReactionClickListener? = null
|
||||||
|
|
||||||
override fun buildModels(data: EmojiSearchResultViewState?) {
|
override fun buildModels(data: EmojiSearchResultViewState?) {
|
||||||
|
@ -47,20 +44,20 @@ class EmojiSearchResultController @Inject constructor(val stringProvider: String
|
||||||
|
|
||||||
if (results.isEmpty()) {
|
if (results.isEmpty()) {
|
||||||
if (data.query.isEmpty()) {
|
if (data.query.isEmpty()) {
|
||||||
//display 'Type something to find'
|
// display 'Type something to find'
|
||||||
genericFooterItem {
|
genericFooterItem {
|
||||||
id("type.query.item")
|
id("type.query.item")
|
||||||
text(stringProvider.getString(R.string.reaction_search_type_hint))
|
text(stringProvider.getString(R.string.reaction_search_type_hint))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//Display no search Results
|
// Display no search Results
|
||||||
genericFooterItem {
|
genericFooterItem {
|
||||||
id("no.results.item")
|
id("no.results.item")
|
||||||
text(stringProvider.getString(R.string.no_result_placeholder))
|
text(stringProvider.getString(R.string.no_result_placeholder))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//Build the search results
|
// Build the search results
|
||||||
results.forEach {
|
results.forEach {
|
||||||
emojiSearchResultItem {
|
emojiSearchResultItem {
|
||||||
id(it.name)
|
id(it.name)
|
||||||
|
@ -70,8 +67,6 @@ class EmojiSearchResultController @Inject constructor(val stringProvider: String
|
||||||
onClickListener(listener)
|
onClickListener(listener)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@ import com.airbnb.epoxy.EpoxyModelWithHolder
|
||||||
import im.vector.riotx.R
|
import im.vector.riotx.R
|
||||||
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
|
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
|
||||||
|
|
||||||
|
|
||||||
@EpoxyModelClass(layout = R.layout.item_emoji_result)
|
@EpoxyModelClass(layout = R.layout.item_emoji_result)
|
||||||
abstract class EmojiSearchResultItem : EpoxyModelWithHolder<EmojiSearchResultItem.Holder>() {
|
abstract class EmojiSearchResultItem : EpoxyModelWithHolder<EmojiSearchResultItem.Holder>() {
|
||||||
|
|
||||||
|
@ -41,7 +40,7 @@ abstract class EmojiSearchResultItem : EpoxyModelWithHolder<EmojiSearchResultIte
|
||||||
|
|
||||||
override fun bind(holder: Holder) {
|
override fun bind(holder: Holder) {
|
||||||
super.bind(holder)
|
super.bind(holder)
|
||||||
//TODO use query string to highlight the matched query in name and keywords?
|
// TODO use query string to highlight the matched query in name and keywords?
|
||||||
holder.emojiText.text = emojiItem.emojiString()
|
holder.emojiText.text = emojiItem.emojiString()
|
||||||
holder.emojiText.typeface = emojiTypeFace ?: Typeface.DEFAULT
|
holder.emojiText.typeface = emojiTypeFace ?: Typeface.DEFAULT
|
||||||
holder.emojiNameText.text = emojiItem.name
|
holder.emojiNameText.text = emojiItem.name
|
||||||
|
@ -57,4 +56,3 @@ abstract class EmojiSearchResultItem : EpoxyModelWithHolder<EmojiSearchResultIte
|
||||||
val emojiKeywordText by bind<TextView>(R.id.item_emoji_keyword)
|
val emojiKeywordText by bind<TextView>(R.id.item_emoji_keyword)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ class EmojiSearchResultViewModel(val dataSource: EmojiDataSource, initialState:
|
||||||
companion object : MvRxViewModelFactory<EmojiSearchResultViewModel, EmojiSearchResultViewState> {
|
companion object : MvRxViewModelFactory<EmojiSearchResultViewModel, EmojiSearchResultViewState> {
|
||||||
|
|
||||||
override fun create(viewModelContext: ViewModelContext, state: EmojiSearchResultViewState): EmojiSearchResultViewModel? {
|
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)
|
return EmojiSearchResultViewModel(EmojiDataSource(viewModelContext.activity), state)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue