Skip to content

Commit 507b1bc

Browse files
khaykovkhaykov
committed
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into issue/disable-uc-details-ff-in-wasabi
2 parents 6a45800 + 4dae40f commit 507b1bc

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

‎WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListI
2929
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.IconStyle.EMPTY_SPACE
3030
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.IconStyle.NORMAL
3131
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.TextStyle.LIGHT
32-
import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
3332
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
3433
import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatefulUseCase
3534
import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
@@ -40,6 +39,7 @@ import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
4039
import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
4140
import org.wordpress.android.ui.stats.refresh.utils.getBarWidth
4241
import org.wordpress.android.ui.stats.refresh.utils.trackGranular
42+
import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
4343
import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
4444
import java.util.Date
4545
import javax.inject.Inject
@@ -109,7 +109,7 @@ constructor(
109109
} else {
110110
val header = Header(R.string.stats_author_label, R.string.stats_author_views_label)
111111
items.add(header)
112-
val maxViews = domainModel.authors.maxBy { it.views }?.views ?: 0
112+
val maxViews = domainModel.authors.maxByOrNull { it.views }?.views ?: 0
113113
domainModel.authors.forEachIndexed { index, author ->
114114
val headerItem = ListItemWithIcon(
115115
iconUrl = author.avatarUrl,

‎WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import org.wordpress.android.analytics.AnalyticsTracker
66
import org.wordpress.android.fluxc.model.SiteModel
77
import org.wordpress.android.fluxc.model.stats.LimitMode
88
import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel
9-
import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType.HOMEPAGE
109
import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType.ATTACHMENT
10+
import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType.HOMEPAGE
1111
import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType.OTHER
1212
import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType.PAGE
1313
import org.wordpress.android.fluxc.model.stats.time.PostAndPageViewsModel.ViewsType.POST
@@ -16,8 +16,8 @@ import org.wordpress.android.fluxc.store.StatsStore.TimeStatsType.POSTS_AND_PAGE
1616
import org.wordpress.android.fluxc.store.stats.time.PostAndPageViewsStore
1717
import org.wordpress.android.modules.BG_THREAD
1818
import org.wordpress.android.modules.UI_THREAD
19-
import org.wordpress.android.ui.stats.StatsConstants.ITEM_TYPE_HOME_PAGE
2019
import org.wordpress.android.ui.stats.StatsConstants.ITEM_TYPE_ATTACHMENT
20+
import org.wordpress.android.ui.stats.StatsConstants.ITEM_TYPE_HOME_PAGE
2121
import org.wordpress.android.ui.stats.StatsConstants.ITEM_TYPE_POST
2222
import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewPostDetailStats
2323
import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewPostsAndPages
@@ -30,7 +30,6 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Empty
3030
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
3131
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
3232
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
33-
import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
3433
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
3534
import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatelessUseCase
3635
import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
@@ -40,6 +39,7 @@ import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
4039
import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
4140
import org.wordpress.android.ui.stats.refresh.utils.getBarWidth
4241
import org.wordpress.android.ui.stats.refresh.utils.trackGranular
42+
import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
4343
import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
4444
import java.util.Date
4545
import javax.inject.Inject
@@ -112,7 +112,7 @@ constructor(
112112
} else {
113113
val header = Header(R.string.stats_posts_and_pages_title_label, R.string.stats_posts_and_pages_views_label)
114114
items.add(header)
115-
val maxViews = domainModel.views.maxBy { it.views }?.views ?: 0
115+
val maxViews = domainModel.views.maxByOrNull { it.views }?.views ?: 0
116116
items.addAll(domainModel.views.mapIndexed { index, viewsModel ->
117117
val icon = when (viewsModel.type) {
118118
POST -> R.drawable.ic_posts_white_24dp

‎WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Heade
2626
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
2727
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
2828
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.TextStyle.LIGHT
29-
import org.wordpress.android.ui.utils.ListItemInteraction
3029
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
3130
import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightUseCaseFactory
3231
import org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.TagsAndCategoriesUseCase.TagsAndCategoriesUiState
@@ -35,6 +34,7 @@ import org.wordpress.android.ui.stats.refresh.utils.ItemPopupMenuHandler
3534
import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
3635
import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
3736
import org.wordpress.android.ui.stats.refresh.utils.getBarWidth
37+
import org.wordpress.android.ui.utils.ListItemInteraction
3838
import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
3939
import org.wordpress.android.viewmodel.ResourceProvider
4040
import javax.inject.Inject
@@ -100,7 +100,7 @@ class TagsAndCategoriesUseCase
100100
header
101101
)
102102
val tagsList = mutableListOf<BlockListItem>()
103-
val maxViews = domainModel.tags.maxBy { it.views }?.views ?: 0
103+
val maxViews = domainModel.tags.maxByOrNull { it.views }?.views ?: 0
104104
domainModel.tags.forEachIndexed { index, tag ->
105105
when {
106106
tag.items.size == 1 -> {

‎WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
8383
val count = if (columnNumber > MIN_COLUMN_COUNT) columnNumber else MIN_COLUMN_COUNT
8484
val cutEntries = takeEntriesWithinGraphWidth(count, item.entries)
8585
val mappedEntries = cutEntries.mapIndexed { index, pair -> toBarEntry(pair, index) }
86-
val maxYValue = cutEntries.maxBy { it.value }!!.value
86+
val maxYValue = cutEntries.maxByOrNull { it.value }!!.value
8787
val hasData = item.entries.isNotEmpty() && item.entries.any { it.value > 0 }
8888
val dataSet = if (hasData) {
8989
buildDataSet(context, mappedEntries)
@@ -272,7 +272,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
272272
}
273273

274274
private fun getHighlightDataSet(context: Context, cut: List<BarEntry>): BarDataSet? {
275-
val maxEntry = cut.maxBy { it.y } ?: return null
275+
val maxEntry = cut.maxByOrNull { it.y } ?: return null
276276
val highlightedDataSet = cut.map {
277277
BarEntry(it.x, maxEntry.y, it.data)
278278
}

‎build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
buildscript {
2-
ext.kotlinVersion = '1.4.20'
3-
ext.serializationVersion = '1.0-M1-1.4.0-rc'
2+
ext.kotlinVersion = '1.5.32'
3+
ext.coroutinesVersion = '1.5.2'
44
ext.navComponentVersion = '2.3.5'
5-
ext.kotlin_coroutines_version = '1.3.9'
6-
ext.coroutinesVersion = '1.3.9'
7-
ext.kotlin_ktx_version = '1.2.0'
85
ext.wordPressUtilsVersion = '2.2.0'
96
ext.wordPressLoginVersion = '0.0.8'
107
ext.detektVersion = '1.15.0'

0 commit comments

Comments
 (0)