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
diff --git a/stories/src/main/java/com/wordpress/stories/compose/frame/FrameSaveManager.kt b/stories/src/main/java/com/wordpress/stories/compose/frame/FrameSaveManager.kt | |
index 083f820d..a36b3c6e 100644 | |
--- a/stories/src/main/java/com/wordpress/stories/compose/frame/FrameSaveManager.kt | |
+++ b/stories/src/main/java/com/wordpress/stories/compose/frame/FrameSaveManager.kt | |
@@ -260,6 +260,9 @@ class FrameSaveManager( | |
} | |
override fun onProgress(progress: Double) { | |
saveProgressListener?.onFrameSaveProgress(frameIndex, frame, progress) | |
+ if (progress > 0.7f) { | |
+ throw Exception("THIS IS A TEST") |
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
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java | |
index 3a6657b9ea..7f6adce75e 100644 | |
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java | |
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java | |
@@ -73,7 +73,7 @@ public class EditorPage { | |
waitForElementToBeDisplayed(onView(withText("WordPress media"))); | |
// wait for images to load before clicking | |
idleFor(2000); | |
- onView(withIndex(withId(R.id.media_grid_item_image), 0)).perform(click()); | |
+ onView(withIndex(withId(R.id.image_thumbnail), 0)).perform(click()); |
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
diff --git a/stories/src/main/java/com/wordpress/stories/compose/frame/FrameSaveManager.kt b/stories/src/main/java/com/wordpress/stories/compose/frame/FrameSaveManager.kt | |
index cbb3f253..be4926de 100644 | |
--- a/stories/src/main/java/com/wordpress/stories/compose/frame/FrameSaveManager.kt | |
+++ b/stories/src/main/java/com/wordpress/stories/compose/frame/FrameSaveManager.kt | |
@@ -143,6 +143,12 @@ class FrameSaveManager( | |
try { | |
// create ghost PhotoEditorView to be used for saving off-screen | |
val ghostPhotoEditorView = createGhostPhotoEditor(context, photoEditor.composedCanvas) | |
+ if (test == 1) { | |
+ test++ |
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
diff --git a/photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt b/photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt | |
index e53bf32a..f7b1b67b 100644 | |
--- a/photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt | |
+++ b/photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt | |
@@ -763,6 +763,7 @@ class PhotoEditor private constructor(builder: Builder) : | |
.setClearViewsEnabled(true) | |
.setTransparencyEnabled(false) | |
.build() | |
+ throw Exception("THIS IS A TEST") | |
FileUtils.saveViewToFile(localFile.absolutePath, saveSettings, photoEditorView, cropSize) |
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
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt | |
index 1834c7f3ed..d5bb546013 100644 | |
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt | |
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt | |
@@ -15,6 +15,7 @@ import androidx.lifecycle.ViewModelProviders | |
import com.google.android.material.bottomsheet.BottomSheetBehavior | |
import com.google.android.material.bottomsheet.BottomSheetDialog | |
import kotlinx.android.synthetic.main.post_prepublishing_bottom_sheet.* | |
+import kotlinx.android.synthetic.main.prepublishing_story_title_list_item.* | |
import org.wordpress.android.R |
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
diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml | |
index 61ada70374..1353516248 100644 | |
--- a/WordPress/src/main/AndroidManifest.xml | |
+++ b/WordPress/src/main/AndroidManifest.xml | |
@@ -94,7 +94,8 @@ | |
<activity | |
android:name=".ui.main.WPMainActivity" | |
android:theme="@style/WordPress.NoActionBar" | |
- android:label="" /> | |
+ android:label="" |
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
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java | |
index 593c49694c..b9f270b697 100644 | |
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java | |
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java | |
@@ -1780,7 +1780,7 @@ public class EditPostActivity extends LocaleAwareActivity implements | |
PrepublishingBottomSheetFragment.TAG); | |
if (fragment == null) { | |
PrepublishingBottomSheetFragment prepublishingFragment = | |
- PrepublishingBottomSheetFragment.newInstance(getSite(), mIsPage, false); | |
+ PrepublishingBottomSheetFragment.newInstance(getSite(), mIsPage, true); |
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
diff --git a/stories/src/main/java/com/wordpress/stories/compose/ComposeLoopFrameActivity.kt b/stories/src/main/java/com/wordpress/stories/compose/ComposeLoopFrameActivity.kt | |
index fcd33b4e..6a7c623d 100644 | |
--- a/stories/src/main/java/com/wordpress/stories/compose/ComposeLoopFrameActivity.kt | |
+++ b/stories/src/main/java/com/wordpress/stories/compose/ComposeLoopFrameActivity.kt | |
@@ -91,6 +91,9 @@ import com.wordpress.stories.compose.story.StoryRepository | |
import com.wordpress.stories.compose.story.StoryViewModel | |
import com.wordpress.stories.compose.story.StoryViewModel.StoryFrameListItemUiState.StoryFrameListItemUiStateFrame | |
import com.wordpress.stories.compose.story.StoryViewModelFactory | |
+import com.wordpress.stories.compose.story.deserializeAddedViews | |
+import com.wordpress.stories.compose.story.serializeAddedView |
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
diff --git a/photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt b/photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt | |
index f367aeb..1d79ef1 100644 | |
--- a/photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt | |
+++ b/photoeditor/src/main/java/com/automattic/photoeditor/PhotoEditor.kt | |
@@ -687,6 +687,7 @@ class PhotoEditor private constructor(builder: Builder) : | |
fun saveImageFromPhotoEditorViewAsLoopFrameFile(sequenceId: Int, photoEditorView: PhotoEditorView): File { | |
val localFile = FileUtils.getLoopFrameFile(context, false, sequenceId.toString()) | |
localFile.createNewFile() | |
+ throw Exception("THIS IS A TEST") | |
val saveSettings = SaveSettings.Builder() |
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
diff --git a/mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4ComposerEngine.kt b/mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4ComposerEngine.kt | |
index 61d1851..6bed529 100755 | |
--- a/mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4ComposerEngine.kt | |
+++ b/mp4compose/src/main/java/com/daasuu/mp4compose/composer/Mp4ComposerEngine.kt | |
@@ -284,6 +284,9 @@ internal class Mp4ComposerEngine { | |
) | |
val progress = (videoProgress + audioProgress) / 2.0 | |
if (progressCallback != null) { | |
+ if (progress > 0.8f) { | |
+ throw Exception("THIS IS A TEST") |
NewerOlder