-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge trunk and resolve conflict in strings
- Loading branch information
Showing
203 changed files
with
5,832 additions
and
3,945 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,3 @@ | ||
| * [*] [Jetpack-only] Block Editor: Ensure text is always visible within Contact Info block [https://github.com/Automattic/jetpack/pull/33873] | ||
| * [*] Block Editor: Ensure uploaded audio is always visible within Audio block [https://github.com/WordPress/gutenberg/pull/55627] | ||
| * [*] Block Editor: In the deeply nested block warning, only display the ungroup option for blocks that support it [https://github.com/WordPress/gutenberg/pull/56445] | ||
| * [**] Enable Optimize Image setting (via Me → App Settings) by default, and change default compression and resolution values. [https://github.com/wordpress-mobile/WordPress-Android/pull/19581] | ||
| * [*] Fixed an issue that prevented theme installation on atomic sites [https://github.com/wordpress-mobile/WordPress-Android/pull/19668] | ||
|
|
||
| - Block editor only shows the “ungroup” option for nested blocks that support it. | ||
| - Optimize Images setting uses optimal size and quality by default. | ||
| - Themes install properly for sites on Business and Commerce plans. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| * [*] Block Editor: Ensure uploaded audio is always visible within Audio block [https://github.com/WordPress/gutenberg/pull/55627] | ||
| * [*] Block Editor: In the deeply nested block warning, only display the ungroup option for blocks that support it [https://github.com/WordPress/gutenberg/pull/56445] | ||
| * [**] Enable Optimize Image setting (via Me → App Settings) by default, and change default compression and resolution values. [https://github.com/wordpress-mobile/WordPress-Android/pull/19581] | ||
| * [*] Fixed an issue that prevented theme installation on atomic sites [https://github.com/wordpress-mobile/WordPress-Android/pull/19668] | ||
| - Block editor only shows the “ungroup” option for nested blocks that support it. | ||
| - Optimize Images setting uses optimal size and quality by default. | ||
| - Themes install properly for sites on Business and Commerce plans. |
42 changes: 42 additions & 0 deletions
42
...s/src/androidTest/java/org/wordpress/android/editor/savedinstance/ParcelableObjectTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package org.wordpress.android.editor.savedinstance | ||
|
|
||
| import android.os.Parcelable | ||
| import dagger.hilt.android.testing.HiltAndroidTest | ||
| import org.junit.Assert.assertArrayEquals | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
|
|
||
| @HiltAndroidTest | ||
| class ParcelableObjectTest { | ||
| private lateinit var parcelable: Parcelable | ||
|
|
||
| @Before | ||
| fun setUp() { | ||
| parcelable = TestParcelable("testData") | ||
| } | ||
|
|
||
| @Test | ||
| fun testConstructorWithParcelable() { | ||
| val parcelableObject = ParcelableObject(parcelable) | ||
| val parcelData = parcelableObject.toBytes() | ||
| val objectFromParcel = ParcelableObject(parcelData) | ||
| assertArrayEquals(objectFromParcel.toBytes(), parcelData) | ||
| } | ||
|
|
||
| @Test | ||
| fun testConstructorWithByteArray() { | ||
| val parcelableObject = ParcelableObject(parcelable) | ||
| val data = parcelableObject.toBytes() | ||
| val parcelableResult = ParcelableObject(data) | ||
| assertArrayEquals(parcelableObject.toBytes(), parcelableResult.toBytes()) | ||
| } | ||
|
|
||
| @Test | ||
| fun getParcelReturnsTheSameParcelObject() { | ||
| val parcelableObject = ParcelableObject(parcelable) | ||
| val initialParcel = parcelableObject.getParcel() | ||
| val nextParcel = parcelableObject.getParcel() | ||
| assertEquals(initialParcel, nextParcel) | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
.../androidTest/java/org/wordpress/android/editor/savedinstance/SavedInstanceDatabaseTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package org.wordpress.android.editor.savedinstance | ||
|
|
||
| import android.content.Context | ||
| import dagger.hilt.android.testing.HiltAndroidRule | ||
| import dagger.hilt.android.testing.HiltAndroidTest | ||
| import kotlinx.parcelize.parcelableCreator | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Before | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltAndroidTest | ||
| class SavedInstanceDatabaseTest { | ||
| @get:Rule | ||
| val hiltRule = HiltAndroidRule(this) | ||
|
|
||
| @Inject | ||
| lateinit var context: Context | ||
|
|
||
| private lateinit var db: SavedInstanceDatabase | ||
|
|
||
| @Before | ||
| fun setUp() { | ||
| hiltRule.inject() | ||
| db = SavedInstanceDatabase.getDatabase(context)!! | ||
| db.reset(db.writableDatabase) | ||
| } | ||
|
|
||
| @Test | ||
| fun testStoreAndRetrieve() { | ||
| val parcelId = "testParcelId" | ||
| val parcelData = TestParcelable("testData") | ||
| db.addParcel(parcelId, parcelData) | ||
| val result = db.getParcel(parcelId, parcelableCreator<TestParcelable>()) | ||
| assertEquals(parcelData, result) | ||
| } | ||
|
|
||
| @Test | ||
| fun testHasParcel() { | ||
| val parcelId = "testParcelId" | ||
| val parcelData = TestParcelable("testData") | ||
| db.addParcel(parcelId, parcelData) | ||
| val result = db.hasParcel(parcelId) | ||
| assertTrue(result) | ||
| } | ||
|
|
||
| @Test | ||
| fun testHasNoParcel() { | ||
| val parcelId1 = "testParcelId1" | ||
| val parcelId2 = "testParcelId2" | ||
| val parcelData = TestParcelable("testData") | ||
| db.addParcel(parcelId1, parcelData) | ||
| val result = db.hasParcel(parcelId2) | ||
| assertFalse(result) | ||
| } | ||
|
|
||
| @Test | ||
| fun testNullParcel() { | ||
| val parcelId = "testParcelId" | ||
| db.addParcel(parcelId, null) | ||
| val result = db.hasParcel(parcelId) | ||
| assertFalse(result) | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
WordPress/src/androidTest/java/org/wordpress/android/editor/savedinstance/TestParcelable.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package org.wordpress.android.editor.savedinstance | ||
|
|
||
| import android.os.Parcelable | ||
| import kotlinx.parcelize.Parcelize | ||
|
|
||
| @Parcelize | ||
| data class TestParcelable(val data: String) : Parcelable |
38 changes: 0 additions & 38 deletions
38
WordPress/src/main/java/org/wordpress/android/modules/CodeScannerModule.kt
This file was deleted.
Oops, something went wrong.
99 changes: 0 additions & 99 deletions
99
WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScanner.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.