Convert util/{HttpHeaderLink,PairedList,TimestampUtils,ThemeUtils} to Kotlin (#3046)

* Fix off-by-one error in HttpHeaderLink

Link headers with multiple URLs with multiple parameters were being parsed
incorrectly.

Detected by adding unit tests ahead of converting to Kotlin.

* Convert util/HttpHeaderLink from Java to Kotlin

* Convert util/ThemeUtils from Java to Kotlin

* Convert util/TimestampUtils from Java to Kotlin

* Add tests for PairedList

* Convert util/PairedList from Java to Kotlin

* Implement feedback from PR

* Relicense as GPL

app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt

@@ -41,6 +41,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.viewpager2.widget.MarginPageTransformer
 import com.bumptech.glide.Glide
 import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
@@ -70,7 +71,6 @@ import com.keylesspalace.tusky.util.DefaultTextWatcher
 import com.keylesspalace.tusky.util.Error
 import com.keylesspalace.tusky.util.Loading
 import com.keylesspalace.tusky.util.Success
-import com.keylesspalace.tusky.util.ThemeUtils
 import com.keylesspalace.tusky.util.emojify
 import com.keylesspalace.tusky.util.getDomain
 import com.keylesspalace.tusky.util.hide
@@ -172,9 +172,9 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
      * Load colors and dimensions from resources
      */
     private fun loadResources() {
-        toolbarColor = ThemeUtils.getColor(this, R.attr.colorSurface)
+        toolbarColor = MaterialColors.getColor(this, R.attr.colorSurface, Color.BLACK)
         statusBarColorTransparent = getColor(R.color.transparent_statusbar_background)
-        statusBarColorOpaque = ThemeUtils.getColor(this, R.attr.colorPrimaryDark)
+        statusBarColorOpaque = MaterialColors.getColor(this, R.attr.colorPrimaryDark, Color.BLACK)
         avatarSize = resources.getDimension(R.dimen.account_activity_avatar_size)
         titleVisibleHeight = resources.getDimensionPixelSize(R.dimen.account_activity_scroll_title_visible_height)
     }

app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaGridAdapter.kt

@@ -11,11 +11,11 @@ import androidx.core.view.setPadding
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import com.bumptech.glide.Glide
+import com.google.android.material.color.MaterialColors
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.databinding.ItemAccountMediaBinding
 import com.keylesspalace.tusky.entity.Attachment
 import com.keylesspalace.tusky.util.BindingHolder
-import com.keylesspalace.tusky.util.ThemeUtils
 import com.keylesspalace.tusky.util.decodeBlurHash
 import com.keylesspalace.tusky.util.getFormattedDescription
 import com.keylesspalace.tusky.util.hide
@@ -40,7 +40,7 @@ class AccountMediaGridAdapter(
     }
 ) {
 
-    private val baseItemBackgroundColor = ThemeUtils.getColor(context, R.attr.colorSurface)
+    private val baseItemBackgroundColor = MaterialColors.getColor(context, R.attr.colorSurface, Color.BLACK)
     private val videoIndicator = AppCompatResources.getDrawable(context, R.drawable.ic_play_indicator)
     private val mediaHiddenDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_hide_media_24dp)
 

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt

@@ -63,6 +63,7 @@ import com.canhub.cropper.CropImage
 import com.canhub.cropper.CropImageContract
 import com.canhub.cropper.options
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.BuildConfig
@@ -86,8 +87,8 @@ import com.keylesspalace.tusky.entity.Emoji
 import com.keylesspalace.tusky.entity.NewPoll
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.settings.PrefKeys
+import com.keylesspalace.tusky.util.APP_THEME_DEFAULT
 import com.keylesspalace.tusky.util.PickMediaFiles
-import com.keylesspalace.tusky.util.ThemeUtils
 import com.keylesspalace.tusky.util.afterTextChanged
 import com.keylesspalace.tusky.util.getInitialLanguage
 import com.keylesspalace.tusky.util.getLocaleList
@@ -97,6 +98,7 @@ import com.keylesspalace.tusky.util.highlightSpans
 import com.keylesspalace.tusky.util.loadAvatar
 import com.keylesspalace.tusky.util.modernLanguageCode
 import com.keylesspalace.tusky.util.onTextChanged
+import com.keylesspalace.tusky.util.setDrawableTint
 import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.util.visible
@@ -206,7 +208,7 @@ class ComposeActivity :
             accountManager.setActiveAccount(accountId)
         }
 
