Skip to content

Commit

Permalink
Merge pull request #12091 from wordpress-mobile/merge/15.0-release-no…
Browse files Browse the repository at this point in the history
…tes-to-master

Merge 15.0 release notes to master
  • Loading branch information
oguzkocer authored Jun 5, 2020
2 parents 06f3e1a + 803a0c2 commit dd0f46b
Show file tree
Hide file tree
Showing 12 changed files with 158 additions and 129 deletions.
8 changes: 4 additions & 4 deletions WordPress/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ android {
if (project.hasProperty("versionName")) {
versionName project.property("versionName")
} else {
versionName "alpha-226"
versionName "alpha-227"
}
versionCode 875
versionCode 877
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion

Expand Down Expand Up @@ -85,9 +85,9 @@ android {
dimension "buildType"
// Only set the release version if one isn't provided
if (!project.hasProperty("versionName")) {
versionName "15.0-rc-1"
versionName "15.0-rc-2"
}
versionCode 874
versionCode 876
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
buildConfigField "boolean", "TENOR_AVAILABLE", "false"
buildConfigField "boolean", "READER_IMPROVEMENTS_PHASE_2", "false"
Expand Down
29 changes: 15 additions & 14 deletions WordPress/metadata/PlayStoreStrings.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ msgstr ""
"Project-Id-Version: Release Notes & Play Store Descriptions\n"

#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
msgctxt "release_note_150"
msgid ""
"15.0:\n"
"Block editor additions: New Verse block. Support for overlay colors in Cover block. Enter/exit animation for the Floating Toolbar. Tooltip for page template selection buttons.\n"
"Block editor updates: “Trash block” in a menu reachable from the block toolbar.\n"
"Block editor fixes: Text block merging issue, button alignment in page templates, string inconsistencies.\n"
"Other updates: Added homepage settings to pages list and to site settings. Improved Reader UI.\n"
msgstr ""

msgctxt "release_note_149"
msgid ""
"14.9:\n"
Expand All @@ -19,29 +28,21 @@ msgid ""
"<b>Block editor fixes:</b> Free Photo Library bug that inserted single images even if several were selected, preview failure when switching to the classic editor. Removed non-functional Subscription Button from Blog template.\n"
msgstr ""

msgctxt "release_note_148"
#. translators: A shorter version of the Release notes to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
msgctxt "release_note_short_150"
msgid ""
"14.8:\n"
"<b>Block editor additions:</b> Buttons block displays multiple buttons in a single row; Image blocks prefill captions when available; Cover blocks allow uploading; inserted images can be cropped, zoomed, or rotated; Heading block includes alignment options.\n"
"<b>Block editor improvements:</b> Relocated floating toolbar, fixed bug impact white space in Text blocks, fixed misaligned toolbar icons in RTL mode.\n"
"<b>General updates:</b> Added reblog functionality.\n"
"15.0:\n"
"Block editor additions: New Verse block. Support for overlay colors in Cover block. Enter/exit animation for Floating Toolbar. Tooltip for page template selection buttons.\n"
"Block editor updates: “Trash block” in a menu reachable from the block toolbar.\n"
"Other updates: Added homepage settings to pages list and to site settings.\n"
msgstr ""

#. translators: A shorter version of the Release notes to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
msgctxt "release_note_short_149"
msgid ""
"14.9:\n"
"<b>Block editor enhancements:</b> New Pullquote block, Button block color options, updated page templates.\n"
msgstr ""

msgctxt "release_note_short_148"
msgid ""
"14.8:\n"
"<b>Block editor additions:</b> Buttons block displays multiple buttons in a single row; Image blocks prefill captions when available; Cover blocks allow uploading; inserted images can be cropped, zoomed, or rotated; Heading block includes alignment options.\n"
"<b>Block editor improvements:</b> Relocated floating toolbar, fixed bug impact white space in Text blocks, fixed misaligned toolbar icons in RTL mode.\n"
"<b>General updates:</b> Added reblog functionality.\n"
msgstr ""

#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
msgctxt "sample_post_content"
msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility."
Expand Down
7 changes: 4 additions & 3 deletions WordPress/metadata/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<b>Block editor enhancements:</b> New Pullquote block, Button block color options, updated page templates.

<b>Block editor fixes:</b> Free Photo Library bug that inserted single images even if several were selected, preview failure when switching to the classic editor. Removed non-functional Subscription Button from Blog template.
Block editor additions: New Verse block. Support for overlay colors in Cover block. Enter/exit animation for the Floating Toolbar. Tooltip for page template selection buttons.
Block editor updates: “Trash block” in a menu reachable from the block toolbar.
Block editor fixes: Text block merging issue, button alignment in page templates, string inconsistencies.
Other updates: Added homepage settings to pages list and to site settings. Improved Reader UI.
4 changes: 3 additions & 1 deletion WordPress/metadata/release_notes_short.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<b>Block editor enhancements:</b> New Pullquote block, Button block color options, updated page templates.
Block editor additions: New Verse block. Support for overlay colors in Cover block. Enter/exit animation for Floating Toolbar. Tooltip for page template selection buttons.
Block editor updates: “Trash block” in a menu reachable from the block toolbar.
Other updates: Added homepage settings to pages list and to site settings.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ sealed class PageItem(open val type: Type) {
open val remoteId: Long,
open val localId: Int,
open val title: String,
open val subtitle: Int? = null,
open val date: Date,
open val labels: List<UiString>,
@ColorRes open val labelsColor: Int?,
Expand All @@ -32,6 +33,7 @@ sealed class PageItem(open val type: Type) {
override val remoteId: Long,
override val localId: Int,
override val title: String,
override val subtitle: Int? = null,
override val date: Date,
override val labels: List<UiString> = emptyList(),
override val labelsColor: Int? = null,
Expand Down Expand Up @@ -61,6 +63,7 @@ sealed class PageItem(open val type: Type) {
override val remoteId: Long,
override val localId: Int,
override val title: String,
override val subtitle: Int? = null,
override val date: Date,
override val labels: List<UiString> = emptyList(),
override val labelsColor: Int? = null,
Expand Down Expand Up @@ -89,6 +92,7 @@ sealed class PageItem(open val type: Type) {
override val remoteId: Long,
override val localId: Int,
override val title: String,
override val subtitle: Int? = null,
override val date: Date,
override val labels: List<UiString> = emptyList(),
override val labelsColor: Int? = null,
Expand Down Expand Up @@ -117,6 +121,7 @@ sealed class PageItem(open val type: Type) {
override val remoteId: Long,
override val localId: Int,
override val title: String,
override val subtitle: Int? = null,
override val date: Date,
override val labels: List<UiString> = emptyList(),
override val labelsColor: Int? = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import org.wordpress.android.viewmodel.uistate.ProgressBarUiState
import org.wordpress.android.viewmodel.uistate.ProgressBarUiState.Determinate
import org.wordpress.android.viewmodel.uistate.ProgressBarUiState.Indeterminate
import java.util.Date
import java.util.Locale

sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layout: Int) :
RecyclerView.ViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) {
Expand All @@ -51,7 +52,7 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
) : PageItemViewHolder(parentView, R.layout.page_list_item) {
private val pageTitle = itemView.findViewById<TextView>(R.id.page_title)
private val pageMore = itemView.findViewById<ImageButton>(R.id.page_more)
private val time = itemView.findViewById<TextView>(R.id.time_posted)
private val pageSubtitle = itemView.findViewById<TextView>(R.id.page_subtitle)
private val labels = itemView.findViewById<TextView>(R.id.labels)
private val featuredImage = itemView.findViewById<ImageView>(R.id.featured_image)
private val uploadProgressBar: ProgressBar = itemView.findViewById(R.id.upload_progress)
Expand Down Expand Up @@ -80,8 +81,19 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
page.title

val date = if (page.date == Date(0)) Date() else page.date
time.text = DateTimeUtils.javaDateToTimeSpan(date, parent.context)
val stringDate = DateTimeUtils.javaDateToTimeSpan(date, parent.context)
.capitalizeWithLocaleWithoutLint(parent.context.currentLocale)
val subtitle = page.subtitle
pageSubtitle.text = if (subtitle == null) {
stringDate
} else {
String.format(
Locale.getDefault(),
parent.context.getString(R.string.pages_item_subtitle),
stringDate,
parent.context.getString(subtitle)
)
}

labels.text = page.labels.map { uiHelper.getTextOfUiString(parent.context, it) }.sorted()
.joinToString(separator = " · ")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,20 +261,20 @@ class PageListViewModel @Inject constructor(
DEFAULT_INDENT
}
val itemUiStateData = createItemUiStateData(it)

PublishedPage(
it.remoteId,
it.pageId,
it.title,
it.date,
itemUiStateData.labels,
itemUiStateData.labelsColor,
pageItemIndent,
getFeaturedImageUrl(it.featuredImageId),
itemUiStateData.actions,
actionsEnabled,
itemUiStateData.progressBarUiState,
itemUiStateData.showOverlay
remoteId = it.remoteId,
localId = it.pageId,
title = it.title,
subtitle = itemUiStateData.subtitle,
date = it.date,
labels = itemUiStateData.labels,
labelsColor = itemUiStateData.labelsColor,
indent = pageItemIndent,
imageUrl = getFeaturedImageUrl(it.featuredImageId),
actions = itemUiStateData.actions,
actionsEnabled = actionsEnabled,
progressBarUiState = itemUiStateData.progressBarUiState,
showOverlay = itemUiStateData.showOverlay
)
}
}
Expand All @@ -290,16 +290,17 @@ class PageListViewModel @Inject constructor(
val itemUiStateData = createItemUiStateData(it)

ScheduledPage(
it.remoteId, it.pageId,
it.title,
it.date,
itemUiStateData.labels,
itemUiStateData.labelsColor,
getFeaturedImageUrl(it.featuredImageId),
itemUiStateData.actions,
actionsEnabled,
itemUiStateData.progressBarUiState,
itemUiStateData.showOverlay
remoteId = it.remoteId,
localId = it.pageId,
title = it.title,
date = it.date,
labels = itemUiStateData.labels,
labelsColor = itemUiStateData.labelsColor,
imageUrl = getFeaturedImageUrl(it.featuredImageId),
actions = itemUiStateData.actions,
actionsEnabled = actionsEnabled,
progressBarUiState = itemUiStateData.progressBarUiState,
showOverlay = itemUiStateData.showOverlay
)
}
}
Expand All @@ -313,17 +314,17 @@ class PageListViewModel @Inject constructor(
return pages.map {
val itemUiStateData = createItemUiStateData(it)
DraftPage(
it.remoteId,
it.pageId,
it.title,
it.date,
itemUiStateData.labels,
itemUiStateData.labelsColor,
getFeaturedImageUrl(it.featuredImageId),
itemUiStateData.actions,
actionsEnabled,
itemUiStateData.progressBarUiState,
itemUiStateData.showOverlay
remoteId = it.remoteId,
localId = it.pageId,
title = it.title,
date = it.date,
labels = itemUiStateData.labels,
labelsColor = itemUiStateData.labelsColor,
imageUrl = getFeaturedImageUrl(it.featuredImageId),
actions = itemUiStateData.actions,
actionsEnabled = actionsEnabled,
progressBarUiState = itemUiStateData.progressBarUiState,
showOverlay = itemUiStateData.showOverlay
)
}
}
Expand All @@ -335,17 +336,17 @@ class PageListViewModel @Inject constructor(
return pages.map {
val itemUiStateData = createItemUiStateData(it)
TrashedPage(
it.remoteId,
it.pageId,
it.title,
it.date,
itemUiStateData.labels,
itemUiStateData.labelsColor,
getFeaturedImageUrl(it.featuredImageId),
itemUiStateData.actions,
actionsEnabled,
itemUiStateData.progressBarUiState,
itemUiStateData.showOverlay
remoteId = it.remoteId,
localId = it.pageId,
title = it.title,
date = it.date,
labels = itemUiStateData.labels,
labelsColor = itemUiStateData.labelsColor,
imageUrl = getFeaturedImageUrl(it.featuredImageId),
actions = itemUiStateData.actions,
actionsEnabled = actionsEnabled,
progressBarUiState = itemUiStateData.progressBarUiState,
showOverlay = itemUiStateData.showOverlay
)
}
}
Expand Down Expand Up @@ -401,14 +402,20 @@ class PageListViewModel @Inject constructor(
pagesViewModel.site,
pageModel.remoteId
)
return ItemUiStateData(labels, labelColor, progressBarUiState, showOverlay, actions)
val subtitle = when (pageModel.remoteId) {
pagesViewModel.site.pageOnFront -> R.string.site_settings_homepage
pagesViewModel.site.pageForPosts -> R.string.site_settings_posts_page
else -> null
}
return ItemUiStateData(labels, labelColor, progressBarUiState, showOverlay, actions, subtitle)
}

private data class ItemUiStateData(
val labels: List<UiString>,
@ColorRes val labelsColor: Int?,
val progressBarUiState: ProgressBarUiState,
val showOverlay: Boolean,
val actions: Set<Action>
val actions: Set<Action>,
val subtitle: Int? = null
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ class SearchListViewModel
return when (status) {
PageStatus.PUBLISHED, PageStatus.PRIVATE ->
PublishedPage(
remoteId,
pageId,
title,
date,
labels,
labelColor,
remoteId = remoteId,
localId = pageId,
title = title,
date = date,
labels = labels,
labelsColor = labelColor,
actions = pageListItemActionsUseCase.setupPageActions(
PUBLISHED,
uploadUiState,
Expand All @@ -122,12 +122,12 @@ class SearchListViewModel
showOverlay = showOverlay
)
PageStatus.DRAFT, PageStatus.PENDING -> DraftPage(
remoteId,
pageId,
title,
date,
labels,
labelColor,
remoteId = remoteId,
localId = pageId,
title = title,
date = date,
labels = labels,
labelsColor = labelColor,
actions = pageListItemActionsUseCase.setupPageActions(
DRAFTS,
uploadUiState,
Expand All @@ -139,12 +139,12 @@ class SearchListViewModel
showOverlay = showOverlay
)
PageStatus.TRASHED -> TrashedPage(
remoteId,
pageId,
title,
date,
labels,
labelColor,
remoteId = remoteId,
localId = pageId,
title = title,
date = date,
labels = labels,
labelsColor = labelColor,
actions = pageListItemActionsUseCase.setupPageActions(
TRASHED,
uploadUiState,
Expand All @@ -156,12 +156,12 @@ class SearchListViewModel
showOverlay = showOverlay
)
PageStatus.SCHEDULED -> ScheduledPage(
remoteId,
pageId,
title,
date,
labels,
labelColor,
remoteId = remoteId,
localId = pageId,
title = title,
date = date,
labels = labels,
labelsColor = labelColor,
actions = pageListItemActionsUseCase.setupPageActions(
SCHEDULED,
uploadUiState,
Expand Down
Loading

0 comments on commit dd0f46b

Please sign in to comment.