Skip to content

Commit b6470ee

Browse files
dbrantWilliamraicooltey
authored
Rip out Activity Tab A/B test, and remove old Suggested Edits UI. (#6027)
Co-authored-by: William Rai <[email protected]> Co-authored-by: Cooltey Feng <[email protected]>
1 parent 914d648 commit b6470ee

14 files changed

+19
-366
lines changed

app/src/main/java/org/wikipedia/activitytab/ActivityTabABTest.kt

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

app/src/main/java/org/wikipedia/main/MainFragment.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import org.wikipedia.R
3838
import org.wikipedia.WikipediaApp
3939
import org.wikipedia.activity.BaseActivity
4040
import org.wikipedia.activity.FragmentUtil.getCallback
41-
import org.wikipedia.activitytab.ActivityTabABTest
4241
import org.wikipedia.activitytab.ActivityTabFragment
4342
import org.wikipedia.activitytab.ActivityTabOnboardingActivity
4443
import org.wikipedia.analytics.eventplatform.ReadingListsAnalyticsHelper
@@ -172,7 +171,7 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
172171
binding.mainNavTabLayout.setOnItemSelectedListener { item ->
173172
navTabBackStack.clear()
174173
if (item.order == NavTab.EDITS.code()) {
175-
if (ActivityTabABTest().isInTestGroup() && !Prefs.isActivityTabOnboardingShown) {
174+
if (!Prefs.isActivityTabOnboardingShown) {
176175
activityTabOnboardingLauncher.launch(ActivityTabOnboardingActivity.newIntent(requireContext()))
177176
return@setOnItemSelectedListener false
178177
}
@@ -194,7 +193,7 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
194193
true
195194
}
196195

197-
binding.mainNavTabLayout.setOverlayDot(NavTab.EDITS, ActivityTabABTest().isInTestGroup() && !Prefs.activityTabRedDotShown)
196+
binding.mainNavTabLayout.setOverlayDot(NavTab.EDITS, !Prefs.activityTabRedDotShown)
198197

199198
notificationButtonView = NotificationButtonView(requireActivity())
200199

app/src/main/java/org/wikipedia/navtab/MenuNavTabDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import androidx.core.widget.ImageViewCompat
99
import com.google.android.material.bottomsheet.BottomSheetBehavior
1010
import org.wikipedia.R
1111
import org.wikipedia.activity.FragmentUtil
12-
import org.wikipedia.activitytab.ActivityTabABTest
1312
import org.wikipedia.analytics.eventplatform.ActivityTabEvent
1413
import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
1514
import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
@@ -140,6 +139,7 @@ class MenuNavTabDialog : ExtendedBottomSheetDialogFragment() {
140139
binding.mainDrawerTempAccountContainer.isVisible = AccountUtil.isTemporaryAccount
141140
binding.mainDrawerWatchlistContainer.isVisible = !AccountUtil.isTemporaryAccount
142141
binding.mainDrawerContribsContainer.visibility = View.VISIBLE
142+
binding.mainDrawerEditContainer.visibility = View.VISIBLE
143143
} else {
144144
binding.mainDrawerAccountAvatar.setImageResource(R.drawable.ic_login_24px)
145145
ImageViewCompat.setImageTintList(binding.mainDrawerAccountAvatar, getThemedColorStateList(requireContext(), R.attr.progressive_color))
@@ -151,8 +151,8 @@ class MenuNavTabDialog : ExtendedBottomSheetDialogFragment() {
151151
binding.mainDrawerTalkContainer.visibility = View.GONE
152152
binding.mainDrawerWatchlistContainer.visibility = View.GONE
153153
binding.mainDrawerContribsContainer.visibility = View.GONE
154+
binding.mainDrawerEditContainer.visibility = View.GONE
154155
}
155-
binding.mainDrawerEditContainer.isVisible = ActivityTabABTest().isInTestGroup()
156156
}
157157

158158
private fun callback(): Callback? {

app/src/main/java/org/wikipedia/navtab/NavTab.kt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@ import androidx.annotation.DrawableRes
44
import androidx.annotation.StringRes
55
import androidx.fragment.app.Fragment
66
import org.wikipedia.R
7-
import org.wikipedia.activitytab.ActivityTabABTest
87
import org.wikipedia.activitytab.ActivityTabFragment
98
import org.wikipedia.feed.FeedFragment
109
import org.wikipedia.history.HistoryFragment
1110
import org.wikipedia.model.EnumCode
1211
import org.wikipedia.readinglist.ReadingListsFragment
13-
import org.wikipedia.suggestededits.SuggestedEditsTasksFragment
1412

15-
enum class NavTab constructor(
16-
@StringRes val text: Int,
17-
val id: Int,
18-
@DrawableRes val icon: Int,
19-
) : EnumCode {
13+
enum class NavTab(@StringRes val text: Int, val id: Int, @DrawableRes val icon: Int) : EnumCode {
2014

2115
EXPLORE(R.string.feed, R.id.nav_tab_explore, R.drawable.selector_nav_explore) {
2216
override fun newInstance(): Fragment {
@@ -33,13 +27,9 @@ enum class NavTab constructor(
3327
return HistoryFragment.newInstance()
3428
}
3529
},
36-
EDITS(
37-
if (ActivityTabABTest().isInTestGroup()) R.string.nav_item_activity else R.string.nav_item_suggested_edits,
38-
R.id.nav_tab_edits,
39-
if (ActivityTabABTest().isInTestGroup()) R.drawable.selector_nav_activity else R.drawable.selector_nav_edits
40-
) {
30+
EDITS(R.string.nav_item_activity, R.id.nav_tab_edits, R.drawable.selector_nav_activity) {
4131
override fun newInstance(): Fragment {
42-
return if (ActivityTabABTest().isInTestGroup()) ActivityTabFragment.newInstance() else SuggestedEditsTasksFragment.newInstance()
32+
return ActivityTabFragment.newInstance()
4333
}
4434
},
4535
MORE(R.string.nav_item_more, R.id.nav_tab_more, R.drawable.ic_menu_white_24dp) {

app/src/main/java/org/wikipedia/settings/LogoutPreference.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
1414
import org.wikipedia.R
1515
import org.wikipedia.WikipediaApp
1616
import org.wikipedia.activity.SingleWebViewActivity
17-
import org.wikipedia.activitytab.ActivityTabABTest
18-
import org.wikipedia.analytics.eventplatform.ActivityTabEvent
1917
import org.wikipedia.analytics.eventplatform.CreateAccountEvent
2018
import org.wikipedia.auth.AccountUtil
2119
import org.wikipedia.login.LoginActivity
@@ -50,9 +48,6 @@ class LogoutPreference : Preference {
5048
holder.itemView.findViewById<Button>(R.id.logoutButton).apply {
5149
text = context.getString(if (AccountUtil.isTemporaryAccount) R.string.temp_account_end_session else R.string.preference_title_logout)
5250
setOnClickListener {
53-
if (ActivityTabABTest().isInTestGroup()) {
54-
ActivityTabEvent.submit(activeInterface = "global_setting", action = "tab_logout_account")
55-
}
5651
activity?.let {
5752
MaterialAlertDialogBuilder(it)
5853
.setMessage(if (AccountUtil.isTemporaryAccount) R.string.temp_account_end_session_confirm else R.string.logout_prompt)
@@ -69,9 +64,6 @@ class LogoutPreference : Preference {
6964
}
7065
}
7166
holder.itemView.findViewById<View>(R.id.accountVanishButton).setOnClickListener {
72-
if (ActivityTabABTest().isInTestGroup()) {
73-
ActivityTabEvent.submit(activeInterface = "global_setting", action = "tab_vanish_account")
74-
}
7567
activity?.let {
7668
MaterialAlertDialogBuilder(it, R.style.AlertDialogTheme_Icon_Delete)
7769
.setIcon(R.drawable.ic_person_remove)

app/src/main/java/org/wikipedia/settings/Prefs.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,6 @@ object Prefs {
497497
get() = PrefsIoUtil.getInt(R.string.preference_key_selected_language_position_in_search, 0)
498498
set(position) = PrefsIoUtil.setInt(R.string.preference_key_selected_language_position_in_search, position)
499499

500-
var showOneTimeSequentialUserStatsTooltip
501-
get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_sequential_user_stats_tooltip, true)
502-
set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_sequential_user_stats_tooltip, value)
503-
504500
var showSearchTabTooltip
505501
get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_search_tab_tooltip, true)
506502
set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_search_tab_tooltip, value)

0 commit comments

Comments
 (0)