Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

5 changes: 2 additions & 3 deletions app/src/main/java/org/wikipedia/main/MainFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand All @@ -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())

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/wikipedia/navtab/MenuNavTabDialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand All @@ -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? {
Expand Down
16 changes: 3 additions & 13 deletions app/src/main/java/org/wikipedia/navtab/NavTab.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -50,9 +48,6 @@ class LogoutPreference : Preference {
holder.itemView.findViewById<Button>(R.id.logoutButton).apply {
text = context.getString(if (AccountUtil.isTemporaryAccount) R.string.temp_account_end_session else R.string.preference_title_logout)
setOnClickListener {
if (ActivityTabABTest().isInTestGroup()) {
ActivityTabEvent.submit(activeInterface = "global_setting", action = "tab_logout_account")
}
activity?.let {
MaterialAlertDialogBuilder(it)
.setMessage(if (AccountUtil.isTemporaryAccount) R.string.temp_account_end_session_confirm else R.string.logout_prompt)
Expand All @@ -69,9 +64,6 @@ class LogoutPreference : Preference {
}
}
holder.itemView.findViewById<View>(R.id.accountVanishButton).setOnClickListener {
if (ActivityTabABTest().isInTestGroup()) {
ActivityTabEvent.submit(activeInterface = "global_setting", action = "tab_vanish_account")
}
activity?.let {
MaterialAlertDialogBuilder(it, R.style.AlertDialogTheme_Icon_Delete)
.setIcon(R.drawable.ic_person_remove)
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/org/wikipedia/settings/Prefs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -497,10 +497,6 @@ object Prefs {
get() = PrefsIoUtil.getInt(R.string.preference_key_selected_language_position_in_search, 0)
set(position) = PrefsIoUtil.setInt(R.string.preference_key_selected_language_position_in_search, position)

var showOneTimeSequentialUserStatsTooltip
get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_sequential_user_stats_tooltip, true)
set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_sequential_user_stats_tooltip, value)

var showSearchTabTooltip
get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_search_tab_tooltip, true)
set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_show_search_tab_tooltip, value)
Expand Down
Loading
Loading