improved color scheme & theming

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

@@ -84,7 +84,6 @@ class ListsActivity : BaseActivity() {
         )
 
         binding.swipeRefreshLayout.setOnRefreshListener { viewModel.retryLoading() }
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
 
         lifecycleScope.launch {
             viewModel.state.collect(this@ListsActivity::update)

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

@@ -58,6 +58,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.FixedSizeDrawable
 import com.bumptech.glide.request.transition.Transition
+import com.google.android.material.R as materialR
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
@@ -698,8 +699,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
                         startActivityWithSlideInAnimation(AnnouncementsActivity.newIntent(context))
                     }
                     badgeStyle = BadgeStyle().apply {
-                        textColor = ColorHolder.fromColor(MaterialColors.getColor(binding.mainDrawer, com.google.android.material.R.attr.colorOnPrimary))
-                        color = ColorHolder.fromColor(MaterialColors.getColor(binding.mainDrawer, com.google.android.material.R.attr.colorPrimary))
+                        textColor = ColorHolder.fromColor(MaterialColors.getColor(binding.mainDrawer, materialR.attr.colorOnPrimary))
+                        color = ColorHolder.fromColor(MaterialColors.getColor(binding.mainDrawer, materialR.attr.colorPrimary))
                     }
                 },
                 DividerDrawerItem(),
@@ -856,7 +857,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
             if (tabs[position].id == DIRECT) {
                 val badge = tab.orCreateBadge
                 badge.isVisible = accountManager.activeAccount?.hasDirectMessageBadge ?: false
-                badge.backgroundColor = MaterialColors.getColor(binding.mainDrawer, com.google.android.material.R.attr.colorPrimary)
+                badge.backgroundColor = MaterialColors.getColor(binding.mainDrawer, materialR.attr.colorPrimary)
                 directMessageTab = tab
             }
         }.also { it.attach() }

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

@@ -49,6 +49,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.viewpager2.widget.MarginPageTransformer
 import com.bumptech.glide.Glide
+import com.google.android.material.R as materialR
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.chip.Chip
 import com.google.android.material.color.MaterialColors
@@ -189,9 +190,9 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide
      * Load colors and dimensions from resources
      */
     private fun loadResources() {
-        toolbarColor = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, Color.BLACK)
+        toolbarColor = MaterialColors.getColor(this, materialR.attr.colorSurface, Color.BLACK)
         statusBarColorTransparent = getColor(R.color.transparent_statusbar_background)
-        statusBarColorOpaque = MaterialColors.getColor(this, androidx.appcompat.R.attr.colorPrimaryDark, Color.BLACK)
+        statusBarColorOpaque = MaterialColors.getColor(this, materialR.attr.colorPrimaryDark, Color.BLACK)
         avatarSize = resources.getDimension(R.dimen.account_activity_avatar_size)
         titleVisibleHeight = resources.getDimensionPixelSize(R.dimen.account_activity_scroll_title_visible_height)
     }
@@ -458,7 +459,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide
                 binding.swipeToRefreshLayout.isRefreshing = isRefreshing == true
             }
         }
-        binding.swipeToRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
     }
 
     private fun onAccountChanged(account: Account?) {

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

@@ -104,7 +104,6 @@ class AccountMediaFragment :
 
         binding.swipeRefreshLayout.isEnabled = false
         binding.swipeRefreshLayout.setOnRefreshListener { refreshContent() }
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
 
         binding.statusView.visibility = View.GONE
 

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

@@ -11,6 +11,7 @@ import androidx.core.view.setPadding
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import com.bumptech.glide.Glide
+import com.google.android.material.R as materialR
 import com.google.android.material.color.MaterialColors
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.databinding.ItemAccountMediaBinding
@@ -47,7 +48,7 @@ class AccountMediaGridAdapter(
 
     private val baseItemBackgroundColor = MaterialColors.getColor(
         context,
-        com.google.android.material.R.attr.colorSurface,
+        materialR.attr.colorSurface,
         Color.BLACK
     )
     private val videoIndicator = AppCompatResources.getDrawable(

app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt

@@ -138,7 +138,6 @@ class AccountListFragment :
         binding.recyclerView.addOnScrollListener(scrollListener)
 
         binding.swipeRefreshLayout.setOnRefreshListener { fetchAccounts(adapter) }
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
 
         fetchAccounts(adapter)
     }

app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt

@@ -91,7 +91,6 @@ class AnnouncementsActivity :
         }
 
         binding.swipeRefreshLayout.setOnRefreshListener(this::refreshAnnouncements)
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
 
         binding.announcementsList.setHasFixedSize(true)
         binding.announcementsList.layoutManager = LinearLayoutManager(this)

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

@@ -43,6 +43,7 @@ import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
@@ -61,6 +62,7 @@ import androidx.transition.TransitionManager
 import com.canhub.cropper.CropImage
 import com.canhub.cropper.CropImageContract
 import com.canhub.cropper.options
+import com.google.android.material.R as materialR
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback
 import com.google.android.material.color.MaterialColors
@@ -821,24 +823,26 @@ class ComposeActivity :
             binding.descriptionMissingWarningButton.hide()
         } else {
             binding.composeHideMediaButton.show()
-            @ColorInt val color = if (contentWarningShown) {
+            @AttrRes val color = if (contentWarningShown) {
                 binding.composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp)
                 binding.composeHideMediaButton.isClickable = false
-                getColor(R.color.transparent_tusky_blue)
+                materialR.attr.colorPrimary
             } else {
                 binding.composeHideMediaButton.isClickable = true
                 if (markMediaSensitive) {
                     binding.composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp)
-                    getColor(R.color.tusky_blue)
+                    materialR.attr.colorPrimary
                 } else {
                     binding.composeHideMediaButton.setImageResource(R.drawable.ic_eye_24dp)
-                    MaterialColors.getColor(
-                        binding.composeHideMediaButton,
-                        android.R.attr.textColorTertiary
-                    )
+                    android.R.attr.textColorTertiary
                 }
             }
