Add trending tags

app/build.gradle

@@ -54,7 +54,6 @@ android {
             shrinkResources true
             proguardFiles 'proguard-rules.pro'
         }
-        debug {}
     }
 
     flavorDimensions += "color"

app/src/main/AndroidManifest.xml

@@ -143,6 +143,7 @@
         <activity android:name=".ListsActivity" />
         <activity android:name=".LicenseActivity" />
         <activity android:name=".FiltersActivity" />
+        <activity android:name=".components.trending.TrendingActivity" />
         <activity android:name=".components.followedtags.FollowedTagsActivity" />
         <activity
             android:name=".components.report.ReportActivity"

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -75,13 +75,15 @@ import com.keylesspalace.tusky.components.notifications.showMigrationNoticeIfNec
 import com.keylesspalace.tusky.components.preference.PreferencesActivity
 import com.keylesspalace.tusky.components.scheduled.ScheduledStatusActivity
 import com.keylesspalace.tusky.components.search.SearchActivity
+import com.keylesspalace.tusky.components.trending.TrendingActivity
 import com.keylesspalace.tusky.databinding.ActivityMainBinding
 import com.keylesspalace.tusky.db.AccountEntity
 import com.keylesspalace.tusky.db.DraftsAlert
 import com.keylesspalace.tusky.entity.Account
 import com.keylesspalace.tusky.entity.Notification
 import com.keylesspalace.tusky.interfaces.AccountSelectionListener
 import com.keylesspalace.tusky.interfaces.ActionButtonActivity
+import com.keylesspalace.tusky.interfaces.FabFragment
 import com.keylesspalace.tusky.interfaces.ReselectableFragment
 import com.keylesspalace.tusky.pager.MainPagerAdapter
 import com.keylesspalace.tusky.settings.PrefKeys
@@ -261,7 +263,11 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
 
         binding.viewPager.reduceSwipeSensitivity()
 
-        setupDrawer(savedInstanceState, addSearchButton = hideTopToolbar)
+        setupDrawer(
+            savedInstanceState,
+            addSearchButton = hideTopToolbar,
+            addTrendingButton = !accountManager.activeAccount!!.tabPreferences.hasTab(TRENDING)
+        )
 
         /* Fetch user info while we're doing other things. This has to be done after setting up the
          * drawer, though, because its callback touches the header in the drawer. */
@@ -277,7 +283,15 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             .subscribe { event: Event? ->
                 when (event) {
                     is ProfileEditedEvent -> onFetchUserInfoSuccess(event.newProfileData)
-                    is MainTabsChangedEvent -> setupTabs(false)
+                    is MainTabsChangedEvent -> {
+                        refreshMainDrawerItems(
+                            addSearchButton = hideTopToolbar,
+                            addTrendingButton = !event.newTabs.hasTab(TRENDING),
+                        )
+
+                        setupTabs(false)
+                    }
+
                     is AnnouncementReadEvent -> {
                         unreadAnnouncementsCount--
                         updateAnnouncementsBadge()
@@ -397,7 +411,11 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         finish()
     }
 
-    private fun setupDrawer(savedInstanceState: Bundle?, addSearchButton: Boolean) {
+    private fun setupDrawer(
+        savedInstanceState: Bundle?,
+        addSearchButton: Boolean,
+        addTrendingButton: Boolean
+    ) {
 
         val drawerOpenClickListener = View.OnClickListener { binding.mainDrawerLayout.open() }
 
@@ -455,6 +473,14 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         })
 
         binding.mainDrawer.apply {
+            refreshMainDrawerItems(addSearchButton, addTrendingButton)
+            setSavedInstance(savedInstanceState)
+        }
+    }
+
+    private fun refreshMainDrawerItems(addSearchButton: Boolean, addTrendingButton: Boolean) {
+        binding.mainDrawer.apply {
+            itemAdapter.clear()
             tintStatusBar = true
             addItems(
                 primaryDrawerItem {
@@ -521,7 +547,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                     }
                     badgeStyle = BadgeStyle().apply {
                         textColor = ColorHolder.fromColor(MaterialColors.getColor(binding.mainDrawer, com.google.android.material.R.attr.colorOnPrimary))
-                        color = ColorHolder.fromColor(MaterialColors.getColor(binding.mainDrawer, androidx.appcompat.R.attr.colorPrimary))
+                        color = ColorHolder.fromColor(MaterialColors.getColor(binding.mainDrawer, com.google.android.material.R.attr.colorPrimary))
                     }
                 },
                 DividerDrawerItem(),
@@ -569,7 +595,18 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                 )
             }
 
-            setSavedInstance(savedInstanceState)
+            if (addTrendingButton) {
+                binding.mainDrawer.addItemsAtPosition(
+                    5,
+                    primaryDrawerItem {
+                        nameRes = R.string.title_public_trending_hashtags
+                        iconicsIcon = GoogleMaterial.Icon.gmd_trending_up
+                        onClick = {
+                            startActivityWithSlideInAnimation(TrendingActivity.getIntent(context))
+                        }
+                    }
+                )
+            }
         }
 
         if (BuildConfig.DEBUG) {
@@ -672,6 +709,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                 }
 
                 binding.mainToolbar.title = tabs[tab.position].title(this@MainActivity)
