Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,6 @@ class StatsListFragment : ViewPagerFragment(R.layout.stats_list_fragment), PullT
@SuppressLint("SetTextI18n")
emptyView.statsEmptyView.subtitle.text = ""
}
if (it.image != null) {
emptyView.statsEmptyView.image.setImageResource(it.image)
} else {
emptyView.statsEmptyView.image.setImageDrawable(null)
}
emptyView.statsEmptyView.button.setVisible(it.showButton)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ abstract class StatsListViewModel(
data class Empty(
val title: Int,
val subtitle: Int? = null,
val image: Int? = null,
val showButton: Boolean = false
) : UiModel()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ class UiModelMapper
}
} else {
return UiModel.Empty(
R.string.stats_empty_insights_title,
R.string.stats_insights_management_title,
R.drawable.img_illustration_insights_94dp,
true
title = R.string.stats_empty_insights_title,
subtitle = R.string.stats_insights_management_title,
showButton = true
)
}
}
Expand Down
130 changes: 0 additions & 130 deletions WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml

This file was deleted.

1 change: 0 additions & 1 deletion WordPress/src/main/res/layout/stats_empty_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
android:layout_height="match_parent"
android:visibility="gone"
app:aevButton="@string/stats_manage_insights"
app:aevImage="@drawable/img_illustration_insights_94dp"
app:aevSubtitle="@string/stats_insights_management_title"
app:aevTitle="@string/stats_empty_insights_title"
tools:visibility="visible" />
4 changes: 2 additions & 2 deletions WordPress/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1490,9 +1490,9 @@
<string name="stats_insights_linkedin">LinkedIn</string>
<string name="stats_insights_path">Path</string>
<string name="stats_most_popular_percent_views">%1$s of views</string>
<string name="stats_most_popular_percent_views_empty">Not enough activity. Check back later when your site\'s had more visitors!</string>
<string name="stats_most_popular_percent_views_empty">Not enough activity. Check back when your site had more visitors!</string>
<string name="stats_insights_posting_activity">Posting Activity</string>
<string name="stats_insights_management_title">Only see the most relevant stats. Add and organise your insights below.</string>
<string name="stats_insights_management_title">Manage your insights to see only the most relevant stats</string>

<string name="stats_insights_management_general">General</string>
<string name="stats_insights_management_posts_and_pages">Posts and Pages</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ import org.wordpress.android.BaseUnitTest
import org.wordpress.android.R
import org.wordpress.android.fluxc.store.StatsStore.InsightType.TOTAL_FOLLOWERS
import org.wordpress.android.fluxc.store.StatsStore.ManagementType
import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Success
import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel
import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel
import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseModel.UseCaseState.SUCCESS
import org.wordpress.android.util.NetworkUtilsWrapper

@ExperimentalCoroutinesApi
class UiModelMapperTest : BaseUnitTest() {
class UiModelMapperTest : BaseUnitTest() {
@Mock
lateinit var networkUtilsWrapper: NetworkUtilsWrapper
private lateinit var mapper: UiModelMapper
Expand All @@ -40,10 +39,10 @@ class UiModelMapperTest : BaseUnitTest() {

val model = uiModel as UiModel.Success
assertThat(model.data).hasSize(2)
assertThat((model.data[0] as Success).statsType).isEqualTo(TOTAL_FOLLOWERS)
assertThat((model.data[0] as StatsBlock.Success).statsType).isEqualTo(TOTAL_FOLLOWERS)
assertThat(model.data[0].type).isEqualTo(StatsBlock.Type.SUCCESS)
assertThat(model.data[0].data).isEmpty()
assertThat((model.data[1] as Success).statsType).isEqualTo(ManagementType.CONTROL)
assertThat((model.data[1] as StatsBlock.Success).statsType).isEqualTo(ManagementType.CONTROL)
assertThat(model.data[1].type).isEqualTo(StatsBlock.Type.SUCCESS)
assertThat(model.data[1].data).isEmpty()
assertThat(error).isNull()
Expand All @@ -64,7 +63,6 @@ class UiModelMapperTest : BaseUnitTest() {
val model = uiModel as UiModel.Empty
assertThat(model.title).isEqualTo(R.string.stats_empty_insights_title)
assertThat(model.subtitle).isEqualTo(R.string.stats_insights_management_title)
assertThat(model.image).isEqualTo(R.drawable.img_illustration_insights_94dp)
assertThat(model.showButton).isTrue()
assertThat(error).isNull()
}
Expand Down