From 6051ffe0b3b452640ee2e44be7bd64785e8cff52 Mon Sep 17 00:00:00 2001
From: Ivan Kupalov <charlag@tutanota.com>
Date: Wed, 3 Oct 2018 21:53:31 +0200
Subject: [PATCH] Show "remote profile" message. (#873)

* Show "remote profile" message. Closes #806

* Improve remote message look
---
 .../keylesspalace/tusky/AccountActivity.kt    |  7 ++++++
 .../com/keylesspalace/tusky/entity/Account.kt |  1 +
 .../tusky/util/ViewExtensions.kt              |  6 +----
 app/src/main/res/layout/activity_account.xml  | 22 ++++++++++++++-----
 app/src/main/res/values-ru/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  3 +++
 6 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
index 585187942..734293b28 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -361,6 +361,13 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasSupportF
                 accountFragmentViewPager.hide()
             }
 
+            if (account.isRemote()) {
+                accountRemoveView.show()
+                accountRemoveView.setOnClickListener {
+                    LinkHelper.openLink(account.url, this)
+                }
+            }
+
             val numberFormat = NumberFormat.getNumberInstance()
             accountFollowersTextView.text = numberFormat.format(account.followersCount)
             accountFollowingTextView.text = numberFormat.format(account.followingCount)
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
index d9e216d30..52dd7f919 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
@@ -64,6 +64,7 @@ data class Account(
         return account?.id == this.id
     }
 
+    fun isRemote(): Boolean = this.username != this.localUsername
 }
 
 @Parcelize
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ViewExtensions.kt b/app/src/main/java/com/keylesspalace/tusky/util/ViewExtensions.kt
index d8ef39bc7..24b64650b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/ViewExtensions.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/ViewExtensions.kt
@@ -11,9 +11,5 @@ fun View.hide() {
 }
 
 fun View.visible(visible: Boolean) {
-    this.visibility = if(visible) {
-        View.VISIBLE
-    } else {
-        View.GONE
-    }
+    this.visibility = if (visible) View.VISIBLE else View.GONE
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 29fdcf3d7..42c989e68 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -39,8 +39,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="180dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp">
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp">
 
                 <Button
                     android:id="@+id/accountFollowButton"
@@ -157,6 +157,18 @@
                     android:layout="@layout/view_account_moved"
                     app:layout_constraintTop_toBottomOf="@id/accountFieldList" />
 
+                <TextView
+                    android:id="@+id/accountRemoveView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="@string/label_remote_account"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toBottomOf="@id/accountMovedView"
+                    tools:visibility="visible"
+                    android:lineSpacingMultiplier="1.1"/>
+
                 <LinearLayout
                     android:id="@+id/accountFollowers"
                     android:layout_width="wrap_content"
@@ -166,7 +178,7 @@
                     android:orientation="vertical"
                     app:layout_constraintEnd_toStartOf="@id/accountFollowing"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/accountMovedView">
+                    app:layout_constraintTop_toBottomOf="@id/accountRemoveView">
 
                     <TextView
                         android:id="@+id/accountFollowersTextView"
@@ -197,7 +209,7 @@
                     android:orientation="vertical"
                     app:layout_constraintEnd_toStartOf="@id/accountStatuses"
                     app:layout_constraintStart_toEndOf="@id/accountFollowers"
-                    app:layout_constraintTop_toBottomOf="@id/accountMovedView">
+                    app:layout_constraintTop_toBottomOf="@id/accountRemoveView">
 
                     <TextView
                         android:id="@+id/accountFollowingTextView"
@@ -227,7 +239,7 @@
                     android:orientation="vertical"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/accountFollowing"
-                    app:layout_constraintTop_toBottomOf="@id/accountMovedView">
+                    app:layout_constraintTop_toBottomOf="@id/accountRemoveView">
 
                     <TextView
                         android:id="@+id/accountStatusesTextView"
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ab9eb5a2c..c8686f02e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -332,4 +332,5 @@
     <string name="profile_metadata_label_label">Заголовок</string>
     <string name="profile_metadata_content_label">Значение</string>
 
+    <string name="label_remote_account">Информация может не полностью отражать профиль пользователя. Нажмите чтобы открыть профиль в браузере.</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a912b4fd2..d7a799768 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -353,6 +353,9 @@
     <string name="profile_metadata_content_label">Content</string>
 
     <string name="pref_title_absolute_time">Use absolute time</string>
+
+    <string name="label_remote_account">Information below may reflect the user\'s profile incompletely. Press to open full profile in browser.</string>
+
     <string name="unpin_action">Unpin</string>
     <string name="pin_action">Pin</string>