diff options
Diffstat (limited to 'app/src/main/java/net/lacolaco/smileessence/view/page')
7 files changed, 26 insertions, 26 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt index 43836482..525bd9a0 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt @@ -1,7 +1,7 @@ package net.lacolaco.smileessence.view.page import android.annotation.SuppressLint -import android.app.Activity +import androidx.appcompat.app.AppCompatActivity import android.content.Intent import android.net.Uri import android.os.Bundle @@ -39,7 +39,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche fun setMediaFile(uri: Uri) { launchUi { val mediaId = try { - activity.contentResolver.openInputStream(uri).use { world.uploadMedia(it).await() } + activity!!.contentResolver.openInputStream(uri).use { world.uploadMedia(it).await() } } catch (e: TwitterTaskException) { world.notifyError("Failed to upload media (${e.message}") return@launchUi @@ -88,7 +88,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche if (postState.inReplyTo != null) { layout_post_reply_status.visibility = View.VISIBLE button_post_reply_delete.visibility = View.VISIBLE - val header = Partials.getTweetView(postState.inReplyTo!!, world, activity, + val header = Partials.getTweetView(postState.inReplyTo!!, world, activity!!, layout_post_reply_status) header.isClickable = false } else { @@ -125,7 +125,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) - SystemServiceHelper.showIM(activity, post_edit_text) + SystemServiceHelper.showIM(activity!!, post_edit_text) } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, @@ -133,14 +133,14 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche return inflater.inflate(R.layout.page_fragment_compose, container, false) } - override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) post_edit_text.addTextChangedListener(this) post_edit_text.setOnFocusChangeListener { _, hasFocus -> if (hasFocus) - SystemServiceHelper.showIM(activity, post_edit_text) + SystemServiceHelper.showIM(activity!!, post_edit_text) else - SystemServiceHelper.hideIM(activity, post_edit_text) + SystemServiceHelper.hideIM(activity!!, post_edit_text) } post_edit_text.movementMethod = object : ArrowKeyMovementMethod() { override fun left(widget: TextView, buffer: Spannable): Boolean { @@ -152,7 +152,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche } } button_post_tweet.setOnClickListener { - SystemServiceHelper.hideIM(activity, post_edit_text) + SystemServiceHelper.hideIM(activity!!, post_edit_text) launchUi { try { world.createTweetAsync(postState.text, postState.inReplyTo?.id, @@ -193,7 +193,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { when (requestCode) { REQUEST_OPEN_DOCUMENT -> { - if (resultCode != Activity.RESULT_OK) + if (resultCode != AppCompatActivity.RESULT_OK) return setMediaFile(data!!.data!!) } diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/EventsPageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/EventsPageFragment.kt index 4913348d..fe25863c 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/EventsPageFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/EventsPageFragment.kt @@ -22,14 +22,14 @@ class EventsPageFragment : TimelinePageFragment<Event, PageInfo.EventsPageInfo>( } override fun onBindItemView(item: Event, itemView: View) { - Glide.with(view).load(item.source?.profileImageUrl ?: User.DEFAULT_PROFILE_IMAGE_URL) + Glide.with(view!!).load(item.source?.profileImageUrl ?: User.DEFAULT_PROFILE_IMAGE_URL) .into(itemView.imageview_status_icon) itemView.textview_status_header_username.text = item.title itemView.textview_status_text.text = item.body itemView.textview_status_footer.text = item.createdAt.toCompactString() itemView.setOnClickListener { if (item.source != null) - DialogHelper.showDialog(activity, + DialogHelper.showDialog(activity!!, UserDetailDialogFragment.newInstance(item.source!!)) } } diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt index 99652d52..9b7b1708 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt @@ -22,7 +22,7 @@ class ListPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.ListPag runRefreshTask(world.getListTimelineAsync(pageInfo.fullName!!)) {} } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle?): View { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { return inflater.inflate(R.layout.page_fragment_list, container, false) } @@ -35,7 +35,7 @@ class ListPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.ListPag world.notifyError("No list subscriptions") return@setOnClickListener } - val popup = PopupMenu(activity, button_userlist_lists) + val popup = PopupMenu(activity!!, button_userlist_lists) for (name in world.listSubscriptions) { popup.add(name) { textview_userlist_name.text = name @@ -67,7 +67,7 @@ class ListPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.ListPag } override fun onBindItemView(item: Tweet, itemView: View) { - Partials.getTweetView(item, world, activity, itemView) + Partials.getTweetView(item, world, activity!!, itemView) } override fun onCreateItemView(parent: ViewGroup): View { diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt index 4f70899f..a0f15bd8 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt @@ -1,6 +1,6 @@ package net.lacolaco.smileessence.view.page -import android.app.Fragment +import androidx.fragment.app.Fragment import net.lacolaco.smileessence.World import net.lacolaco.smileessence.activity.MainActivity import net.lacolaco.smileessence.data.PageInfo @@ -10,10 +10,10 @@ import net.lacolaco.smileessence.data.PageInfo */ abstract class PageFragment<out T : PageInfo> : Fragment() { protected val world by lazy { - World[arguments.getLong(KEY_WORLD_USER_ID)] + World[arguments!!.getLong(KEY_WORLD_USER_ID)] } protected val pageInfo by lazy { - val pos = arguments.getInt(KEY_PAGE_POSITION, -2) + val pos = arguments!!.getInt(KEY_PAGE_POSITION, -2) if (pos == -2) throw IllegalStateException("KEY_PAGE_POSITION not specified") @Suppress("UNCHECKED_CAST") diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt index 3b52185f..32b9a2aa 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt @@ -31,7 +31,7 @@ class SearchPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.Searc startSearch(pageInfo.query) } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { return inflater.inflate(R.layout.page_fragment_search, container, false) } @@ -45,7 +45,7 @@ class SearchPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.Searc world.notifyError("No saved searches") return@setOnClickListener } - val popup = PopupMenu(activity, button_search_queries) + val popup = PopupMenu(activity!!, button_search_queries) val sss = ArrayList(world.savedSearches.values) for (ss in sss) { popup.add(ss.query) { @@ -81,7 +81,7 @@ class SearchPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.Searc } edittext_search.setOnFocusChangeListener { _, hasFocus -> if (!hasFocus) - SystemServiceHelper.hideIM(activity, edittext_search) + SystemServiceHelper.hideIM(activity!!, edittext_search) } edittext_search.setText(pageInfo.query) edittext_search.setOnEditorActionListener { _, i, keyEvent -> @@ -125,7 +125,7 @@ class SearchPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.Searc } override fun onBindItemView(item: Tweet, itemView: View) { - Partials.getTweetView(item, world, activity, itemView) + Partials.getTweetView(item, world, activity!!, itemView) } override fun onCreateItemView(parent: ViewGroup): View { @@ -146,7 +146,7 @@ class SearchPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.Searc private fun search() { startSearch(edittext_search.text.toString()) - SystemServiceHelper.hideIM(activity, edittext_search) + SystemServiceHelper.hideIM(activity!!, edittext_search) } private fun startSearch(queryString: String) { diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/TimelinePageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/TimelinePageFragment.kt index a18efc03..354f0545 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/TimelinePageFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/TimelinePageFragment.kt @@ -17,7 +17,7 @@ abstract class TimelinePageFragment<T : IdObject, out PI : PageInfo> : PageFragm protected val adapter = TimelineAdapter() private var adapterDataObserver: RecyclerView.AdapterDataObserver? = null - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { return inflater.inflate(R.layout.page_fragment_timeline, container, false) } @@ -28,7 +28,7 @@ abstract class TimelinePageFragment<T : IdObject, out PI : PageInfo> : PageFragm tweets_recycler_view.addItemDecoration( DividerItemDecoration(activity, DividerItemDecoration.VERTICAL)) val lm = LinearLayoutManager(activity) - lm.orientation = LinearLayoutManager.VERTICAL + lm.orientation = RecyclerView.VERTICAL tweets_recycler_view.layoutManager = lm tweets_recycler_view.adapter = adapter tweets_recycler_view.itemAnimator = null diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/TweetsPageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/TweetsPageFragment.kt index ea4c1e0d..f2ad1998 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/page/TweetsPageFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/page/TweetsPageFragment.kt @@ -21,12 +21,12 @@ class TweetsPageFragment : TimelinePageFragment<Tweet, PageInfo.TweetsPageInfo>( } } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle?): View { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { return inflater.inflate(R.layout.page_fragment_timeline, container, false) } override fun onBindItemView(item: Tweet, itemView: View) { - Partials.getTweetView(item, world, activity, itemView) + Partials.getTweetView(item, world, activity!!, itemView) } override fun onCreateItemView(parent: ViewGroup): View { |