From 53f5a151ba2c2c669bb178c8c2814125407d5486 Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Thu, 7 Oct 2021 23:04:12 +0200
Subject: [PATCH] More consistent, remove useless method

---
 app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt  | 2 +-
 .../main/java/org/pixeldroid/app/posts/StatusViewHolder.kt  | 4 ++--
 .../main/java/org/pixeldroid/app/profile/FollowsActivity.kt | 2 +-
 .../main/java/org/pixeldroid/app/profile/ProfileActivity.kt | 5 +++--
 .../java/org/pixeldroid/app/utils/api/objects/Account.kt    | 6 ------
 app/src/main/res/values/strings.xml                         | 4 ++--
 app/src/test/java/org/pixeldroid/app/PostUnitTest.kt        | 3 ---
 7 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt b/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt
index e153be45..58879cd0 100644
--- a/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt
@@ -46,7 +46,7 @@ class PostActivity : BaseActivity() {
         domain = user?.instance_uri.orEmpty()
 
 
-        supportActionBar?.title = getString(R.string.post_title).format(status.account?.getusername())
+        supportActionBar?.title = getString(R.string.post_title).format(status.account?.username)
 
         val holder = StatusViewHolder(binding.postFragmentSingle)
 
diff --git a/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt b/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt
index b8c110ed..adc1365b 100644
--- a/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt
+++ b/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt
@@ -89,13 +89,13 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold
     ) {
         //Setup username as a button that opens the profile
         binding.username.apply {
-            text = status?.account?.getusername() ?: ""
+            text = status?.account?.username ?: ""
             setTypeface(null, Typeface.BOLD)
             setOnClickListener { status?.account?.openProfile(binding.root.context) }
         }
 
         binding.usernameDesc.apply {
-            text = status?.account?.getusername() ?: ""
+            text = status?.account?.username ?: ""
             setTypeface(null, Typeface.BOLD)
         }
 
diff --git a/app/src/main/java/org/pixeldroid/app/profile/FollowsActivity.kt b/app/src/main/java/org/pixeldroid/app/profile/FollowsActivity.kt
index 86ffe308..203b6fb7 100644
--- a/app/src/main/java/org/pixeldroid/app/profile/FollowsActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/profile/FollowsActivity.kt
@@ -27,7 +27,7 @@ class FollowsActivity : BaseActivity() {
             val user = db.userDao().getActiveUser()!!
             startFragment(user.user_id, user.username, followers)
         } else {
-            startFragment(account.id!!, account.getusername(), followers)
+            startFragment(account.id!!, account.username.orEmpty(), followers)
         }
     }
 
diff --git a/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt b/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt
index aff8074c..befd4c75 100644
--- a/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt
@@ -157,9 +157,10 @@ class ProfileActivity : BaseActivity() {
 
         val displayName = account.getDisplayName()
 
-        supportActionBar?.title = displayName
+        supportActionBar?.title = "@${account.acct}"
+
         if(displayName != "@${account.acct}") {
-            supportActionBar?.subtitle = "@${account.acct}"
+            supportActionBar?.subtitle = displayName
         }
 
         binding.nbPostsTextView.text = resources.getQuantityString(
diff --git a/app/src/main/java/org/pixeldroid/app/utils/api/objects/Account.kt b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Account.kt
index ac89708b..f5eacecb 100644
--- a/app/src/main/java/org/pixeldroid/app/utils/api/objects/Account.kt
+++ b/app/src/main/java/org/pixeldroid/app/utils/api/objects/Account.kt
@@ -74,12 +74,6 @@ data class Account(
         else -> display_name.orEmpty()
     }
 
-    fun getusername() : String = when {
-        username.isNullOrBlank() && display_name.isNullOrBlank() -> ""
-        username.isNullOrBlank() -> "@$display_name"
-        else -> username.orEmpty()
-    }
-
     fun anyAvatar(): String? = avatar_static ?: avatar
 
     /**
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 328a6d2b..d1d54c30 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -215,9 +215,9 @@ For more info about Pixelfed, you can check here: https://pixelfed.org"</string>
     <string name="license_info">PixelDroid is free and open source software, licensed under the GNU General Public License (version 3 or later)</string>
     <string name="about">About</string>
     <string name="post_title">%1$s\'s post</string>
-    <string name="followers_title">%1$s\'s followers</string>
+    <string name="followers_title">\@%1$s\'s followers</string>
     <string name="hashtag_title">#%1$s</string>
-    <string name="follows_title">%1$s\'s follows</string>
+    <string name="follows_title">\@%1$s\'s follows</string>
     <string name="search_empty_error">Search query can\'t be empty</string>
     <string name="status_more_options">More options</string>
     <string name="report">Report</string>
diff --git a/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt b/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt
index fa3c481f..ebf1fd6b 100644
--- a/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt
+++ b/app/src/test/java/org/pixeldroid/app/PostUnitTest.kt
@@ -33,9 +33,6 @@ class PostUnitTest {
     @Test
     fun getProfilePicUrlReturnsAValidURL() = Assert.assertNotNull(status.getProfilePicUrl())
 
-    @Test
-    fun getUsernameReturnsACorrectName() = Assert.assertEquals(status.account!!.username, status.account!!.getusername())
-
     /*@Test
     fun getUsernameReturnsOtherNameIfUsernameIsNull() {
         val emptyDescStatus = status.copy(account = status.account!!.copy(username = ""))