-        val theme = preferences.getString("appTheme", ThemeUtils.APP_THEME_DEFAULT)
+        val theme = preferences.getString("appTheme", APP_THEME_DEFAULT)
         if (theme == "black") {
             setTheme(R.style.TuskyDialogActivityBlackTheme)
         }
@@ -341,7 +343,7 @@ class ComposeActivity :
             binding.composeReplyView.text = getString(R.string.replying_to, replyingStatusAuthor)
             val arrowDownIcon = IconicsDrawable(this, GoogleMaterial.Icon.gmd_arrow_drop_down).apply { sizeDp = 12 }
 
-            ThemeUtils.setDrawableTint(this, arrowDownIcon, android.R.attr.textColorTertiary)
+            setDrawableTint(this, arrowDownIcon, android.R.attr.textColorTertiary)
             binding.composeReplyView.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, arrowDownIcon, null)
 
             binding.composeReplyView.setOnClickListener {
@@ -354,7 +356,7 @@ class ComposeActivity :
                     binding.composeReplyContentView.show()
                     val arrowUpIcon = IconicsDrawable(this, GoogleMaterial.Icon.gmd_arrow_drop_up).apply { sizeDp = 12 }
 
-                    ThemeUtils.setDrawableTint(this, arrowUpIcon, android.R.attr.textColorTertiary)
+                    setDrawableTint(this, arrowUpIcon, android.R.attr.textColorTertiary)
                     binding.composeReplyView.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, arrowUpIcon, null)
                 }
             }
@@ -501,7 +503,7 @@ class ComposeActivity :
             displayTransientMessage(R.string.hint_media_description_missing)
         }
 
-        val textColor = ThemeUtils.getColor(this, android.R.attr.textColorTertiary)
+        val textColor = MaterialColors.getColor(binding.root, android.R.attr.textColorTertiary)
 
         val cameraIcon = IconicsDrawable(this, GoogleMaterial.Icon.gmd_camera_alt).apply { colorInt = textColor; sizeDp = 18 }
         binding.actionPhotoTake.setCompoundDrawablesRelativeWithIntrinsicBounds(cameraIcon, null, null, null)
@@ -688,7 +690,7 @@ class ComposeActivity :
                     getColor(R.color.tusky_blue)
                 } else {
                     binding.composeHideMediaButton.setImageResource(R.drawable.ic_eye_24dp)
-                    ThemeUtils.getColor(this, android.R.attr.textColorTertiary)
+                    MaterialColors.getColor(binding.composeHideMediaButton, android.R.attr.textColorTertiary)
                 }
             }
             binding.composeHideMediaButton.drawable.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
@@ -710,7 +712,7 @@ class ComposeActivity :
             enableButton(binding.composeScheduleButton, clickable = false, colorActive = false)
         } else {
             @ColorInt val color = if (binding.composeScheduleView.time == null) {
-                ThemeUtils.getColor(this, android.R.attr.textColorTertiary)
+                MaterialColors.getColor(binding.composeScheduleButton, android.R.attr.textColorTertiary)
             } else {
                 getColor(R.color.tusky_blue)
             }
@@ -906,7 +908,7 @@ class ComposeActivity :
         val textColor = if (remainingLength < 0) {
             getColor(R.color.tusky_red)
         } else {
-            ThemeUtils.getColor(this, android.R.attr.textColorTertiary)
+            MaterialColors.getColor(binding.composeCharactersLeftView, android.R.attr.textColorTertiary)
         }
         binding.composeCharactersLeftView.setTextColor(textColor)
     }
