Skip to content

Commit

Permalink
Merge pull request #12513 from wordpress-mobile/release/15.3
Browse files Browse the repository at this point in the history
Release/15.3
  • Loading branch information
oguzkocer authored Jul 27, 2020
2 parents 19b20ae + 6b409df commit 199a02c
Show file tree
Hide file tree
Showing 89 changed files with 1,915 additions and 1,453 deletions.
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/wordpress-mobile/release-toolkit
revision: b515c0b26b78bfffc3cbe5ceb3b51bb6eb979ab4
tag: 0.9.8
revision: 841e167dffc0f45fc36a513f8ba68a37689141e8
tag: 0.9.11
specs:
fastlane-plugin-wpmreleasetoolkit (0.9.8)
fastlane-plugin-wpmreleasetoolkit (0.9.11)
activesupport (~> 4)
chroma (= 0.2.0)
diffy (~> 3.3)
Expand Down Expand Up @@ -165,7 +165,7 @@ GEM
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
oj (3.10.6)
oj (3.10.7)
optimist (3.0.1)
options (2.3.2)
os (1.1.0)
Expand All @@ -176,7 +176,7 @@ GEM
options (~> 2.3.0)
public_suffix (2.0.5)
rake (12.3.3)
rake-compiler (1.1.0)
rake-compiler (1.1.1)
rake
rchardet (1.8.0)
representable (3.0.4)
Expand Down
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-233"
versionName "alpha-234"
}
versionCode 892
versionCode 895
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion

Expand Down Expand Up @@ -88,9 +88,9 @@ android {
dimension "buildType"
// Only set the release version if one isn't provided
if (!project.hasProperty("versionName")) {
versionName "15.3-rc-1"
versionName "15.3"
}
versionCode 891
versionCode 896
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
buildConfigField "boolean", "TENOR_AVAILABLE", "false"
buildConfigField "boolean", "READER_IMPROVEMENTS_PHASE_2", "false"
Expand Down
5 changes: 0 additions & 5 deletions WordPress/metadata/PlayStoreStrings.po
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ msgid ""
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_153"
msgid ""
"15.3:\n"
msgstr ""

msgctxt "release_note_short_152"
msgid ""
"15.2:\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package org.wordpress.android.ui.stats.refresh.lists.sections.viewholders

import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ImageView.ScaleType.CENTER
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
import org.wordpress.android.R
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ImageItem
import org.wordpress.android.util.image.ImageManager
Expand All @@ -12,6 +14,9 @@ class ImageItemViewHolder(parent: ViewGroup, val imageManager: ImageManager) : B
) {
private val image = itemView.findViewById<ImageView>(R.id.image)
fun bind(item: ImageItem) {
imageManager.load(image, item.imageResource)
val vectorDrawable = VectorDrawableCompat.create(image.resources, item.imageResource, null)
if (vectorDrawable != null) {
imageManager.load(image, vectorDrawable, CENTER)
}
}
}
5 changes: 3 additions & 2 deletions WordPress/src/main/res/layout/stats_block_image_item.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">

<ImageView
android:id="@+id/image"
Expand All @@ -10,7 +11,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/margin_medium"
android:contentDescription="@string/stats_manage_your_stats"
android:src="@drawable/insights_management_feature_image" />
app:srcCompat="@drawable/insights_management_feature_image" />

<View
android:id="@+id/image_gradient_overlay"
Expand Down
59 changes: 38 additions & 21 deletions WordPress/src/main/res/values-ar/strings.xml

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions WordPress/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ Language: bg
<string name="confirm">Потвърждение</string>
<string name="pending_draft_one_week_2">\'%1$s\' все още е чернова. Не забравяйте да го публикувате.</string>
<string name="pending_draft_one_week_1">Вашата чернова \'%1$s\' ви очаква да я публикувате!</string>
<string name="reader_photo_by">Снимка от %s</string>
<string name="swipe_for_more">Плъзнете за повече</string>
<string name="reader_err_get_post_not_authorized_signin_fallback">Не сте оторизирани да разглеждате тази публикация. Опитайте да влезете в WordPress.com или използвайте горния бутон, за да я отворите в браузъра.</string>
<string name="reader_err_get_post_not_authorized_signin">Не сте оторизирани да разглеждате тази публикация. Опитайте да влезете в WordPress.com.</string>
Expand Down Expand Up @@ -729,7 +728,6 @@ Language: bg
<string name="reader_page_followed_tags">Следени етикети</string>
<string name="reader_page_followed_blogs">Следени сайтове</string>
<string name="reader_hint_add_tag_or_url">Въведете етикет или адрес за следване</string>
<string name="reader_title_tag_preview">Етикет от Reader</string>
<string name="forgot_password">Изгубена парола?</string>
<string name="help">Помощ</string>
<string name="ssl_certificate_error">Невалиден SSL сертификат</string>
Expand Down
Loading

0 comments on commit 199a02c

Please sign in to comment.