diff --git a/app/src/main/java/org/wikipedia/activitytab/ActivityTabABTest.kt b/app/src/main/java/org/wikipedia/activitytab/ActivityTabABTest.kt deleted file mode 100644 index 2649e1d74ce..00000000000 --- a/app/src/main/java/org/wikipedia/activitytab/ActivityTabABTest.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.wikipedia.activitytab - -import org.wikipedia.analytics.ABTest - -class ActivityTabABTest : ABTest("activityTab", GROUP_SIZE_2) { - fun isInTestGroup(): Boolean { - return group == GROUP_2 - } -} diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.kt b/app/src/main/java/org/wikipedia/main/MainFragment.kt index 17bd4afccd7..18d9ea65d31 100644 --- a/app/src/main/java/org/wikipedia/main/MainFragment.kt +++ b/app/src/main/java/org/wikipedia/main/MainFragment.kt @@ -38,7 +38,6 @@ import org.wikipedia.R import org.wikipedia.WikipediaApp import org.wikipedia.activity.BaseActivity import org.wikipedia.activity.FragmentUtil.getCallback -import org.wikipedia.activitytab.ActivityTabABTest import org.wikipedia.activitytab.ActivityTabFragment import org.wikipedia.activitytab.ActivityTabOnboardingActivity import org.wikipedia.analytics.eventplatform.ReadingListsAnalyticsHelper @@ -172,7 +171,7 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment. binding.mainNavTabLayout.setOnItemSelectedListener { item -> navTabBackStack.clear() if (item.order == NavTab.EDITS.code()) { - if (ActivityTabABTest().isInTestGroup() && !Prefs.isActivityTabOnboardingShown) { + if (!Prefs.isActivityTabOnboardingShown) { activityTabOnboardingLauncher.launch(ActivityTabOnboardingActivity.newIntent(requireContext())) return@setOnItemSelectedListener false } @@ -194,7 +193,7 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment. true } - binding.mainNavTabLayout.setOverlayDot(NavTab.EDITS, ActivityTabABTest().isInTestGroup() && !Prefs.activityTabRedDotShown) + binding.mainNavTabLayout.setOverlayDot(NavTab.EDITS, !Prefs.activityTabRedDotShown) notificationButtonView = NotificationButtonView(requireActivity()) diff --git a/app/src/main/java/org/wikipedia/navtab/MenuNavTabDialog.kt b/app/src/main/java/org/wikipedia/navtab/MenuNavTabDialog.kt index b2c8534cbb3..889cf8037f8 100644 --- a/app/src/main/java/org/wikipedia/navtab/MenuNavTabDialog.kt +++ b/app/src/main/java/org/wikipedia/navtab/MenuNavTabDialog.kt @@ -9,7 +9,6 @@ import androidx.core.widget.ImageViewCompat import com.google.android.material.bottomsheet.BottomSheetBehavior import org.wikipedia.R import org.wikipedia.activity.FragmentUtil -import org.wikipedia.activitytab.ActivityTabABTest import org.wikipedia.analytics.eventplatform.ActivityTabEvent import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent import org.wikipedia.analytics.eventplatform.DonorExperienceEvent @@ -140,6 +139,7 @@ class MenuNavTabDialog : ExtendedBottomSheetDialogFragment() { binding.mainDrawerTempAccountContainer.isVisible = AccountUtil.isTemporaryAccount binding.mainDrawerWatchlistContainer.isVisible = !AccountUtil.isTemporaryAccount binding.mainDrawerContribsContainer.visibility = View.VISIBLE + binding.mainDrawerEditContainer.visibility = View.VISIBLE } else { binding.mainDrawerAccountAvatar.setImageResource(R.drawable.ic_login_24px) ImageViewCompat.setImageTintList(binding.mainDrawerAccountAvatar, getThemedColorStateList(requireContext(), R.attr.progressive_color)) @@ -151,8 +151,8 @@ class MenuNavTabDialog : ExtendedBottomSheetDialogFragment() { binding.mainDrawerTalkContainer.visibility = View.GONE binding.mainDrawerWatchlistContainer.visibility = View.GONE binding.mainDrawerContribsContainer.visibility = View.GONE + binding.mainDrawerEditContainer.visibility = View.GONE } - binding.mainDrawerEditContainer.isVisible = ActivityTabABTest().isInTestGroup() } private fun callback(): Callback? { diff --git a/app/src/main/java/org/wikipedia/navtab/NavTab.kt b/app/src/main/java/org/wikipedia/navtab/NavTab.kt index 6f008bf4bd3..c45b1e0fce8 100644 --- a/app/src/main/java/org/wikipedia/navtab/NavTab.kt +++ b/app/src/main/java/org/wikipedia/navtab/NavTab.kt @@ -4,19 +4,13 @@ import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.fragment.app.Fragment import org.wikipedia.R -import org.wikipedia.activitytab.ActivityTabABTest import org.wikipedia.activitytab.ActivityTabFragment import org.wikipedia.feed.FeedFragment import org.wikipedia.history.HistoryFragment import org.wikipedia.model.EnumCode import org.wikipedia.readinglist.ReadingListsFragment -import org.wikipedia.suggestededits.SuggestedEditsTasksFragment -enum class NavTab constructor( - @StringRes val text: Int, - val id: Int, - @DrawableRes val icon: Int, - ) : EnumCode { +enum class NavTab(@StringRes val text: Int, val id: Int, @DrawableRes val icon: Int) : EnumCode { EXPLORE(R.string.feed, R.id.nav_tab_explore, R.drawable.selector_nav_explore) { override fun newInstance(): Fragment { @@ -33,13 +27,9 @@ enum class NavTab constructor( return HistoryFragment.newInstance() } }, - EDITS( - if (ActivityTabABTest().isInTestGroup()) R.string.nav_item_activity else R.string.nav_item_suggested_edits, - R.id.nav_tab_edits, - if (ActivityTabABTest().isInTestGroup()) R.drawable.selector_nav_activity else R.drawable.selector_nav_edits - ) { + EDITS(R.string.nav_item_activity, R.id.nav_tab_edits, R.drawable.selector_nav_activity) { override fun newInstance(): Fragment { - return if (ActivityTabABTest().isInTestGroup()) ActivityTabFragment.newInstance() else SuggestedEditsTasksFragment.newInstance() + return ActivityTabFragment.newInstance() } }, MORE(R.string.nav_item_more, R.id.nav_tab_more, R.drawable.ic_menu_white_24dp) { diff --git a/app/src/main/java/org/wikipedia/settings/LogoutPreference.kt b/app/src/main/java/org/wikipedia/settings/LogoutPreference.kt index 72ad9c1dbf1..34590e62036 100644 --- a/app/src/main/java/org/wikipedia/settings/LogoutPreference.kt +++ b/app/src/main/java/org/wikipedia/settings/LogoutPreference.kt @@ -14,8 +14,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.wikipedia.R import org.wikipedia.WikipediaApp import org.wikipedia.activity.SingleWebViewActivity -import org.wikipedia.activitytab.ActivityTabABTest -import org.wikipedia.analytics.eventplatform.ActivityTabEvent import org.wikipedia.analytics.eventplatform.CreateAccountEvent import org.wikipedia.auth.AccountUtil import org.wikipedia.login.LoginActivity @@ -50,9 +48,6 @@ class LogoutPreference : Preference { holder.itemView.findViewById