Hygiene: explore feed code update (#6151)

cooltey · dbrant · web-flow · commit d321cc7008ea · 2025-11-26T08:52:28.000-05:00
Co-authored-by: Dmitry Brant &lt;dbrant@wikimedia.org&gt;
diff --git a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCard.kt b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCard.kt
@@ -1,21 +1,24 @@
 package org.wikipedia.feed.becauseyouread
 
 import android.net.Uri
+import androidx.core.net.toUri
 import org.wikipedia.R
 import org.wikipedia.feed.model.CardType
 import org.wikipedia.feed.model.ListCard
 import org.wikipedia.page.PageTitle
 import org.wikipedia.util.L10nUtil
 
-class BecauseYouReadCard(val pageTitle: PageTitle,
-                         itemCards: List<BecauseYouReadItemCard>) : ListCard<BecauseYouReadItemCard>(itemCards, pageTitle.wikiSite) {
+class BecauseYouReadCard(
+    val pageTitle: PageTitle,
+    itemCards: List<BecauseYouReadItemCard>,
+) : ListCard<BecauseYouReadItemCard>(itemCards, pageTitle.wikiSite) {
 
     override fun title(): String {
         return L10nUtil.getString(pageTitle, R.string.view_because_you_read_card_title)
     }
 
     override fun image(): Uri? {
-        return if (pageTitle.thumbUrl.isNullOrEmpty()) null else Uri.parse(pageTitle.thumbUrl)
+        return pageTitle.thumbUrl?.toUri()
     }
 
     override fun extract(): String {
diff --git a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadItemCard.kt b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadItemCard.kt
@@ -1,6 +1,7 @@
 package org.wikipedia.feed.becauseyouread
 
 import android.net.Uri
+import androidx.core.net.toUri
 import org.wikipedia.feed.model.Card
 import org.wikipedia.feed.model.CardType
 import org.wikipedia.page.PageTitle
@@ -20,7 +21,7 @@ class BecauseYouReadItemCard(private val title: PageTitle) : Card() {
     }
 
     override fun image(): Uri? {
-        return if (title.thumbUrl.isNullOrEmpty()) null else Uri.parse(title.thumbUrl)
+        return title.thumbUrl?.toUri()
     }
 
     override fun type(): CardType {
diff --git a/app/src/main/java/org/wikipedia/feed/dayheader/DayHeaderCardView.kt b/app/src/main/java/org/wikipedia/feed/dayheader/DayHeaderCardView.kt
@@ -8,7 +8,7 @@ import org.wikipedia.feed.model.Card
 import org.wikipedia.feed.view.FeedAdapter
 import org.wikipedia.feed.view.FeedCardView
 
-class DayHeaderCardView constructor(context: Context) : FrameLayout(context), FeedCardView<Card> {
+class DayHeaderCardView(context: Context) : FrameLayout(context), FeedCardView<Card> {
 
     private val binding = ViewCardDayHeaderBinding.inflate(LayoutInflater.from(context), this, true)
 
diff --git a/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.kt b/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.kt
@@ -1,6 +1,7 @@
 package org.wikipedia.feed.featured
 
 import android.net.Uri
+import androidx.core.net.toUri
 import org.wikipedia.R
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.dataclient.page.PageSummary
@@ -10,8 +11,10 @@ import org.wikipedia.history.HistoryEntry
 import org.wikipedia.util.DateUtil
 import org.wikipedia.util.L10nUtil
 
-open class FeaturedArticleCard(private val page: PageSummary,
-                               private val age: Int, wiki: WikiSite) : WikiSiteCard(wiki) {
+open class FeaturedArticleCard(
+    private val page: PageSummary,
+    private val age: Int, wiki: WikiSite,
+) : WikiSiteCard(wiki) {
 
     override fun title(): String {
         return L10nUtil.getString(wikiSite().languageCode, R.string.view_featured_article_card_title)
@@ -22,7 +25,7 @@ open class FeaturedArticleCard(private val page: PageSummary,
     }
 
     override fun image(): Uri? {
-        return if (page.thumbnailUrl.isNullOrEmpty()) null else Uri.parse(page.thumbnailUrl)
+        return page.thumbnailUrl?.toUri()
     }
 
     override fun extract(): String? {
diff --git a/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.kt b/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.kt
@@ -14,7 +14,6 @@ import org.wikipedia.readinglist.database.ReadingListPage
 import org.wikipedia.staticdata.MainPageNameData
 import org.wikipedia.views.ImageZoomHelper
 
-@Suppress("LeakingThis")
 open class FeaturedArticleCardView(context: Context) : DefaultFeedCardView<FeaturedArticleCard>(context) {
 
     private val binding = ViewCardFeaturedArticleBinding.inflate(LayoutInflater.from(context), this, true)
diff --git a/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.kt b/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.kt
@@ -9,9 +9,11 @@ import org.wikipedia.feed.model.WikiSiteCard
 import org.wikipedia.util.DateUtil
 import org.wikipedia.util.L10nUtil
 
-class FeaturedImageCard(private val featuredImage: FeaturedImage,
-                        private val age: Int,
-                        wiki: WikiSite) : WikiSiteCard(wiki) {
+class FeaturedImageCard(
+    private val featuredImage: FeaturedImage,
+    private val age: Int,
+    wiki: WikiSite
+) : WikiSiteCard(wiki) {
 
     override fun title(): String {
         return L10nUtil.getString(wikiSite().languageCode, R.string.view_featured_image_card_title)
diff --git a/app/src/main/java/org/wikipedia/feed/model/CardType.kt b/app/src/main/java/org/wikipedia/feed/model/CardType.kt
@@ -23,8 +23,10 @@ import org.wikipedia.feed.view.FeedCardView
 import org.wikipedia.feed.wikigames.WikiGamesCardView
 import org.wikipedia.model.EnumCode
 
-enum class CardType constructor(private val code: Int,
-                                private val contentType: FeedContentType? = null) : EnumCode {
+enum class CardType(
+    private val code: Int,
+    private val contentType: FeedContentType? = null
+) : EnumCode {
     SEARCH_BAR(0) {
         override fun newView(ctx: Context): FeedCardView<*> {
             return SearchCardView(ctx)
diff --git a/app/src/main/java/org/wikipedia/feed/model/ListCard.kt b/app/src/main/java/org/wikipedia/feed/model/ListCard.kt
@@ -1,10 +1,9 @@
 package org.wikipedia.feed.model
 
 import org.wikipedia.dataclient.WikiSite
-import java.util.*
+import java.util.Collections
 
-abstract class ListCard<T : Card>(private val items: List<T>,
-                                  wiki: WikiSite) : WikiSiteCard(wiki) {
+abstract class ListCard<T : Card>(private val items: List<T>, wiki: WikiSite) : WikiSiteCard(wiki) {
 
     fun items(): List<T> {
         return Collections.unmodifiableList(items)
diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsCard.kt b/app/src/main/java/org/wikipedia/feed/news/NewsCard.kt
@@ -8,9 +8,11 @@ import org.wikipedia.feed.model.WikiSiteCard
 import org.wikipedia.util.L10nUtil
 import java.util.concurrent.TimeUnit
 
-class NewsCard(private val news: List<NewsItem>,
-               private val age: Int,
-               wiki: WikiSite) : WikiSiteCard(wiki) {
+class NewsCard(
+    private val news: List<NewsItem>,
+    private val age: Int,
+    wiki: WikiSite
+) : WikiSiteCard(wiki) {
 
     override fun title(): String {
         return L10nUtil.getString(wikiSite().languageCode, R.string.view_card_news_title)
diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsLinkCard.kt b/app/src/main/java/org/wikipedia/feed/news/NewsLinkCard.kt
@@ -1,6 +1,7 @@
 package org.wikipedia.feed.news
 
 import android.net.Uri
+import androidx.core.net.toUri
 import org.wikipedia.dataclient.Service
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.dataclient.page.PageSummary
@@ -9,7 +10,10 @@ import org.wikipedia.feed.model.CardType
 import org.wikipedia.page.PageTitle
 import org.wikipedia.util.ImageUrlUtil
 
-class NewsLinkCard(private val page: PageSummary, private val wiki: WikiSite) : Card() {
+class NewsLinkCard(
+    private val page: PageSummary,
+    private val wiki: WikiSite,
+) : Card() {
 
     override fun title(): String {
         return page.displayTitle
@@ -20,8 +24,9 @@ class NewsLinkCard(private val page: PageSummary, private val wiki: WikiSite) :
     }
 
     override fun image(): Uri? {
-        val thumbUrl = page.thumbnailUrl
-        return if (thumbUrl.isNullOrEmpty()) null else Uri.parse(ImageUrlUtil.getUrlForPreferredSize(thumbUrl, Service.PREFERRED_THUMB_SIZE))
+        return page.thumbnailUrl?.let {
+            ImageUrlUtil.getUrlForPreferredSize(it, Service.PREFERRED_THUMB_SIZE).toUri()
+        }
     }
 
     override fun type(): CardType {
diff --git a/app/src/main/java/org/wikipedia/feed/places/PlacesCard.kt b/app/src/main/java/org/wikipedia/feed/places/PlacesCard.kt
@@ -8,9 +8,11 @@ import org.wikipedia.feed.model.WikiSiteCard
 import org.wikipedia.util.DateUtil
 import org.wikipedia.util.L10nUtil
 
-class PlacesCard(wiki: WikiSite,
-                 val age: Int,
-                 val nearbyPage: NearbyPage? = null) : WikiSiteCard(wiki) {
+class PlacesCard(
+    wiki: WikiSite,
+    val age: Int,
+    val nearbyPage: NearbyPage? = null
+) : WikiSiteCard(wiki) {
 
     override fun type(): CardType {
         return CardType.PLACES
diff --git a/app/src/main/java/org/wikipedia/feed/suggestededits/SuggestedEditsCard.kt b/app/src/main/java/org/wikipedia/feed/suggestededits/SuggestedEditsCard.kt
@@ -8,9 +8,11 @@ import org.wikipedia.feed.model.WikiSiteCard
 import org.wikipedia.util.DateUtil
 import org.wikipedia.util.L10nUtil
 
-class SuggestedEditsCard(val cardTypes: List<DescriptionEditActivity.Action>,
-                         wiki: WikiSite,
-                         val age: Int) : WikiSiteCard(wiki) {
+class SuggestedEditsCard(
+    val cardTypes: List<DescriptionEditActivity.Action>,
+    wiki: WikiSite,
+    val age: Int
+) : WikiSiteCard(wiki) {
 
     override fun type(): CardType {
         return CardType.SUGGESTED_EDITS
diff --git a/app/src/main/java/org/wikipedia/feed/topread/TopReadItemCard.kt b/app/src/main/java/org/wikipedia/feed/topread/TopReadItemCard.kt
@@ -1,13 +1,16 @@
 package org.wikipedia.feed.topread
 
 import android.net.Uri
+import androidx.core.net.toUri
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.dataclient.page.PageSummary
 import org.wikipedia.feed.model.Card
 import org.wikipedia.feed.model.CardType
 
-class TopReadItemCard internal constructor(private val page: PageSummary,
-                                           private val wiki: WikiSite) : Card() {
+class TopReadItemCard(
+    private val page: PageSummary,
+    private val wiki: WikiSite,
+) : Card() {
 
     override fun title(): String {
         return page.displayTitle
@@ -18,7 +21,7 @@ class TopReadItemCard internal constructor(private val page: PageSummary,
     }
 
     override fun image(): Uri? {
-        return if (page.thumbnailUrl.isNullOrEmpty()) null else Uri.parse(page.thumbnailUrl)
+        return page.thumbnailUrl?.toUri()
     }
 
     override fun type(): CardType {
diff --git a/app/src/main/java/org/wikipedia/feed/topread/TopReadListCard.kt b/app/src/main/java/org/wikipedia/feed/topread/TopReadListCard.kt
@@ -11,8 +11,10 @@ import org.wikipedia.util.DateUtil
 import org.wikipedia.util.L10nUtil
 
 @Parcelize
-class TopReadListCard(private val articles: TopRead, val site: WikiSite) :
-    ListCard<TopReadItemCard>(toItems(articles.articles, site), site), Parcelable {
+class TopReadListCard(
+    private val articles: TopRead,
+    val site: WikiSite
+) : ListCard<TopReadItemCard>(toItems(articles.articles, site), site), Parcelable {
 
     override fun title(): String {
         return L10nUtil.getString(wikiSite().languageCode, R.string.view_top_read_card_title)
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardFooterView.kt b/app/src/main/java/org/wikipedia/feed/view/CardFooterView.kt
@@ -15,7 +15,7 @@ import org.wikipedia.databinding.ViewCardFooterBinding
 import org.wikipedia.util.L10nUtil
 import org.wikipedia.util.ResourceUtil
 
-class CardFooterView constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) {
+class CardFooterView(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) {
     fun interface Callback {
         fun onFooterClicked()
     }
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.kt b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.kt
@@ -20,10 +20,7 @@ import org.wikipedia.util.TransitionUtil
 import org.wikipedia.views.imageservice.ImageLoadListener
 import org.wikipedia.views.imageservice.ImageService
 
-class CardLargeHeaderView : ConstraintLayout {
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+class CardLargeHeaderView(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) {
 
     val binding = ViewCardHeaderLargeBinding.inflate(LayoutInflater.from(context), this)
 
diff --git a/app/src/main/java/org/wikipedia/feed/view/GradientCircleNumberView.kt b/app/src/main/java/org/wikipedia/feed/view/GradientCircleNumberView.kt
@@ -12,7 +12,7 @@ import org.wikipedia.R
 import org.wikipedia.databinding.ViewGradientCircleNumberBinding
 import org.wikipedia.util.ResourceUtil
 
-class GradientCircleNumberView constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
+class GradientCircleNumberView(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
     private val binding = ViewGradientCircleNumberBinding.inflate(LayoutInflater.from(context), this)
 
     private val gradientColor1 = ResourceUtil.getThemedColor(context, R.attr.progressive_color)
diff --git a/app/src/main/java/org/wikipedia/feed/wikigames/WikiGamesCardClient.kt b/app/src/main/java/org/wikipedia/feed/wikigames/WikiGamesCardClient.kt
@@ -11,7 +11,7 @@ class WikiGamesCardClient() : FeedClient {
 
     override fun request(context: Context, wiki: WikiSite, age: Int, cb: FeedClient.Callback) {
         cancel()
-        val availableLanguages = (if (FeedContentType.WIKI_GAMES.langCodesSupported.isNotEmpty()) FeedContentType.WIKI_GAMES.langCodesSupported else OnThisDayGameViewModel.LANG_CODES_SUPPORTED)
+        val availableLanguages = FeedContentType.WIKI_GAMES.langCodesSupported.ifEmpty { OnThisDayGameViewModel.LANG_CODES_SUPPORTED }
             .filter { !FeedContentType.WIKI_GAMES.langCodesDisabled.contains(it) }
             .filter { langCode ->
                 WikipediaApp.instance.languageState.appLanguageCodes.contains(langCode)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package org.wikipedia.feed.becauseyouread`
`2`	`2`
`3`	`3`	`import android.net.Uri`
	`4`	`+import androidx.core.net.toUri`
`4`	`5`	`import org.wikipedia.feed.model.Card`
`5`	`6`	`import org.wikipedia.feed.model.CardType`
`6`	`7`	`import org.wikipedia.page.PageTitle`
`@@ -20,7 +21,7 @@ class BecauseYouReadItemCard(private val title: PageTitle) : Card() {`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`override fun image(): Uri? {`
`23`		`- return if (title.thumbUrl.isNullOrEmpty()) null else Uri.parse(title.thumbUrl)`
	`24`	`+ return title.thumbUrl?.toUri()`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`override fun type(): CardType {`