-            binding.composeHideMediaButton.drawable.setTint(color)
+            binding.composeHideMediaButton.drawable.setTint(
+                MaterialColors.getColor(
+                    binding.composeHideMediaButton,
+                    color
+                )
+            )
 
             var oneMediaWithoutDescription = false
             for (media in viewModel.media.value) {
@@ -856,14 +860,15 @@ class ComposeActivity :
             // Can't reschedule a published status
             enableButton(binding.composeScheduleButton, clickable = false, colorActive = false)
         } else {
-            @ColorInt val color = if (binding.composeScheduleView.time == null) {
+            @ColorInt val color =
                 MaterialColors.getColor(
                     binding.composeScheduleButton,
-                    android.R.attr.textColorTertiary
+                    if (binding.composeScheduleView.time == null) {
+                        android.R.attr.textColorTertiary
+                    } else {
+                        materialR.attr.colorPrimary
+                    }
                 )
-            } else {
-                getColor(R.color.tusky_blue)
-            }
             binding.composeScheduleButton.drawable.setTint(color)
         }
     }
@@ -1242,22 +1247,24 @@ class ComposeActivity :
         TransitionManager.beginDelayedTransition(
             binding.composeContentWarningBar.parent as ViewGroup
         )
-        @ColorInt val color = if (show) {
+        @AttrRes val color = if (show) {
             binding.composeContentWarningBar.show()
             binding.composeContentWarningField.setSelection(
                 binding.composeContentWarningField.text.length
             )
             binding.composeContentWarningField.requestFocus()
-            getColor(R.color.tusky_blue)
+            materialR.attr.colorPrimary
         } else {
             binding.composeContentWarningBar.hide()
             binding.composeEditField.requestFocus()
+            android.R.attr.textColorTertiary
+        }
+        binding.composeContentWarningButton.drawable.setTint(
             MaterialColors.getColor(
-                binding.composeContentWarningButton,
-                android.R.attr.textColorTertiary
+                binding.composeHideMediaButton,
+                color
             )
-        }
-        binding.composeContentWarningButton.drawable.setTint(color)
+        )
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

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

@@ -24,6 +24,8 @@ import android.graphics.RectF
 import android.util.AttributeSet
 import androidx.appcompat.content.res.AppCompatResources
 import at.connyduck.sparkbutton.helpers.Utils
+import com.google.android.material.R as materialR
+import com.google.android.material.color.MaterialColors
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.view.MediaPreviewImageView
 
@@ -37,7 +39,7 @@ class ProgressImageView
     private val progressRect = RectF()
     private val biggerRect = RectF()
     private val circlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        color = context.getColor(R.color.tusky_blue)
+        color = MaterialColors.getColor(this@ProgressImageView, materialR.attr.colorPrimary)
         strokeWidth = Utils.dpToPx(context, 4).toFloat()
         style = Paint.Style.STROKE
     }
@@ -46,13 +48,15 @@ class ProgressImageView
     }
     private val markBgPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Paint.Style.FILL
-        color = context.getColor(R.color.tusky_grey_10)
+        color = MaterialColors.getColor(this@ProgressImageView, android.R.attr.colorBackground)
     }
     private val captionDrawable = AppCompatResources.getDrawable(
         context,
         R.drawable.spellcheck
     )!!.apply {
-        setTint(Color.WHITE)
+        setTint(
+            MaterialColors.getColor(this@ProgressImageView, android.R.attr.textColorTertiary)
+        )
     }
     private val circleRadius = Utils.dpToPx(context, 14)
     private val circleMargin = Utils.dpToPx(context, 14)
@@ -68,8 +72,10 @@ class ProgressImageView
     }
 
     fun setChecked(checked: Boolean) {
-        markBgPaint.color =
-            context.getColor(if (checked) R.color.tusky_blue else R.color.tusky_grey_10)
+        val backgroundColor = if (checked) materialR.attr.colorPrimary else android.R.attr.colorBackground
+        val foregroundColor = if (checked) materialR.attr.colorOnPrimary else android.R.attr.textColorTertiary
+        markBgPaint.color = MaterialColors.getColor(this, backgroundColor)
+        captionDrawable.setTint(MaterialColors.getColor(this, foregroundColor))
         invalidate()
     }
 

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt

