Skip to content

Commit 2732e25

Browse files
ParaskP7ParaskP7
committed
Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android into analysis/wordpress-all-warnings-as-errors
2 parents 48c8e00 + 1468e9f commit 2732e25

File tree

44 files changed

+1224
-1062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1224
-1062
lines changed

‎RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
21.0
44
-----
5+
* [***] [internal] Updates the target sdk to 31 - Android 12 [https://github.com/wordpress-mobile/WordPress-Android/pull/17153]
56
* [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
67
* [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
78
* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]

‎WordPress/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ android {
122122
buildConfigField "boolean", "JETPACK_POWERED_BOTTOM_SHEET", "false"
123123
buildConfigField "boolean", "JETPACK_SHARED_LOGIN", "false"
124124
buildConfigField "boolean", "JETPACK_LOCAL_USER_FLAGS", "false"
125+
buildConfigField "boolean", "JETPACK_PROVIDER_SYNC", "false"
125126

126127
// Override these constants in jetpack product flavor to enable/ disable features
127128
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
@@ -354,7 +355,7 @@ dependencies {
354355

355356
implementation 'com.android.volley:volley:1.1.1'
356357
implementation 'com.google.firebase:firebase-messaging:21.1.0'
357-
implementation 'com.google.android.gms:play-services-auth:18.1.0'
358+
implementation 'com.google.android.gms:play-services-auth:20.3.0'
358359
implementation 'com.android.installreferrer:installreferrer:2.2'
359360
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
360361
implementation 'org.greenrobot:eventbus:3.3.1'

‎WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java

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

‎WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/BlockEditorPage.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public BlockEditorPage addPostSettings(String categoryName, String tagName) {
7575
}
7676

7777
public void openPostSetting() {
78+
waitForElementToBeDisplayed(R.id.toolbar_main);
7879
openActionBarOverflowOrOptionsMenu(ApplicationProvider.getApplicationContext());
7980
clickOn(onView(withText(R.string.post_settings)));
8081
}
@@ -141,8 +142,8 @@ public BlockEditorPage addImage() {
141142
clickOn("Image");
142143
clickOn("WordPress Media Library");
143144
waitForElementToBeDisplayed(onView(withText("WordPress media")));
144-
waitForElementToBeDisplayed(onView(withIndex(withId(R.id.image_thumbnail), 0)));
145-
onView(withIndex(withId(R.id.image_thumbnail), 0)).perform(click());
145+
waitForElementToBeDisplayed(onView(withIndex(withId(R.id.text_selection_count), 0)));
146+
onView(withIndex(withId(R.id.text_selection_count), 0)).perform(click());
146147
clickOn(R.id.mnu_confirm_selection);
147148
return this;
148149
}

‎WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java

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

‎WordPress/src/jetpack/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
xmlns:tools="http://schemas.android.com/tools">
44
<application>
55
<!-- Deep Linking Activity -->
6-
<activity android:name="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity">
6+
<activity android:name="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity"
7+
android:exported="true">
78
<intent-filter android:autoVerify="true">
89
<action android:name="android.intent.action.VIEW" />
910

‎WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/components/LoopingText.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.res.Configuration
44
import androidx.compose.material.Text
55
import androidx.compose.runtime.Composable
66
import androidx.compose.ui.Modifier
7+
import androidx.compose.ui.platform.LocalDensity
78
import androidx.compose.ui.res.colorResource
89
import androidx.compose.ui.res.stringArrayResource
910
import androidx.compose.ui.text.ParagraphStyle
@@ -20,11 +21,13 @@ import org.wordpress.android.ui.accounts.login.LocalPosition
2021
import org.wordpress.android.ui.compose.theme.AppTheme
2122
import org.wordpress.android.util.extensions.isOdd
2223

23-
private val fontSize = 40.sp
24-
private val lineHeight = fontSize / 100 * 105 // last value = % of fontSize
24+
private const val FIXED_FONT_SIZE = 40
2525

2626
@Composable
2727
private fun LargeTexts() {
28+
val fontSize = (FIXED_FONT_SIZE / LocalDensity.current.fontScale).sp
29+
val lineHeight = fontSize * 1.05 // calculate line height to 5% larger than the font size
30+
2831
val texts = stringArrayResource(R.array.login_prologue_revamped_jetpack_feature_texts)
2932

3033
val secondaryColor = colorResource(R.color.text_color_jetpack_login_label_secondary)

‎WordPress/src/jetpack/res/values-ar/strings.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-11 15:54:02+0000
3+
Translation-Revision-Date: 2022-10-05 11:54:03+0000
44
Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;
55
Generator: GlotPress/2.4.0-alpha
66
Language: ar
77
-->
88
<resources>
9+
<string name="me_btn_share">مشاركة Jetpack مع صديق</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">إضافة مؤلف</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">نشر صورة</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">إصلاح مشكلة الأمان</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">شارك على فيسبوك</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">البحث عن الإضافات</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">استعادة نسخة احتياطية</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">الرد على التعليقات</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">التحقُّق من الإشعارات</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">رصد إحصاءاتك</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">كتابة مدونة</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">إنشاء موقع</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">تحديث إضافة</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">تلاشي الخلفية العلوية في Jetpack</string>
23+
<string name="login_prologue_revamped_content_description_bg">خلفية Jetpack</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">شعار Jetpack</string>
925
<string name="me_btn_about">نبذة عن Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">هل ترغب في تسجيل الخروج من Jetpack؟</string>
1127
<string name="me_disconnect_from_wordpress_com">تسجيل الخروج من Jetpack</string>
1228
<string name="support_ticket_subject">دعم Jetpack الخاص بنظام تشغيل Android</string>
1329
<string name="login_magic_links_sent_label">تحقَّق من بريدك الإلكتروني على هذا الجهاز، واضغط على الرابط في رسالة البريد الإلكتروني التي تلقيتها من Jetpack.com.</string>
30+
<string name="continue_with_wpcom_no_signup">الاستمرار في ووردبريس.كوم</string>
1431
<string name="app_tagline">أمان الموقع وأداؤه من جيبك</string>
1532
<string name="post_signup_interstitial_title">مرحبًا بك في Jetpack</string>
1633
<string name="app_title">Jetpack الخاص بنظام تشغيل Android</string>

0 commit comments

Comments
 (0)