Skip to content

Commit 8a71029

Browse files
committed
Revert accidental push of feature branch commits to trunk
This reverts the following commits that were accidentally pushed to trunk: - 7e09984 Moving datasource to its own package - 95a6c74 Adding tests - 257ed71 Adding a datasource - 32249da Moving todaysstat - ab3a713 Deleting tests - 8ffde27 Using propper helper These changes belong to the feat/CMM-1143-new-stats-views-card-tests branch.
1 parent 7e09984 commit 8a71029

File tree

18 files changed

+199
-736
lines changed

18 files changed

+199
-736
lines changed

WordPress/src/main/java/org/wordpress/android/modules/StatsModule.kt

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import org.wordpress.android.ui.mysite.cards.dashboard.error.ErrorWithinCardView
4242
import org.wordpress.android.ui.mysite.cards.dashboard.pages.PagesCardViewHolder
4343
import org.wordpress.android.ui.mysite.cards.dashboard.plans.PlansCardViewHolder
4444
import org.wordpress.android.ui.mysite.cards.dashboard.posts.PostCardViewHolder
45-
import org.wordpress.android.ui.mysite.cards.dashboard.todaystats.TodaysStatsCardViewHolder
45+
import org.wordpress.android.ui.mysite.cards.dashboard.todaysstats.TodaysStatsCardViewHolder
4646
import org.wordpress.android.ui.mysite.cards.domainregistration.DomainRegistrationViewHolder
4747
import org.wordpress.android.ui.mysite.cards.dynamiccard.DynamicDashboardCardViewHolder
4848
import org.wordpress.android.ui.mysite.cards.jetpackfeature.JetpackFeatureCardViewHolder

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardViewModelSlice.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.wordpress.android.ui.mysite.cards.dashboard.activity.ActivityLogCardV
2323
import org.wordpress.android.ui.mysite.cards.dashboard.activity.DashboardActivityLogCardFeatureUtils
2424
import org.wordpress.android.ui.mysite.cards.dashboard.pages.PagesCardViewModelSlice
2525
import org.wordpress.android.ui.mysite.cards.dashboard.posts.PostsCardViewModelSlice
26-
import org.wordpress.android.ui.mysite.cards.dashboard.todaystats.TodaysStatsViewModelSlice
26+
import org.wordpress.android.ui.mysite.cards.dashboard.todaysstats.TodaysStatsViewModelSlice
2727
import org.wordpress.android.ui.mysite.cards.dynamiccard.DynamicCardsViewModelSlice
2828
import org.wordpress.android.ui.pages.SnackbarMessageHolder
2929
import org.wordpress.android.ui.prefs.AppPrefsWrapper

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaystats/TodaysStatsCardBuilder.kt renamed to WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsCardBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.wordpress.android.ui.mysite.cards.dashboard.todaystats
1+
package org.wordpress.android.ui.mysite.cards.dashboard.todaysstats
22

33
import org.wordpress.android.R
44
import org.wordpress.android.fluxc.model.dashboard.CardModel.TodaysStatsCardModel

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaystats/TodaysStatsCardViewHolder.kt renamed to WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsCardViewHolder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.wordpress.android.ui.mysite.cards.dashboard.todaystats
1+
package org.wordpress.android.ui.mysite.cards.dashboard.todaysstats
22

33
import android.content.Context
44
import android.graphics.Typeface

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaystats/TodaysStatsViewModelSlice.kt renamed to WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsViewModelSlice.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.wordpress.android.ui.mysite.cards.dashboard.todaystats
1+
package org.wordpress.android.ui.mysite.cards.dashboard.todaysstats
22

33
import androidx.lifecycle.LiveData
44
import androidx.lifecycle.MutableLiveData

WordPress/src/main/java/org/wordpress/android/ui/newstats/NewStatsActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import kotlinx.coroutines.launch
4040
import org.wordpress.android.R
4141
import org.wordpress.android.ui.compose.theme.AppThemeM3
4242
import org.wordpress.android.ui.main.BaseAppCompatActivity
43-
import org.wordpress.android.ui.newstats.todaystats.TodaysStatsCard
44-
import org.wordpress.android.ui.newstats.todaystats.TodaysStatsViewModel
43+
import org.wordpress.android.ui.newstats.todaysstat.TodaysStatsCard
44+
import org.wordpress.android.ui.newstats.todaysstat.TodaysStatsViewModel
4545
import org.wordpress.android.ui.newstats.viewsstats.ViewsStatsCard
4646
import org.wordpress.android.ui.newstats.viewsstats.ViewsStatsViewModel
4747

WordPress/src/main/java/org/wordpress/android/ui/newstats/datasource/StatsDataSource.kt

Lines changed: 0 additions & 96 deletions
This file was deleted.

WordPress/src/main/java/org/wordpress/android/ui/newstats/datasource/StatsDataSourceImpl.kt

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)