Skip to content

Commit 88960d9

Browse files
committed
Move StatsLaunchedFrom to a more appropriate place
1 parent 0668134 commit 88960d9

File tree

21 files changed

+43
-41
lines changed

21 files changed

+43
-41
lines changed

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@
116116
import org.wordpress.android.ui.stats.StatsTimeframe;
117117
import org.wordpress.android.ui.stats.StatsViewType;
118118
import org.wordpress.android.ui.stats.refresh.StatsActivity;
119-
import org.wordpress.android.ui.stats.refresh.StatsActivity.StatsLaunchedFrom;
120119
import org.wordpress.android.ui.stats.refresh.StatsViewAllActivity;
121120
import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection;
122121
import org.wordpress.android.ui.stats.refresh.lists.detail.StatsDetailActivity;
123122
import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDateProvider.SelectedDate;
124123
import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementActivity;
124+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom;
125125
import org.wordpress.android.ui.stockmedia.StockMediaPickerActivity;
126126
import org.wordpress.android.ui.stories.StoryComposerActivity;
127127
import org.wordpress.android.ui.suggestion.SuggestionActivity;

WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.wordpress.android.fluxc.store.SiteStore;
2121
import org.wordpress.android.login.LoginMode;
2222
import org.wordpress.android.ui.accounts.LoginActivity;
23-
import org.wordpress.android.ui.stats.refresh.StatsActivity.StatsLaunchedFrom;
23+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom;
2424
import org.wordpress.android.util.AppLog;
2525
import org.wordpress.android.util.SiteUtils;
2626
import org.wordpress.android.util.ToastUtils;

WordPress/src/main/java/org/wordpress/android/ui/ShortcutsNavigator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.wordpress.android.analytics.AnalyticsTracker;
66
import org.wordpress.android.fluxc.model.SiteModel;
77
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalPhaseHelper;
8-
import org.wordpress.android.ui.stats.refresh.StatsActivity.StatsLaunchedFrom;
8+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom;
99
import org.wordpress.android.util.AppLog;
1010

1111
import javax.inject.Inject;

WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkNavigator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ViewP
2929
import org.wordpress.android.ui.sitecreation.misc.SiteCreationSource.DEEP_LINK
3030
import org.wordpress.android.ui.sitemonitor.SiteMonitorType
3131
import org.wordpress.android.ui.stats.StatsTimeframe
32-
import org.wordpress.android.ui.stats.refresh.StatsActivity
32+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom
3333
import org.wordpress.android.util.UriWrapper
3434
import javax.inject.Inject
3535

@@ -66,14 +66,14 @@ class DeepLinkNavigator
6666
is OpenStatsForSite -> ActivityLauncher.viewStatsInNewStack(
6767
activity,
6868
navigateAction.site,
69-
StatsActivity.StatsLaunchedFrom.LINK
69+
StatsLaunchedFrom.LINK
7070
)
7171

7272
is OpenStatsForSiteAndTimeframe -> ActivityLauncher.viewStatsInNewStack(
7373
activity,
7474
navigateAction.site,
7575
navigateAction.statsTimeframe,
76-
StatsActivity.StatsLaunchedFrom.LINK
76+
StatsLaunchedFrom.LINK
7777
)
7878

7979
OpenReader -> ActivityLauncher.viewReaderInNewStack(activity)

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
import org.wordpress.android.ui.review.ReviewViewModel;
135135
import org.wordpress.android.ui.sitecreation.misc.SiteCreationSource;
136136
import org.wordpress.android.ui.stats.StatsTimeframe;
137-
import org.wordpress.android.ui.stats.refresh.StatsActivity.StatsLaunchedFrom;
137+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom;
138138
import org.wordpress.android.ui.stories.intro.StoriesIntroDialogFragment;
139139
import org.wordpress.android.ui.uploads.UploadActionUseCase;
140140
import org.wordpress.android.ui.uploads.UploadUtils;

WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import org.wordpress.android.ui.quickstart.QuickStartTracker
5959
import org.wordpress.android.ui.reader.ReaderActivityLauncher
6060
import org.wordpress.android.ui.reader.tracker.ReaderTracker
6161
import org.wordpress.android.ui.stats.StatsTimeframe
62-
import org.wordpress.android.ui.stats.refresh.StatsActivity
62+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom
6363
import org.wordpress.android.ui.uploads.UploadService
6464
import org.wordpress.android.ui.uploads.UploadUtilsWrapper
6565
import org.wordpress.android.ui.utils.TitleSubtitleSnackbarSpannable
@@ -611,7 +611,7 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
611611
is SiteNavigationAction.OpenStats -> ActivityLauncher.viewBlogStats(
612612
activity,
613613
action.site,
614-
StatsActivity.StatsLaunchedFrom.QUICK_ACTIONS
614+
StatsLaunchedFrom.QUICK_ACTIONS
615615
)
616616