+
+                refreshComposeButtonState(adapter, tab.position)
             }
 
             override fun onTabUnselected(tab: TabLayout.Tab) {}
@@ -681,6 +720,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                 if (fragment is ReselectableFragment) {
                     (fragment as ReselectableFragment).onReselect()
                 }
+
+                refreshComposeButtonState(adapter, tab.position)
             }
         }.also {
             activeTabLayout.addOnTabSelectedListener(it)
@@ -695,6 +736,20 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         updateProfiles()
     }
 
+    private fun refreshComposeButtonState(adapter: MainPagerAdapter, tabPosition: Int) {
+        adapter.getFragment(tabPosition)?.also { fragment ->
+            if (fragment is FabFragment) {
+                if (fragment.isFabVisible()) {
+                    binding.composeButton.show()
+                } else {
+                    binding.composeButton.hide()
+                }
+            } else {
+                binding.composeButton.show()
+            }
+        }
+    }
+
     private fun handleProfileClick(profile: IProfile, current: Boolean): Boolean {
         val activeAccount = accountManager.activeAccount
 
@@ -930,16 +985,17 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
 
     private fun updateProfiles() {
         val animateEmojis = preferences.getBoolean(PrefKeys.ANIMATE_CUSTOM_EMOJIS, false)
-        val profiles: MutableList<IProfile> = accountManager.getAllAccountsOrderedByActive().map { acc ->
-            ProfileDrawerItem().apply {
-                isSelected = acc.isActive
-                nameText = acc.displayName.emojify(acc.emojis, header, animateEmojis)
-                iconUrl = acc.profilePictureUrl
-                isNameShown = true
-                identifier = acc.id
-                descriptionText = acc.fullName
-            }
-        }.toMutableList()
+        val profiles: MutableList<IProfile> =
+            accountManager.getAllAccountsOrderedByActive().map { acc ->
+                ProfileDrawerItem().apply {
+                    isSelected = acc.isActive
+                    nameText = acc.displayName.emojify(acc.emojis, header, animateEmojis)
+                    iconUrl = acc.profilePictureUrl
+                    isNameShown = true
+                    identifier = acc.id
+                    descriptionText = acc.fullName
+                }
+            }.toMutableList()
 
         // reuse the already existing "add account" item
         for (profile in header.profiles.orEmpty()) {

app/src/main/java/com/keylesspalace/tusky/TabData.kt

@@ -22,6 +22,7 @@ import androidx.fragment.app.Fragment
 import com.keylesspalace.tusky.components.conversation.ConversationsFragment
 import com.keylesspalace.tusky.components.timeline.TimelineFragment
 import com.keylesspalace.tusky.components.timeline.viewmodel.TimelineViewModel
+import com.keylesspalace.tusky.components.trending.TrendingFragment
 import com.keylesspalace.tusky.fragment.NotificationsFragment
 
 /** this would be a good case for a sealed class, but that does not work nice with Room */
@@ -31,6 +32,7 @@ const val NOTIFICATIONS = "Notifications"
 const val LOCAL = "Local"
 const val FEDERATED = "Federated"
 const val DIRECT = "Direct"
+const val TRENDING = "Trending"
 const val HASHTAG = "Hashtag"
 const val LIST = "List"
 
@@ -43,6 +45,8 @@ data class TabData(
     val title: (Context) -> String = { context -> context.getString(text) }
 )
 
+fun List<TabData>.hasTab(id: String): Boolean = this.find { it.id == id } != null
+
 fun createTabDataFromId(id: String, arguments: List<String> = emptyList()): TabData {
     return when (id) {
         HOME -> TabData(
@@ -75,6 +79,12 @@ fun createTabDataFromId(id: String, arguments: List<String> = emptyList()): TabD
             R.drawable.ic_reblog_direct_24dp,
             { ConversationsFragment.newInstance() }
         )
+        TRENDING -> TabData(
+            TRENDING,
+            R.string.title_public_trending_hashtags,
+            R.drawable.ic_trending_up_24px,
+            { TrendingFragment.newInstance() }
+        )
         HASHTAG -> TabData(
             HASHTAG,
             R.string.hashtags,

app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt

@@ -317,6 +317,10 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
         if (!currentTabs.contains(directMessagesTab)) {
             addableTabs.add(directMessagesTab)
         }
+        val trendingTab = createTabDataFromId(TRENDING)
+        if (!currentTabs.contains(trendingTab)) {
+            addableTabs.add(trendingTab)
+        }
 
         addableTabs.add(createTabDataFromId(HASHTAG))
         addableTabs.add(createTabDataFromId(LIST))

app/src/main/java/com/keylesspalace/tusky/adapter/TrendingDateViewHolder.kt

@@ -0,0 +1,41 @@
+/* Copyright 2023 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.adapter
+
+import androidx.recyclerview.widget.RecyclerView
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.databinding.ItemTrendingDateBinding
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+
+class TrendingDateViewHolder(
+    private val binding: ItemTrendingDateBinding,
+) : RecyclerView.ViewHolder(binding.root) {
+
+    private val dateFormat = SimpleDateFormat("EEE dd MMM yyyy", Locale.getDefault()).apply {
+        this.timeZone = TimeZone.getDefault()
+    }
+
+    fun setup(start: Date, end: Date) {
+        binding.dates.text = itemView.context.getString(
+            R.string.date_range,
+            dateFormat.format(start),
+            dateFormat.format(end)
+        )
+    }
+}

app/src/main/java/com/keylesspalace/tusky/adapter/TrendingTagViewHolder.kt

@@ -0,0 +1,94 @@
+/* Copyright 2023 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.adapter
+
+import androidx.recyclerview.widget.RecyclerView
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.databinding.ItemTrendingCellBinding
+import com.keylesspalace.tusky.entity.TrendingTagHistory
+import com.keylesspalace.tusky.interfaces.LinkListener
+import com.keylesspalace.tusky.viewdata.TrendingViewData
+import java.text.NumberFormat
+import kotlin.math.ln
+import kotlin.math.pow
+
+class TrendingTagViewHolder(
+    private val binding: ItemTrendingCellBinding
+) : RecyclerView.ViewHolder(binding.root) {
+
+    fun setup(
+        tagViewData: TrendingViewData.Tag,
+        maxTrendingValue: Long,
+        trendingListener: LinkListener,
+    ) {
+        val reversedHistory = tagViewData.tag.history.reversed()
+        setGraph(reversedHistory, maxTrendingValue)
+        setTag(tagViewData.tag.name)
+
+        val totalUsage = tagViewData.tag.history.sumOf { it.uses.toLongOrNull() ?: 0 }
+        binding.totalUsage.text = formatNumber(totalUsage)
+
+        val totalAccounts = tagViewData.tag.history.sumOf { it.accounts.toLongOrNull() ?: 0 }
+        binding.totalAccounts.text = formatNumber(totalAccounts)
+
+        binding.currentUsage.text = reversedHistory.last().uses
+        binding.currentAccounts.text = reversedHistory.last().accounts
+
+        itemView.setOnClickListener {
+            trendingListener.onViewTag(tagViewData.tag.name)
+        }
+
+        setAccessibility(totalAccounts, tagViewData.tag.name)
+    }
+
+    private fun setGraph(history: List<TrendingTagHistory>, maxTrendingValue: Long) {
+        binding.graph.maxTrendingValue = maxTrendingValue
+        binding.graph.primaryLineData = history
+            .mapNotNull { it.uses.toLongOrNull() }
+        binding.graph.secondaryLineData = history
+            .mapNotNull { it.accounts.toLongOrNull() }
+    }
+
+    private fun setTag(tag: String) {
+        binding.tag.text = binding.root.context.getString(R.string.title_tag, tag)
+    }
+
+    private fun setAccessibility(totalAccounts: Long, tag: String) {
+        itemView.contentDescription =
+            itemView.context.getString(R.string.accessibility_talking_about_tag, totalAccounts, tag)
+    }
+
+    companion object {
+        private val numberFormatter: NumberFormat = NumberFormat.getInstance()
+        private val ln_1k = ln(1000.0)
+
+        /**
+         * Format numbers according to the current locale. Numbers < min have
+         * separators (',', '.', etc) inserted according to the locale.
+         *
+         * Numbers > min are scaled down to that by multiples of 1,000, and
+         * a suffix appropriate to the scaling is appended.
+         */
+        private fun formatNumber(num: Long, min: Int = 100000): String {
+            if (num < min) return numberFormatter.format(num)
+
+            val exp = (ln(num.toDouble()) / ln_1k).toInt()
+
+            // TODO: is the choice of suffixes here locale-agnostic?
+            return String.format("%.1f %c", num / 1000.0.pow(exp.toDouble()), "KMGTPE"[exp - 1])
+        }
+    }
+}