@@ -1007,7 +1009,7 @@ class ComposeActivity :
 
     private fun enableButton(button: ImageButton, clickable: Boolean, colorActive: Boolean) {
         button.isEnabled = clickable
-        ThemeUtils.setDrawableTint(
+        setDrawableTint(
             this, button.drawable,
             if (colorActive) android.R.attr.textColorTertiary
             else R.attr.textColorDisabled
@@ -1016,8 +1018,8 @@ class ComposeActivity :
 
     private fun enablePollButton(enable: Boolean) {
         binding.addPollTextActionTextView.isEnabled = enable
-        val textColor = ThemeUtils.getColor(
-            this,
+        val textColor = MaterialColors.getColor(
+            binding.addPollTextActionTextView,
             if (enable) android.R.attr.textColorTertiary
             else R.attr.textColorDisabled
         )
@@ -1077,7 +1079,7 @@ class ComposeActivity :
         } else {
             binding.composeContentWarningBar.hide()
             binding.composeEditField.requestFocus()
-            ThemeUtils.getColor(this, android.R.attr.textColorTertiary)
+            MaterialColors.getColor(binding.composeContentWarningButton, android.R.attr.textColorTertiary)
         }
         binding.composeContentWarningButton.drawable.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
     }

app/src/main/java/com/keylesspalace/tusky/components/preference/AccountPreferencesFragment.kt

@@ -16,11 +16,13 @@
 package com.keylesspalace.tusky.components.preference
 
 import android.content.Intent
+import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.annotation.DrawableRes
 import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.AccountListActivity
 import com.keylesspalace.tusky.BaseActivity
@@ -47,7 +49,6 @@ import com.keylesspalace.tusky.settings.makePreferenceScreen
 import com.keylesspalace.tusky.settings.preference
 import com.keylesspalace.tusky.settings.preferenceCategory
 import com.keylesspalace.tusky.settings.switchPreference
-import com.keylesspalace.tusky.util.ThemeUtils
 import com.keylesspalace.tusky.util.getInitialLanguage
 import com.keylesspalace.tusky.util.getLocaleList
 import com.keylesspalace.tusky.util.getTuskyDisplayName
@@ -80,7 +81,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 setTitle(R.string.pref_title_edit_notification_settings)
                 icon = IconicsDrawable(context, GoogleMaterial.Icon.gmd_notifications).apply {
                     sizeRes = R.dimen.preference_icon_size
-                    colorInt = ThemeUtils.getColor(context, R.attr.iconColor)
+                    colorInt = MaterialColors.getColor(context, R.attr.iconColor, Color.BLACK)
                 }
                 setOnPreferenceClickListener {
                     openNotificationPrefs()
@@ -135,7 +136,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 setTitle(R.string.action_view_blocks)
                 icon = IconicsDrawable(context, GoogleMaterial.Icon.gmd_block).apply {
                     sizeRes = R.dimen.preference_icon_size
-                    colorInt = ThemeUtils.getColor(context, R.attr.iconColor)
+                    colorInt = MaterialColors.getColor(context, R.attr.iconColor, Color.BLACK)
                 }
                 setOnPreferenceClickListener {
                     val intent = Intent(context, AccountListActivity::class.java)

app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesActivity.kt

@@ -31,8 +31,9 @@ import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.PreferenceChangedEvent
 import com.keylesspalace.tusky.databinding.ActivityPreferencesBinding
 import com.keylesspalace.tusky.settings.PrefKeys
-import com.keylesspalace.tusky.util.ThemeUtils
+import com.keylesspalace.tusky.util.APP_THEME_DEFAULT
 import com.keylesspalace.tusky.util.getNonNullString
+import com.keylesspalace.tusky.util.setAppNightMode
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasAndroidInjector
 import javax.inject.Inject
@@ -124,9 +125,9 @@ class PreferencesActivity :
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
         when (key) {
             "appTheme" -> {
-                val theme = sharedPreferences.getNonNullString("appTheme", ThemeUtils.APP_THEME_DEFAULT)
+                val theme = sharedPreferences.getNonNullString("appTheme", APP_THEME_DEFAULT)
                 Log.d("activeTheme", theme)
-                ThemeUtils.setAppNightMode(theme)
+                setAppNightMode(theme)
 
                 restartActivitiesOnBackPressedCallback.isEnabled = true
                 this.restartCurrentActivity()

app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusViewHolder.kt

@@ -31,8 +31,8 @@ import com.keylesspalace.tusky.util.StatusDisplayOptions
 import com.keylesspalace.tusky.util.StatusViewHelper
 import com.keylesspalace.tusky.util.StatusViewHelper.Companion.COLLAPSE_INPUT_FILTER
 import com.keylesspalace.tusky.util.StatusViewHelper.Companion.NO_INPUT_FILTER
-import com.keylesspalace.tusky.util.TimestampUtils
 import com.keylesspalace.tusky.util.emojify
+import com.keylesspalace.tusky.util.getRelativeTimeSpanString
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.setClickableMentions
 import com.keylesspalace.tusky.util.setClickableText
@@ -161,7 +161,7 @@ class StatusViewHolder(
             binding.timestampInfo.text = if (createdAt != null) {
                 val then = createdAt.time
                 val now = System.currentTimeMillis()
-                TimestampUtils.getRelativeTimeSpanString(binding.timestampInfo.context, then, now)
+                getRelativeTimeSpanString(binding.timestampInfo.context, then, now)
             } else {
                 // unknown minutes~
                 "?m"