617617
is SiteNavigationAction.ConnectJetpackForStats ->
@@ -678,7 +678,7 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
678678
requireActivity(),
679679
action.site,
680680
StatsTimeframe.INSIGHTS,
681-
StatsActivity.StatsLaunchedFrom.TODAY_STATS_CARD
681+
StatsLaunchedFrom.TODAY_STATS_CARD
682682
)
683683

684684
is SiteNavigationAction.OpenExternalUrl ->

WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import org.wordpress.android.ui.mysite.items.listitem.ListItemAction
6464
import org.wordpress.android.ui.pages.SnackbarMessageHolder
6565
import org.wordpress.android.ui.prefs.SiteSettingsFragment
6666
import org.wordpress.android.ui.quickstart.QuickStartMySitePrompts
67-
import org.wordpress.android.ui.stats.refresh.StatsActivity
67+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom
6868
import org.wordpress.android.ui.utils.ListItemInteraction
6969
import org.wordpress.android.ui.utils.UiString
7070
import org.wordpress.android.util.LocaleManager
@@ -147,7 +147,7 @@ class MenuActivity : AppCompatActivity() {
147147
is SiteNavigationAction.OpenStats -> ActivityLauncher.viewBlogStats(
148148
this,
149149
action.site,
150-
StatsActivity.StatsLaunchedFrom.ROW
150+
StatsLaunchedFrom.ROW
151151
)
152152

153153
is SiteNavigationAction.OpenDomains -> ActivityLauncher.viewDomainsDashboardActivity(

WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import org.wordpress.android.ui.reader.comments.ThreadedCommentsActionSource;
5555
import org.wordpress.android.ui.reader.tracker.ReaderTracker;
5656
import org.wordpress.android.ui.stats.StatsViewType;
57-
import org.wordpress.android.ui.stats.refresh.StatsActivity.StatsLaunchedFrom;
57+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom;
5858
import org.wordpress.android.util.AppLog;
5959
import org.wordpress.android.util.StringUtils;
6060
import org.wordpress.android.util.ToastUtils;

WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/FormattableContentClickHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import org.wordpress.android.ui.reader.comments.ThreadedCommentsActionSource.ACT
1616
import org.wordpress.android.ui.reader.tracker.ReaderTracker
1717
import org.wordpress.android.ui.reader.utils.ReaderUtils
1818
import org.wordpress.android.ui.stats.StatsViewType.FOLLOWERS
19-
import org.wordpress.android.ui.stats.refresh.StatsActivity
19+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom
2020
import org.wordpress.android.util.AppLog
2121
import org.wordpress.android.util.AppLog.T.API
2222
import org.wordpress.android.util.ToastUtils
@@ -118,7 +118,7 @@ class FormattableContentClickHandler @Inject constructor(
118118
if (rangeType == FormattableRangeType.FOLLOW) {
119119
ActivityLauncher.viewAllTabbedInsightsStats(activity, FOLLOWERS, 0, site.id)
120120
} else {
121-
ActivityLauncher.viewBlogStats(activity, site, StatsActivity.StatsLaunchedFrom.ACTIVITY_LOG)
121+
ActivityLauncher.viewBlogStats(activity, site, StatsLaunchedFrom.ACTIVITY_LOG)
122122
}
123123
}
124124

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.wordpress.android.ui.ActivityLauncher
1515
import org.wordpress.android.ui.LocaleAwareActivity
1616
import org.wordpress.android.ui.jetpackoverlay.JetpackFeatureRemovalPhaseHelper
1717
import org.wordpress.android.ui.stats.StatsTimeframe
18+
import org.wordpress.android.ui.stats.refresh.utils.StatsLaunchedFrom
1819
import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
1920
import org.wordpress.android.util.JetpackBrandingUtils
2021
import javax.inject.Inject
@@ -90,17 +91,4 @@ class StatsActivity : LocaleAwareActivity() {
9091
notificationType?.let { putExtra(ARG_NOTIFICATION_TYPE, it) }
9192
}
9293
}
93-
94-
enum class StatsLaunchedFrom(val value: String) {
95-
QUICK_ACTIONS("quick_actions"),
96-
TODAY_STATS_CARD("today_stats_card"),
97-
ROW("row"),
98-
POSTS("posts"),
99-
WIDGET("widget"),
100-
NOTIFICATION("notification"),
101-
LINK("link"),
102-
SHORTCUT("shortcut"),
103-
ACTIVITY_LOG("activity_log"),
104-
JETPACK_CONNECTION("jetpack_connection")
105-
}
10694
}

0 commit comments

Comments
 (0)