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
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.greenrobot.eventbus.ThreadMode;
import org.wordpress.android.R;
import org.wordpress.android.WordPress;
import org.wordpress.android.analytics.AnalyticsTracker.Stat;
import org.wordpress.android.fluxc.Dispatcher;
import org.wordpress.android.fluxc.generated.SiteActionBuilder;
import org.wordpress.android.fluxc.model.PostImmutableModel;
Expand Down Expand Up @@ -244,6 +245,8 @@ public final void configureView() {
mPreviewModeSelectorPopup = new PreviewModeSelectorPopup(this, mPreviewModeButton);

setupToolbar();

mViewModel.track(Stat.WEBVIEW_DISPLAYED);
}

private void setupToolbar() {
Expand Down Expand Up @@ -888,8 +891,10 @@ public boolean onOptionsItemSelected(final MenuItem item) {
int itemID = item.getItemId();

if (itemID == android.R.id.home) {
mViewModel.track(Stat.WEBVIEW_DISMISSED);
setResultIfNeeded();
} else if (itemID == R.id.menu_refresh) {
mViewModel.track(Stat.WEBVIEW_RELOAD_TAPPED);
mWebView.reload();
return true;
}
Expand Down Expand Up @@ -918,6 +923,7 @@ public void onBackPressed() {
refreshBackForwardNavButtons();
} else {
super.onBackPressed();
mViewModel.track(Stat.WEBVIEW_DISMISSED);
setResultIfNeeded();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,20 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModel
import org.wordpress.android.R
import org.wordpress.android.ui.WPWebViewUsageCategory
import org.wordpress.android.ui.utils.UiString.UiStringRes
import org.wordpress.android.util.NetworkUtilsWrapper
import org.wordpress.android.viewmodel.SingleLiveEvent
import org.wordpress.android.viewmodel.helpers.ConnectionStatus
import org.wordpress.android.viewmodel.helpers.ConnectionStatus.AVAILABLE
import org.wordpress.android.analytics.AnalyticsTracker.Stat
import org.wordpress.android.ui.PreviewMode
import org.wordpress.android.ui.PreviewMode.DESKTOP
import org.wordpress.android.ui.PreviewMode.MOBILE
import org.wordpress.android.ui.PreviewMode.TABLET
import org.wordpress.android.ui.PreviewModeHandler
import org.wordpress.android.ui.WPWebViewUsageCategory
import org.wordpress.android.ui.utils.UiString.UiStringRes
import org.wordpress.android.util.DisplayUtilsWrapper
import org.wordpress.android.util.NetworkUtilsWrapper
import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
import org.wordpress.android.viewmodel.SingleLiveEvent
import org.wordpress.android.viewmodel.helpers.ConnectionStatus
import org.wordpress.android.viewmodel.helpers.ConnectionStatus.AVAILABLE
import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState.WebPreviewContentUiState
import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState.WebPreviewFullscreenProgressUiState
import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState.WebPreviewFullscreenUiState.WebPreviewFullscreenErrorUiState
Expand All @@ -30,6 +32,7 @@ class WPWebViewViewModel
@Inject constructor(
private val displayUtils: DisplayUtilsWrapper,
private val networkUtils: NetworkUtilsWrapper,
private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
connectionStatus: LiveData<ConnectionStatus>
) : ViewModel(), PreviewModeHandler {
private var isStarted = false
Expand Down Expand Up @@ -157,10 +160,12 @@ class WPWebViewViewModel
fun getMenuUiState() = wpWebViewUsageCategory.menuUiState

fun navigateBack() {
analyticsTrackerWrapper.track(Stat.WEBVIEW_NAVIGATED_BACK)
_navigateBack.call()
}

fun navigateForward() {
analyticsTrackerWrapper.track(Stat.WEBVIEW_NAVIGATED_FORWARD)
_navigateForward.call()
}

Expand All @@ -173,10 +178,12 @@ class WPWebViewViewModel
}

fun share() {
analyticsTrackerWrapper.track(Stat.WEBVIEW_SHARE_TAPPED)
_share.call()
}

fun openPageInExternalBrowser() {
analyticsTrackerWrapper.track(Stat.WEBVIEW_OPEN_IN_BROWSER_TAPPED)
_openInExternalBrowser.call()
}

Expand All @@ -185,6 +192,10 @@ class WPWebViewViewModel
}

fun selectPreviewMode(selectedPreviewMode: PreviewMode) {
analyticsTrackerWrapper.track(
Stat.WEBVIEW_PREVIEW_DEVICE_CHANGED,
mapOf(TRACK_SELECTED_OPTION_NAME to selectedPreviewMode.name.lowercase())
)
if (previewMode.value != selectedPreviewMode) {
_previewMode.value = selectedPreviewMode
_navbarUiState.value =
Expand All @@ -196,6 +207,10 @@ class WPWebViewViewModel
}
}

fun track(stat: Stat) {
analyticsTrackerWrapper.track(stat)
}

private fun getPreviewHintResId(previewMode: PreviewMode) = when (previewMode) {
MOBILE -> R.string.web_preview_mobile
TABLET -> R.string.web_preview_tablet
Expand Down Expand Up @@ -255,4 +270,8 @@ class WPWebViewViewModel
togglePreviewModeSelectorVisibility(false)
selectPreviewMode(mode)
}

companion object {
const val TRACK_SELECTED_OPTION_NAME = "selected_option_name"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import org.wordpress.android.ui.PreviewMode.MOBILE
import org.wordpress.android.ui.PreviewMode.TABLET
import org.wordpress.android.util.DisplayUtilsWrapper
import org.wordpress.android.util.NetworkUtilsWrapper
import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
import org.wordpress.android.viewmodel.helpers.ConnectionStatus
import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel
import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewModeSelectorStatus
Expand All @@ -37,12 +38,13 @@ class WPWebViewViewModelTest {
@Mock private lateinit var networkUtils: NetworkUtilsWrapper
@Mock private lateinit var uiStateObserver: Observer<WebPreviewUiState>
@Mock lateinit var displayUtilsWrapper: DisplayUtilsWrapper
@Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper

private lateinit var viewModel: WPWebViewViewModel

@Before
fun setUp() {
viewModel = WPWebViewViewModel(displayUtilsWrapper, networkUtils, connectionStatus)
viewModel = WPWebViewViewModel(displayUtilsWrapper, networkUtils, analyticsTrackerWrapper, connectionStatus)
viewModel.uiState.observeForever(uiStateObserver)
whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,15 @@ public enum Stat {
READER_ARTICLE_PAGE_JUMP_TAPPED,
READER_ARTICLE_FEATURED_IMAGE_TAPPED,
READER_ARTICLE_CUSTOM_VIEW_SHOWN,
READER_ARTICLE_CUSTOM_VIEW_HIDDEN
READER_ARTICLE_CUSTOM_VIEW_HIDDEN,
WEBVIEW_DISMISSED,
WEBVIEW_DISPLAYED,
WEBVIEW_NAVIGATED_BACK,
WEBVIEW_NAVIGATED_FORWARD,
WEBVIEW_OPEN_IN_BROWSER_TAPPED,
WEBVIEW_RELOAD_TAPPED,
WEBVIEW_SHARE_TAPPED,
WEBVIEW_PREVIEW_DEVICE_CHANGED
}

private static final List<Tracker> TRACKERS = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2297,6 +2297,22 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
return "reader_article_custom_view_shown";
case READER_ARTICLE_CUSTOM_VIEW_HIDDEN:
return "reader_article_custom_view_hidden";
case WEBVIEW_DISMISSED:
return "webview_dismissed";
case WEBVIEW_DISPLAYED:
return "webview_displayed";
case WEBVIEW_NAVIGATED_BACK:
return "webview_navigated_back";
case WEBVIEW_NAVIGATED_FORWARD:
return "webview_navigated_forward";
case WEBVIEW_OPEN_IN_BROWSER_TAPPED:
return "webview_open_in_browser_tapped";
case WEBVIEW_RELOAD_TAPPED:
return "webview_reload_tapped";
case WEBVIEW_SHARE_TAPPED:
return "webview_share_tapped";
case WEBVIEW_PREVIEW_DEVICE_CHANGED:
return "webview_preview_device_changed";
}
return null;
}
Expand Down