Bimba.git

commit 696bd312124cdf63468041b581e53bcf88762c4b

Author: Adam Evyčędo <git@apiote.xyz>

mark cached feeds with lower alpha

%!v(PANIC=String method: strings: negative Repeat count)


diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedChooserActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedChooserActivity.kt
index 9a0d146235b441b3dba102139db061d33fa0ef89..c01d13f54ea0addd2b246d3d070d96aac3aed5f0 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedChooserActivity.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedChooserActivity.kt
@@ -84,7 +84,6 @@ 			BimbaFeedInfoAdapter(
 				layoutInflater,
 				(viewModel.feeds.value ?: emptyMap()).map { it.value }.sortedBy { it.name },
 				viewModel.settings.value!!,
-				this,
 				{
 					showBottomSheet(it)
 				},




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedInfos.kt b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedInfos.kt
index 54c0eedcebc02fb832dd4bf479afa5ffccecf8ad..eef661fae7852973c68f30dfc11fe1cc92bc957a 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedInfos.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/settings/feeds/FeedInfos.kt
@@ -33,20 +33,11 @@ 		fun bind(
 			feed: FeedInfo,
 			feedSettings: FeedSettings?,
 			holder: BimbaFeedInfoViewHolder?,
-			context: Context,
 			onClickListener: (String) -> Unit,
 			onCheckedChangeListener: (String, Boolean) -> Unit
 		) {
-			val colorAttr = if (feed.cached) {
-				com.google.android.material.R.attr.colorOnSurfaceVariant
-			} else {
-				com.google.android.material.R.attr.colorOnSurface
-			}
-			holder?.name?.setTextColor(
-				context.theme.obtainStyledAttributes(
-					R.style.Theme_Bimba, intArrayOf(colorAttr)
-				).getColor(0, 0)
-			)
+			holder?.name?.alpha = if (feed.cached) { .5f } else { 1f }
+
 			holder?.root?.setOnClickListener {
 				onClickListener(feed.id)
 			}
@@ -70,7 +61,6 @@ class BimbaFeedInfoAdapter(
 	private val inflater: LayoutInflater,
 	private var feeds: List<FeedInfo>,
 	private var feedsSettings: FeedsSettings,
-	private val context: Context,
 	private val onClickListener: ((String) -> Unit),
 	private val onEnabledChangedListener: ((String, Boolean) -> Unit)
 ) :
@@ -109,7 +99,6 @@ 		BimbaFeedInfoViewHolder.bind(
 			feed,
 			feedsSettings.settings[feed.id],
 			holder,
-			context,
 			onClickListener,
 			onEnabledChangedListener
 		)