From c5d38e5122bcb452b1e61ea6526434cf62e9da8c Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 29 Feb 2020 19:29:09 -0800 Subject: Update koin usage --- .../main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt | 11 ++++++----- .../kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/iitems') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt index 1262c078..5257be5e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt @@ -44,20 +44,20 @@ interface ClickableIItemContract { val url: String? - fun click(context: Context, fbCookie: FbCookie) { + fun click(context: Context, fbCookie: FbCookie, prefs: Prefs) { val url = url ?: return - context.launchWebOverlay(url, fbCookie) + context.launchWebOverlay(url, fbCookie, prefs) } companion object { - fun bindEvents(adapter: IAdapter, fbCookie: FbCookie) { + fun bindEvents(adapter: IAdapter, fbCookie: FbCookie, prefs: Prefs) { adapter.fastAdapter?.apply { selectExtension { isSelectable = false } onClickListener = { v, _, item, _ -> if (item is ClickableIItemContract) { - item.click(v!!.context, fbCookie) + item.click(v!!.context, fbCookie, prefs) true } else false @@ -76,7 +76,8 @@ open class HeaderIItem( itemId: Int = R.layout.iitem_header ) : KauIItem(R.layout.iitem_header, ::ViewHolder, itemId) { - class ViewHolder(itemView: View) : FastAdapter.ViewHolder(itemView), KoinComponent { + class ViewHolder(itemView: View) : FastAdapter.ViewHolder(itemView), + KoinComponent { private val prefs: Prefs by inject() diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt index 8624fff0..9d3b59eb 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt @@ -51,7 +51,7 @@ class NotificationIItem(val notification: FrostNotif, val cookie: String) : ) { companion object { - fun bindEvents(adapter: ItemAdapter, fbCookie: FbCookie) { + fun bindEvents(adapter: ItemAdapter, fbCookie: FbCookie, prefs: Prefs) { adapter.fastAdapter?.apply { selectExtension { isSelectable = false @@ -65,7 +65,7 @@ class NotificationIItem(val notification: FrostNotif, val cookie: String) : ) } // TODO temp fix. If url is dependent, we cannot load it directly - v!!.context.launchWebOverlay(if (notif.url.isIndependent) notif.url else FbItem.NOTIFICATIONS.url, fbCookie) + v!!.context.launchWebOverlay(if (notif.url.isIndependent) notif.url else FbItem.NOTIFICATIONS.url, fbCookie, prefs) true } } -- cgit v1.2.3