@@ -109,7 +109,7 @@ class ConversationsFragment :
 
         setupRecyclerView(adapter)
 
-        initSwipeToRefresh()
+        binding.swipeRefreshLayout.setOnRefreshListener { refreshContent() }
 
         adapter.addLoadStateListener { loadState ->
             if (loadState.refresh != LoadState.Loading && loadState.source.refresh != LoadState.Loading) {
@@ -245,11 +245,6 @@ class ConversationsFragment :
         adapter?.refresh()
     }
 
-    private fun initSwipeToRefresh() {
-        binding.swipeRefreshLayout.setOnRefreshListener { refreshContent() }
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
-    }
-
     override fun onReblog(reblog: Boolean, position: Int) {
         // its impossible to reblog private messages
     }

app/src/main/java/com/keylesspalace/tusky/components/filters/FiltersActivity.kt

@@ -48,7 +48,6 @@ class FiltersActivity : BaseActivity(), FiltersListener {
         }
 
         binding.swipeRefreshLayout.setOnRefreshListener { reloadFilters() }
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
 
         setTitle(R.string.pref_title_timeline_filters)
 

app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt

@@ -137,7 +137,6 @@ class NotificationsFragment :
 
         // Setup the SwipeRefreshLayout.
         binding.swipeRefreshLayout.setOnRefreshListener(this)
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
 
         // Setup the RecyclerView.
         binding.recyclerView.setHasFixedSize(true)

app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt

@@ -102,6 +102,7 @@ class ReportStatusesFragment :
                     startActivity(intent)
                 }
             }
+
             Attachment.Type.UNKNOWN -> {
             }
         }
@@ -111,7 +112,7 @@ class ReportStatusesFragment :
         requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
         handleClicks()
         initStatusesView()
-        setupSwipeRefreshLayout()
+        binding.swipeRefreshLayout.setOnRefreshListener(this)
     }
 
     override fun onDestroyView() {
@@ -138,6 +139,7 @@ class ReportStatusesFragment :
                 onRefresh()
                 true
             }
+
             else -> false
         }
     }
@@ -148,12 +150,6 @@ class ReportStatusesFragment :
         adapter?.refresh()
     }
 
-    private fun setupSwipeRefreshLayout() {
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
-
-        binding.swipeRefreshLayout.setOnRefreshListener(this)
-    }
-
     private fun initStatusesView() {
         val statusDisplayOptions = StatusDisplayOptions(
             animateAvatars = false,

app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt

@@ -77,7 +77,6 @@ class ScheduledStatusActivity :
         }
 
         binding.swipeRefreshLayout.setOnRefreshListener(this::refreshStatuses)
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
 
         binding.scheduledTootList.setHasFixedSize(true)
         binding.scheduledTootList.layoutManager = LinearLayoutManager(this)

app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt

@@ -62,7 +62,7 @@ abstract class SearchFragment<T : Any> :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val adapter = initAdapter()
-        setupSwipeRefreshLayout()
+        binding.swipeRefreshLayout.setOnRefreshListener(this)
         requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
         subscribeObservables(adapter)
     }
@@ -74,11 +74,6 @@ abstract class SearchFragment<T : Any> :
         super.onDestroyView()
     }
 
-    private fun setupSwipeRefreshLayout() {
-        binding.swipeRefreshLayout.setOnRefreshListener(this)
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
-    }
-
     private fun subscribeObservables(adapter: PagingDataAdapter<T, *>) {
         viewLifecycleOwner.lifecycleScope.launch {
             data.collectLatest { pagingData ->
@@ -131,6 +126,7 @@ abstract class SearchFragment<T : Any> :
                 onRefresh()
                 true
             }
+
             else -> false
         }
     }

app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt

@@ -373,7 +373,6 @@ class TimelineFragment :
     private fun setupSwipeRefreshLayout() {
         binding.swipeRefreshLayout.isEnabled = isSwipeToRefreshEnabled
         binding.swipeRefreshLayout.setOnRefreshListener(this)
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
     }
 
     private fun setupRecyclerView(adapter: TimelinePagingAdapter) {

app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingTagsFragment.kt

@@ -72,7 +72,7 @@ class TrendingTagsFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val adapter = TrendingTagsAdapter(::onViewTag)
         this.adapter = adapter
-        setupSwipeRefreshLayout()
+        binding.swipeRefreshLayout.setOnRefreshListener(this)
         setupRecyclerView(adapter)
 
         adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
@@ -106,11 +106,6 @@ class TrendingTagsFragment :
         super.onDestroyView()
     }
 
-    private fun setupSwipeRefreshLayout() {
-        binding.swipeRefreshLayout.setOnRefreshListener(this)
-        binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
-    }
-
     private fun setupLayoutManager(adapter: TrendingTagsAdapter, columnCount: Int) {
         binding.recyclerView.layoutManager = GridLayoutManager(context, columnCount).apply {
             spanSizeLookup = object : SpanSizeLookup() {