diff options
Diffstat (limited to 'app/src/main/java/net/lacolaco/smileessence/view/dialog')
5 files changed, 18 insertions, 18 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.kt index 247a8cc3..1a1d45d3 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.kt @@ -14,7 +14,7 @@ class AppInfoDialogFragment : StackableDialogFragment() { return inflater.inflate(R.layout.dialog_app_info, container, false) } - override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) app_version.text = "${BuildConfig.VERSION_NAME} (revision ${BuildConfig.VERSION_CODE})" web_view.loadUrl("file:///android_asset/licenses.html") diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTweetsPageDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTweetsPageDialogFragment.kt index 7210a228..cec053c5 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTweetsPageDialogFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTweetsPageDialogFragment.kt @@ -1,6 +1,5 @@ package net.lacolaco.smileessence.view.dialog -import android.app.DialogFragment import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager @@ -8,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.DialogFragment import com.beust.klaxon.JsonObject import com.beust.klaxon.Parser import kotlinx.android.synthetic.main.dialog_edit_tweets_page.* @@ -19,7 +19,7 @@ import net.lacolaco.smileessence.view.confirm class EditTweetsPageDialogFragment : DialogFragment() { private val pageInfo by lazy { - PageInfo.fromJsonObject(Parser.default().parse(arguments.getString(KEY_PAGE_INFO)) as JsonObject) as + PageInfo.fromJsonObject(Parser.default().parse(arguments!!.getString(KEY_PAGE_INFO)) as JsonObject) as PageInfo.TweetsPageInfo } private val patterns: MutableList<String> by lazy { @@ -31,7 +31,7 @@ class EditTweetsPageDialogFragment : DialogFragment() { return inflater.inflate(R.layout.dialog_edit_tweets_page, container, false) } - override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) recycler_view.addItemDecoration(DividerItemDecoration(activity, DividerItemDecoration.VERTICAL)) recycler_view.layoutManager = LinearLayoutManager(activity) diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.kt index 1989a2cb..03e8b2b3 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.kt @@ -1,10 +1,10 @@ package net.lacolaco.smileessence.view.dialog import android.app.Dialog -import android.app.DialogFragment import android.os.Bundle import androidx.appcompat.app.AppCompatDialog import android.view.Window +import androidx.fragment.app.DialogFragment import net.lacolaco.smileessence.World import net.lacolaco.smileessence.activity.MainActivity diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt index 733c7c9c..1f38817d 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt @@ -20,7 +20,7 @@ class StatusDetailDialogFragment : StackableDialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val id = arguments.getLong(KEY_STATUS_ID) + val id = arguments!!.getLong(KEY_STATUS_ID) val found = Tweet.cached(id) if (found == null) { world.notifyError("Tweet id=$id not found") @@ -35,7 +35,7 @@ class StatusDetailDialogFragment : StackableDialogFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { val view = inflater.inflate(R.layout.dialog_status_detail, container, false) - val statusHeader = Partials.getTweetView(tweet, world, activity, view.detail_current_status) + val statusHeader = Partials.getTweetView(tweet, world, activity!!, view.detail_current_status) statusHeader.isClickable = false // XXX @@ -49,13 +49,13 @@ class StatusDetailDialogFragment : StackableDialogFragment() { view.detail_dialog_divider_top.visibility = View.VISIBLE val cached = Tweet.cached(tweet.inReplyToStatusId!!) if (cached != null) - Partials.getTweetView(cached, world, activity, view.tweet_in_reply_to) + Partials.getTweetView(cached, world, activity!!, view.tweet_in_reply_to) else { - Partials.getTweetView(Tweet.placeHolder, world, activity, view.tweet_in_reply_to) + Partials.getTweetView(Tweet.placeHolder, world, activity!!, view.tweet_in_reply_to) launchUi { try { val tweet = world.getTweetAsync(tweet.inReplyToStatusId!!, false).await() - Partials.getTweetView(tweet, world, activity, view.tweet_in_reply_to) + Partials.getTweetView(tweet, world, activity!!, view.tweet_in_reply_to) } catch (e: TwitterTaskException) { } } @@ -145,7 +145,7 @@ class StatusDetailDialogFragment : StackableDialogFragment() { } } view.button_status_detail_menu.setOnClickListener { - val popup = PopupMenu(activity, view.button_status_detail_menu) + val popup = PopupMenu(activity!!, view.button_status_detail_menu) popup.add(R.string.command_status_add_to_reply) { val text = String.format("@%s ", tweet.originalTweet.user.screenName) (activity as MainActivity).openPostPageAndAppendText(text) @@ -155,11 +155,11 @@ class StatusDetailDialogFragment : StackableDialogFragment() { browse("https://twitter.com/${tweet.originalTweet.user.screenName}/status/${tweet.originalTweet.id}") } popup.add(R.string.command_status_copy_text_to_clipboard) { - SystemServiceHelper.copyToClipboard(activity, "tweet text", tweet.originalTweet.text) + SystemServiceHelper.copyToClipboard(activity!!, "tweet text", tweet.originalTweet.text) world.notify(R.string.notice_copy_clipboard) } popup.add(R.string.command_status_copy_url_to_clipboard) { - SystemServiceHelper.copyToClipboard(activity, "tweet url", "https://twitter.com/${tweet.originalTweet.user.screenName}/status/${tweet.originalTweet.id}") + SystemServiceHelper.copyToClipboard(activity!!, "tweet url", "https://twitter.com/${tweet.originalTweet.user.screenName}/status/${tweet.originalTweet.id}") world.notify(R.string.notice_copy_clipboard) } popup.show() @@ -191,11 +191,11 @@ class StatusDetailDialogFragment : StackableDialogFragment() { } for (url in tweet.entities.urlsExpanded) view.embedded_menu_items.add(url, "URL") { - activity.browse(url) + activity!!.browse(url) } for (url in tweet.entities.mediaUrls) view.embedded_menu_items.add(url, "Media") { - activity.browse(url) + activity!!.browse(url) } if (view.embedded_menu_items.childCount == 0) { view.detail_dialog_divider_bottom.visibility = View.GONE diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt index 0ae6b049..de916aec 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt @@ -31,7 +31,7 @@ class UserDetailDialogFragment : StackableDialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val found = User.cached(arguments.getLong(KEY_USER_ID)) + val found = User.cached(arguments!!.getLong(KEY_USER_ID)) if (found == null) { world.notify(R.string.notice_error_show_user) dismiss() @@ -137,7 +137,7 @@ class UserDetailDialogFragment : StackableDialogFragment() { } private fun showPopupMenu() { - val popup = PopupMenu(activity, imageview_user_detail_menu) + val popup = PopupMenu(activity!!, imageview_user_detail_menu) popup.add(R.string.command_user_add_to_reply) { (activity as MainActivity).openPostPageAndReplyTo(user) world.notify(R.string.notice_add_to_reply) @@ -246,7 +246,7 @@ class UserDetailDialogFragment : StackableDialogFragment() { ) override fun onBindViewHolder(holder: ViewHolder, position: Int) { - Partials.getTweetView(sortedList[position], world, activity, holder.itemView) + Partials.getTweetView(sortedList[position], world, activity!!, holder.itemView) } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { |