diff options
Diffstat (limited to 'app/src/main/java')
4 files changed, 18 insertions, 7 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt b/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt index 3314b707..cd41e980 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt +++ b/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt @@ -67,6 +67,11 @@ object Partials { view.imageview_status_icon.setOnClickListener { DialogHelper.showDialog(activity, UserDetailDialogFragment.newInstance(user)) } + view.source_user_protected.visibility = + if (user.isProtected) + View.VISIBLE + else + View.INVISIBLE view.textview_status_header_username.text = user.screenName view.textview_status_header_name.text = user.name } 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 3e80b6af..5fb37ced 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 @@ -98,7 +98,7 @@ class StatusDetailDialogFragment : StackableDialogFragment() { } else { launchUi { try { - world.retweetAsync(tweet.getRetweetIdBy(world.id)).await() + world.retweetAsync(tweet.id).await() world.notify(R.string.notice_retweet_succeeded) updateViewButtons(view) } catch (e: TwitterTaskException) { 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 705d9fb2..24a5be33 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 @@ -25,6 +25,11 @@ class EventsPageFragment : TimelinePageFragment<Event, PageInfo.EventsPageInfo>( override fun onBindItemView(item: Event, itemView: View) { Glide.with(view).load(item.source.profileImageUrl).into(itemView.imageview_status_icon) + itemView.source_user_protected.visibility = + if (item.source.isProtected) + View.VISIBLE + else + View.INVISIBLE itemView.textview_status_header_username.text = item.formattedString itemView.textview_status_header_name.visibility = View.INVISIBLE itemView.textview_status_text.text = item.targetObject?.text ?: "" 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 ff38f3cb..a7ee5602 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 @@ -18,17 +18,18 @@ abstract class TimelinePageFragment<T : IdObject, out PI : PageInfo> : PageFragm override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - tweets_recycler_view.addItemDecoration(DividerItemDecoration(activity, DividerItemDecoration.VERTICAL)) - val layoutManager = LinearLayoutManager(activity) - layoutManager.orientation = LinearLayoutManager.VERTICAL - tweets_recycler_view.layoutManager = layoutManager + tweets_recycler_view.addItemDecoration( + DividerItemDecoration(activity, DividerItemDecoration.VERTICAL)) + val lm = LinearLayoutManager(activity) + lm.orientation = LinearLayoutManager.VERTICAL + tweets_recycler_view.layoutManager = lm tweets_recycler_view.adapter = adapter tweets_recycler_view.itemAnimator = null adapterDataObserver = object : RecyclerView.AdapterDataObserver() { override fun onItemRangeInserted(positionStart: Int, itemCount: Int) { if (positionStart == 0 && itemCount == 1 && - layoutManager.findFirstVisibleItemPosition() == 0 && - (layoutManager.getChildAt(0) != null || layoutManager.getChildAt(0).top == 0)) { + lm.findFirstVisibleItemPosition() == 0 && + (lm.getChildAt(0) != null || lm.getChildAt(0).top == 0)) { tweets_recycler_view.scrollToPosition(0) } } |