From 565d3ddf03098be859594f2d6c3ca452c7738d4f Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Sun, 22 Oct 2017 20:22:16 +0900
Subject: protect

---
 .../main/java/net/lacolaco/smileessence/view/Partials.kt    |  5 +++++
 .../smileessence/view/dialog/StatusDetailDialogFragment.kt  |  2 +-
 .../lacolaco/smileessence/view/page/EventsPageFragment.kt   |  5 +++++
 .../lacolaco/smileessence/view/page/TimelinePageFragment.kt | 13 +++++++------
 app/src/main/res/drawable/ic_lock_black_24dp.xml            |  9 +++++++++
 app/src/main/res/layout/item_status_base.xml                | 11 +++++++++++
 app/src/main/res/values/colors.xml                          |  2 ++
 7 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_lock_black_24dp.xml

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)
                 }
             }
diff --git a/app/src/main/res/drawable/ic_lock_black_24dp.xml b/app/src/main/res/drawable/ic_lock_black_24dp.xml
new file mode 100644
index 00000000..67a7c73a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_status_base.xml b/app/src/main/res/layout/item_status_base.xml
index e3fc32db..c3f2ab2c 100644
--- a/app/src/main/res/layout/item_status_base.xml
+++ b/app/src/main/res/layout/item_status_base.xml
@@ -18,6 +18,17 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />
 
+    <ImageView
+        android:id="@+id/source_user_protected"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:contentDescription="@null"
+        android:src="@drawable/ic_lock_black_24dp"
+        android:tint="@color/md_grey_900"
+        android:alpha="0.7"
+        app:layout_constraintBottom_toBottomOf="@+id/imageview_status_icon"
+        app:layout_constraintEnd_toEndOf="@+id/imageview_status_icon" />
+
     <TextView
         android:id="@+id/textview_status_header_username"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cce002a0..d4ac8d8d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -321,4 +321,6 @@
 
     <color name="color_nonactivatable_light">@color/md_grey_700</color>
     <color name="color_nonactivatable">@color/md_white_1000</color>
+
+    <color name="user_protected_overlay">#c0212121</color>
 </resources>
-- 
cgit v1.2.3