Skip to content

Commit 9e095ae

Browse files
coolteydbrant
andauthored
Remove 2024 Year-in-Review onboarding card (#6152)
Co-authored-by: Dmitry Brant <[email protected]>
1 parent 87a5158 commit 9e095ae

File tree

8 files changed

+1
-69
lines changed

8 files changed

+1
-69
lines changed

app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCardView.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ import androidx.core.content.ContextCompat
1010
import androidx.core.text.method.LinkMovementMethodCompat
1111
import androidx.core.view.updateLayoutParams
1212
import org.wikipedia.R
13-
import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
1413
import org.wikipedia.databinding.ViewCardAnnouncementBinding
1514
import org.wikipedia.feed.model.Card
16-
import org.wikipedia.feed.onboarding.YIROnboardingCard
1715
import org.wikipedia.feed.view.DefaultFeedCardView
1816
import org.wikipedia.util.DimenUtil
1917
import org.wikipedia.util.StringUtil
@@ -107,10 +105,6 @@ class AnnouncementCardView(context: Context) : DefaultFeedCardView<AnnouncementC
107105
binding.viewAnnouncementContainer.radius = 0f
108106
}
109107
}
110-
111-
if (value is YIROnboardingCard) {
112-
BreadCrumbLogEvent.logImpression(context, "YIR2024")
113-
}
114108
}
115109

116110
private fun onPositiveActionClick() {

app/src/main/java/org/wikipedia/feed/model/CardType.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@ enum class CardType constructor(private val code: Int,
115115
return WikiGamesCardView(ctx)
116116
}
117117
},
118-
YEAR_IN_REVIEW_ANNOUNCEMENT(96) {
119-
override fun newView(ctx: Context): FeedCardView<*> {
120-
return AnnouncementCardView(ctx)
121-
}
122-
},
123118
DAY_HEADER(97) {
124119
override fun newView(ctx: Context): FeedCardView<*> {
125120
return DayHeaderCardView(ctx)

app/src/main/java/org/wikipedia/feed/onboarding/OnboardingClient.kt

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class OnboardingClient : FeedClient {
1717

1818
private fun getCards(context: Context): List<Card> {
1919
val cards = ArrayList<Card>()
20-
var card: OnboardingCard
2120

2221
// NOTE: When adding new onboarding cards, please add them to the *beginning* of the list.
2322

@@ -30,7 +29,7 @@ class OnboardingClient : FeedClient {
3029
// if (card.shouldShow()) {
3130
// cards.add(card);
3231
// }
33-
card = CustomizeOnboardingCard(
32+
val card = CustomizeOnboardingCard(
3433
Announcement(id = "customizeOnboardingCard1",
3534
text = context.getString(R.string.feed_configure_onboarding_text),
3635
imageUrl = "https://upload.wikimedia.org/wikipedia/commons/3/3b/Announcement_header_for_Explore_Feed_customization.png",
@@ -42,19 +41,6 @@ class OnboardingClient : FeedClient {
4241
cards.add(card)
4342
}
4443

45-
card = YIROnboardingCard(
46-
Announcement(id = "yir2024Card",
47-
text = context.getString(R.string.year_in_review_text),
48-
imageUrl = "https://upload.wikimedia.org/wikipedia/commons/2/21/WYiR_Block_1.gif",
49-
action = Announcement.Action(context.getString(R.string.year_in_review_action_positive), "https://wikimediafoundation.org/wikipedia-year-in-review-2024/"),
50-
negativeText = context.getString(R.string.view_announcement_card_negative_action),
51-
imageAspectRatio = 4.0 / 3.0
52-
)
53-
)
54-
if (card.shouldShow()) {
55-
cards.add(card)
56-
}
57-
5844
return cards
5945
}
6046

app/src/main/java/org/wikipedia/feed/onboarding/YIROnboardingCard.kt

Lines changed: 0 additions & 28 deletions
This file was deleted.

app/src/main/java/org/wikipedia/settings/dev/DeveloperSettingsPreferenceLoader.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,6 @@ internal class DeveloperSettingsPreferenceLoader(fragment: PreferenceFragmentCom
200200
setupLeakCanary()
201201
true
202202
}
203-
findPreference(R.string.preference_key_feed_yir_onboarding_card_enabled).onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _: Preference, isEnabled: Any? ->
204-
if (isEnabled is Boolean && isEnabled) {
205-
Prefs.hiddenCards = emptySet()
206-
Toast.makeText(activity, "Please relaunch the app.", Toast.LENGTH_SHORT).show()
207-
}
208-
true
209-
}
210203
findPreference(R.string.preference_key_otd_game_state).onPreferenceClickListener = Preference.OnPreferenceClickListener {
211204
Prefs.otdGameState = ""
212205
Toast.makeText(activity, "Game reset.", Toast.LENGTH_SHORT).show()

app/src/main/res/values/preference_keys.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<string name="preference_key_feed_cards_lang_supported">feedCardsLangSupported</string>
7272
<string name="preference_key_feed_cards_lang_disabled">feedCardsLangDisabled</string>
7373
<string name="preference_key_feed_customize_onboarding_card_enabled">feedCustomizeOnboardingCardEnabled</string>
74-
<string name="preference_key_feed_yir_onboarding_card_enabled">feedYirOnboardingCardEnabled</string>
7574
<string name="preference_key_add_articles">addArticles</string>
7675
<string name="preference_key_add_reading_lists">addReadingLists</string>
7776
<string name="preference_key_delete_reading_lists">deleteReadingLists</string>

app/src/main/res/values/strings_no_translate.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,4 @@
105105
<string name="diff_link_wikitext">{{{diffLink}}}</string>
106106
<string name="wikiText_replace_url">[[%1$s|%2$s]]</string>
107107

108-
<string name="year_in_review_action_positive">Take me there</string>
109-
<string name="year_in_review_text"><![CDATA[<strong>Wikipedia 2024 Year in Review</strong><br/><br/>Wikipedia is the largest knowledge resource ever assembled in the history of the world, and it’s freely available to everyone everywhere. Here’s a review of 2024 through the lens of Wikipedia.]]></string>
110-
111108
</resources>

app/src/main/res/xml/developer_preferences.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,6 @@
441441
android:title="Donation results"
442442
android:dialogMessage="Example: [{&quot;dateTime&quot;:&quot;2024-10-22T00:00:00.000&quot;}]"/>
443443

444-
<org.wikipedia.settings.SwitchPreferenceMultiLine
445-
android:key="@string/preference_key_feed_yir_onboarding_card_enabled"
446-
android:title="Year-in-review Feed Card" />
447-
448444
<org.wikipedia.settings.SwitchPreferenceMultiLine
449445
android:key="@string/preference_key_explore_feed_survey_shown"
450446
android:title="@string/preference_key_explore_feed_survey_shown"/>

0 commit comments

Comments
 (0)