Skip to content

Commit f0551b4

Browse files
nbradburyclaude
nbradbury
and
claude
authored
Remove plans from my site (#22514)
* Remove Plans screen from My Site menu Remove the Plans feature from the My Site menu while keeping shared resources used by other features (domains, themes). Removed: - PlansListFragment, PlansActivity, PlansListAdapter, PlanDetailsFragment, PlansViewModel - Plans layout files (plans_activity.xml, plans_list_fragment.xml, plans_list_item.xml) - PLAN action from ListItemAction enum - OpenPlan from SiteNavigationAction - viewBlogPlans from ActivityLauncher - Related tests and test fixtures - Unused plan-related strings Kept (shared by domains, themes): - PlansConstants.java (plan ID constants) - PlanUtils.kt (utility functions like isDomainCreditAvailable) - plans_purchase_success_fragment.xml (used by domain registration) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Move PlanUtils.kt and PlansConstants.java to util package These utility classes are used across multiple features (domains, themes, media, settings, plugins) and are not UI components, so they belong in the util package rather than ui/plans. This also allows the now-empty ui/plans directory to be removed. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Remove redundant same-package imports Remove unnecessary imports of PlansConstants and PlanUtils functions from files in the same util package to fix detekt and checkstyle errors. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Remove orphaned plan_feature_item.xml layout This layout file was used by the removed Plans screen and is no longer referenced anywhere in the codebase. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 7b64bc6 commit f0551b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+22
-824
lines changed

‎WordPress/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,6 @@
351351
android:label="@string/history_detail_title"
352352
android:theme="@style/WordPress.NoActionBar" />
353353

354-
<!-- plans -->
355-
<activity
356-
android:name=".ui.plans.PlansActivity"
357-
android:label="@string/plans"
358-
android:launchMode="singleTop"
359-
android:parentActivityName=".ui.main.WPMainActivity"
360-
android:theme="@style/WordPress.NoActionBar" />
361-
362354
<!-- Stats Activities -->
363355
<activity
364356
android:name=".ui.stats.refresh.StatsActivity"

‎WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@
7777
import org.wordpress.android.ui.people.PersonDetailFragment;
7878
import org.wordpress.android.ui.people.RoleChangeDialogFragment;
7979
import org.wordpress.android.ui.people.RoleSelectDialogFragment;
80-
import org.wordpress.android.ui.plans.PlanDetailsFragment;
81-
import org.wordpress.android.ui.plans.PlansActivity;
82-
import org.wordpress.android.ui.plans.PlansListAdapter;
83-
import org.wordpress.android.ui.plans.PlansListFragment;
8480
import org.wordpress.android.ui.plugins.PluginBrowserActivity;
8581
import org.wordpress.android.ui.plugins.PluginDetailActivity;
8682
import org.wordpress.android.ui.plugins.PluginListFragment;
@@ -237,8 +233,6 @@ public interface AppComponent {
237233

238234
void inject(PeopleInviteDialogFragment object);
239235

240-
void inject(PlansActivity object);
241-
242236
void inject(MediaBrowserActivity object);
243237

244238
void inject(MediaGridFragment object);
@@ -307,8 +301,6 @@ public interface AppComponent {
307301

308302
void inject(ReaderTagAdapter object);
309303

310-
void inject(PlansListFragment object);
311-
312304
void inject(ReaderSiteHeaderView object);
313305

314306
void inject(ReaderSiteSearchResultView object);
@@ -381,10 +373,6 @@ public interface AppComponent {
381373

382374
void inject(PublicizeServiceAdapter object);
383375

384-
void inject(PlansListAdapter object);
385-
386-
void inject(PlanDetailsFragment object);
387-
388376
void inject(DomainsDashboardFragment object);
389377

390378
void inject(DomainSuggestionsFragment object);

‎WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.wordpress.android.ui.mediapicker.MediaPickerViewModel;
2828
import org.wordpress.android.ui.mysite.MySiteViewModel;
2929
import org.wordpress.android.ui.people.PeopleInviteViewModel;
30-
import org.wordpress.android.ui.plans.PlansViewModel;
3130
import org.wordpress.android.ui.posts.BasicDialogViewModel;
3231
import org.wordpress.android.ui.posts.EditPostAuthViewModel;
3332
import org.wordpress.android.ui.posts.EditPostPublishSettingsViewModel;
@@ -245,11 +244,6 @@ abstract class ViewModelModule {
245244
@ViewModelKey(PostListMainViewModel.class)
246245
abstract ViewModel postListMainViewModel(PostListMainViewModel viewModel);
247246

248-
@Binds
249-
@IntoMap
250-
@ViewModelKey(PlansViewModel.class)
251-
abstract ViewModel plansViewModel(PlansViewModel viewModel);
252-
253247
@Binds
254248
@IntoMap
255249
@ViewModelKey(DomainsDashboardViewModel.class)

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
import org.wordpress.android.ui.pages.PageParentActivity;
8484
import org.wordpress.android.ui.pages.PagesActivity;
8585
import org.wordpress.android.ui.people.PeopleManagementActivity;
86-
import org.wordpress.android.ui.plans.PlansActivity;
8786
import org.wordpress.android.ui.plugins.PluginBrowserActivity;
8887
import org.wordpress.android.ui.plugins.PluginDetailActivity;
8988
import org.wordpress.android.ui.plugins.PluginUtils;
@@ -650,13 +649,6 @@ public static void viewConnectJetpackForStats(Context context, SiteModel site) {
650649
context.startActivity(intent);
651650
}
652651

653-
public static void viewBlogPlans(Context context, SiteModel site) {
654-
Intent intent = new Intent(context, PlansActivity.class);
655-
intent.putExtra(WordPress.SITE, site);
656-
context.startActivity(intent);
657-
AnalyticsUtils.trackWithSiteDetails(Stat.OPENED_PLANS, site);
658-
}
659-
660652
public static void viewCurrentBlogPosts(Context context, SiteModel site) {
661653
viewCurrentBlogPostsOfType(context, site, null);
662654
}

‎WordPress/src/main/java/org/wordpress/android/ui/domains/DomainsDashboardViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.wordpress.android.ui.domains.management.getDomainDetailsUrl
3030
import org.wordpress.android.ui.domains.usecases.AllDomains
3131
import org.wordpress.android.ui.domains.usecases.FetchAllDomainsUseCase
3232
import org.wordpress.android.ui.domains.usecases.FetchPlansUseCase
33-
import org.wordpress.android.ui.plans.isDomainCreditAvailable
33+
import org.wordpress.android.util.isDomainCreditAvailable
3434
import org.wordpress.android.ui.utils.HtmlMessageUtils
3535
import org.wordpress.android.ui.utils.ListItemInteraction
3636
import org.wordpress.android.ui.utils.UiString.UiStringRes

‎WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
import org.wordpress.android.ui.notifications.SystemNotificationsTracker;
7676
import org.wordpress.android.ui.photopicker.MediaPickerConstants;
7777
import org.wordpress.android.ui.photopicker.MediaPickerLauncher;
78-
import org.wordpress.android.ui.plans.PlansConstants;
78+
import org.wordpress.android.util.PlansConstants;
7979
import org.wordpress.android.ui.uploads.UploadService;
8080
import org.wordpress.android.ui.uploads.UploadUtilsWrapper;
8181
import org.wordpress.android.util.ActivityUtils;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
553553
is SiteNavigationAction.OpenActivityLog -> ActivityLauncher.viewActivityLogList(activity, action.site)
554554
is SiteNavigationAction.OpenBackup -> ActivityLauncher.viewBackupList(activity, action.site)
555555
is SiteNavigationAction.OpenScan -> ActivityLauncher.viewScan(activity, action.site)
556-
is SiteNavigationAction.OpenPlan -> ActivityLauncher.viewBlogPlans(activity, action.site)
557556
is SiteNavigationAction.OpenPosts -> ActivityLauncher.viewCurrentBlogPosts(requireActivity(), action.site)
558557
is SiteNavigationAction.OpenPages -> ActivityLauncher.viewCurrentBlogPages(requireActivity(), action.site)
559558
is SiteNavigationAction.OpenPostTypes ->

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ sealed class SiteNavigationAction {
1818
data class OpenActivityLog(val site: SiteModel) : SiteNavigationAction()
1919
data class OpenBackup(val site: SiteModel) : SiteNavigationAction()
2020
data class OpenScan(val site: SiteModel) : SiteNavigationAction()
21-
data class OpenPlan(val site: SiteModel) : SiteNavigationAction()
2221
data class OpenPosts(val site: SiteModel) : SiteNavigationAction()
2322
data class OpenPages(val site: SiteModel) : SiteNavigationAction()
2423
data class OpenPostTypes(val site: SiteModel) : SiteNavigationAction()

‎WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/ListItemActionHandler.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class ListItemActionHandler @Inject constructor(
2626
ListItemAction.ACTIVITY_LOG -> SiteNavigationAction.OpenActivityLog(selectedSite)
2727
ListItemAction.BACKUP -> SiteNavigationAction.OpenBackup(selectedSite)
2828
ListItemAction.SCAN -> SiteNavigationAction.OpenScan(selectedSite)
29-
ListItemAction.PLAN -> SiteNavigationAction.OpenPlan(selectedSite)
3029
ListItemAction.POSTS -> SiteNavigationAction.OpenPosts(selectedSite)
3130
ListItemAction.PAGES -> SiteNavigationAction.OpenPages(selectedSite)
3231
ListItemAction.POST_TYPES -> SiteNavigationAction.OpenPostTypes(selectedSite)

‎WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/domainregistration/DomainRegistrationCardViewModelSlice.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.wordpress.android.ui.mysite.MySiteCardAndItem
2121
import org.wordpress.android.ui.mysite.SelectedSiteRepository
2222
import org.wordpress.android.ui.mysite.SiteNavigationAction
2323
import org.wordpress.android.ui.mysite.cards.DomainRegistrationCardShownTracker
24-
import org.wordpress.android.ui.plans.isDomainCreditAvailable
24+
import org.wordpress.android.util.isDomainCreditAvailable
2525
import org.wordpress.android.ui.utils.ListItemInteraction
2626
import org.wordpress.android.util.AppLog.T.DOMAIN_REGISTRATION
2727
import org.wordpress.android.util.SiteUtilsWrapper

0 commit comments

Comments
 (0)