diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 5a738d8e3719..6329c75f8e74 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -38,7 +38,6 @@ repositories { includeGroup "org.wordpress.gutenberg-mobile" includeGroupByRegex "org.wordpress.react-native-libraries.*" includeGroup "com.automattic" - includeGroup "com.automattic.stories" includeGroup "com.automattic.tracks" } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/buttons/ImageButton.kt b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/buttons/ImageButton.kt index b48e648319ac..8ec3f0f00af8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/buttons/ImageButton.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/buttons/ImageButton.kt @@ -39,10 +39,10 @@ fun PreviewDrawButton() { Color.Gray, shape = RoundedCornerShape(6.dp) ), - drawableLeft = Drawable(R.drawable.ic_story_icon_24dp), - drawableRight = Drawable(R.drawable.ic_story_icon_24dp), - drawableTop = Drawable(R.drawable.ic_story_icon_24dp), - drawableBottom = Drawable(R.drawable.ic_story_icon_24dp), + drawableLeft = Drawable(R.drawable.ic_pages_white_24dp), + drawableRight = Drawable(R.drawable.ic_pages_white_24dp), + drawableTop = Drawable(R.drawable.ic_pages_white_24dp), + drawableBottom = Drawable(R.drawable.ic_pages_white_24dp), button = Button(text = UiString.UiStringText("Button Text")), onClick = {} ) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt index 77ac0aa5d5c1..d35ba2380565 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/menu/MenuActivity.kt @@ -425,7 +425,7 @@ fun MySiteListItemPreviewWithSecondaryImage() { MenuItemState.MenuListItem( primaryIcon = R.drawable.ic_posts_white_24dp, primaryText = UiString.UiStringText("Plans"), - secondaryIcon = R.drawable.ic_story_icon_24dp, + secondaryIcon = R.drawable.ic_pages_white_24dp, secondaryText = null, showFocusPoint = false, onClick = ListItemInteraction.create { onClick() }, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt index 54199ca408bb..37400630c2df 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt @@ -203,7 +203,6 @@ class PhotoPickerFragment : Fragment(R.layout.photo_picker_fragment) { ) { isShowingActionMode = false } - setupFab(uiState.fabUiModel) setupPartialAccessPrompt(uiState.isPartialMediaAccessPromptVisible) } } @@ -255,18 +254,6 @@ class PhotoPickerFragment : Fragment(R.layout.photo_picker_fragment) { } } - @Suppress("DEPRECATION") - private fun PhotoPickerFragmentBinding.setupFab(fabUiModel: PhotoPickerViewModel.FabUiModel) { - if (fabUiModel.show) { - wpStoriesTakePicture.visibility = View.VISIBLE - wpStoriesTakePicture.setOnClickListener { - fabUiModel.action() - } - } else { - wpStoriesTakePicture.visibility = View.GONE - } - } - private fun PhotoPickerFragmentBinding.setupPartialAccessPrompt(isVisible: Boolean) { partialMediaAccessPrompt.root.isVisible = isVisible partialMediaAccessPrompt.partialAccessPromptSelectMoreButton.setOnClickListener { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt index 5d776d26dd2c..1c73533f5935 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt @@ -96,9 +96,6 @@ class PhotoPickerViewModel @Inject constructor( softAskRequest?.show == true, ), buildSoftAskView(softAskRequest), - FabUiModel(selectedIds.isNullOrEmpty()) { - clickIcon(PhotoPickerFragment.PhotoPickerIcon.ANDROID_CAPTURE_PHOTO) - }, buildActionModeUiModel(selectedIds), progressDialogModel ?: ProgressDialogUiModel.Hidden, showPartialAccessPrompt ?: false, @@ -406,7 +403,6 @@ class PhotoPickerViewModel @Inject constructor( items.add(PopupMenuUiModel.PopupMenuItem(UiStringRes(R.string.photo_picker_stock_media)) { clickIcon(PhotoPickerFragment.PhotoPickerIcon.STOCK_MEDIA) }) - // only show GIF picker from Tenor if this is NOT the WPStories picker items.add(PopupMenuUiModel.PopupMenuItem(UiStringRes(R.string.photo_picker_gif)) { clickIcon(PhotoPickerFragment.PhotoPickerIcon.GIF) }) @@ -527,7 +523,6 @@ class PhotoPickerViewModel @Inject constructor( val photoListUiModel: PhotoListUiModel, val bottomBarUiModel: BottomBarUiModel, val softAskViewUiModel: SoftAskViewUiModel, - val fabUiModel: FabUiModel, val actionModeUiModel: ActionModeUiModel, val progressDialogUiModel: ProgressDialogUiModel, val isPartialMediaAccessPromptVisible: Boolean, @@ -564,8 +559,6 @@ class PhotoPickerViewModel @Inject constructor( object Hidden : SoftAskViewUiModel() } - data class FabUiModel(val show: Boolean, val action: () -> Unit) - sealed class ActionModeUiModel { data class Visible( val actionModeTitle: UiString? = null, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeAdapter.kt index 4d69e1726072..4640213c87e6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeAdapter.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeAdapter.kt @@ -9,7 +9,6 @@ import org.wordpress.android.ui.posts.prepublishing.home.PrepublishingHomeItemUi import org.wordpress.android.ui.posts.prepublishing.home.PrepublishingHomeItemUiState.HeaderUiState import org.wordpress.android.ui.posts.prepublishing.home.PrepublishingHomeItemUiState.HomeUiState import org.wordpress.android.ui.posts.prepublishing.home.PrepublishingHomeItemUiState.SocialUiState -import org.wordpress.android.ui.posts.prepublishing.home.PrepublishingHomeItemUiState.StoryTitleUiState import org.wordpress.android.ui.posts.prepublishing.home.PrepublishingHomeViewHolder.PrepublishingHeaderListItemViewHolder import org.wordpress.android.ui.posts.prepublishing.home.PrepublishingHomeViewHolder.PrepublishingHomeListItemViewHolder import org.wordpress.android.ui.posts.prepublishing.home.PrepublishingHomeViewHolder.PrepublishingSocialItemViewHolder @@ -71,8 +70,6 @@ class PrepublishingHomeAdapter(context: Context) : RecyclerView.Adapter VIEW_TYPE_HOME_ITEM is ButtonUiState -> VIEW_TYPE_SUBMIT_BUTTON is SocialUiState -> VIEW_TYPE_SOCIAL_ITEM - is StoryTitleUiState -> - throw IllegalStateException("StoryTitleUiState is not supported by the PrepublishingHomeAdapter") } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeItemUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeItemUiState.kt index dc7e476886b6..080079c47ef6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeItemUiState.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeItemUiState.kt @@ -23,13 +23,6 @@ sealed class PrepublishingHomeItemUiState( val onNavigationActionClicked: ((navigationAction: ActionType.PrepublishingScreenNavigation) -> Unit)? ) : PrepublishingHomeItemUiState() - data class StoryTitleUiState( - val storyThumbnailUrl: String, - val storyTitle: UiStringText? = null, - val onStoryTitleChanged: (String) -> Unit - ) : - PrepublishingHomeItemUiState() - data class HeaderUiState(val siteName: UiStringText, val siteIconUrl: String) : PrepublishingHomeItemUiState() diff --git a/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_1.png b/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_1.png deleted file mode 100644 index 9a8f74d1815a..000000000000 Binary files a/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_1.png and /dev/null differ diff --git a/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_2.png b/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_2.png deleted file mode 100644 index a6c71d049118..000000000000 Binary files a/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_2.png and /dev/null differ diff --git a/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_1.png b/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_1.png deleted file mode 100644 index 12260bf4b1a7..000000000000 Binary files a/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_1.png and /dev/null differ diff --git a/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_2.png b/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_2.png deleted file mode 100644 index c76abd7dc35d..000000000000 Binary files a/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_2.png and /dev/null differ diff --git a/WordPress/src/main/res/drawable/ic_story_icon_24dp.xml b/WordPress/src/main/res/drawable/ic_story_icon_24dp.xml deleted file mode 100644 index 4d942d7a9879..000000000000 --- a/WordPress/src/main/res/drawable/ic_story_icon_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/WordPress/src/main/res/drawable/story_title_thumbnail_background.xml b/WordPress/src/main/res/drawable/story_title_thumbnail_background.xml deleted file mode 100644 index 360cb021b1b2..000000000000 --- a/WordPress/src/main/res/drawable/story_title_thumbnail_background.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/WordPress/src/main/res/layout/photo_picker_fragment.xml b/WordPress/src/main/res/layout/photo_picker_fragment.xml index 27ad3bba67f1..c9aced51132c 100644 --- a/WordPress/src/main/res/layout/photo_picker_fragment.xml +++ b/WordPress/src/main/res/layout/photo_picker_fragment.xml @@ -6,18 +6,6 @@ android:layout_height="match_parent" android:orientation="vertical"> - - diff --git a/WordPress/src/main/res/layout/prepublishing_story_title_list_item.xml b/WordPress/src/main/res/layout/prepublishing_story_title_list_item.xml deleted file mode 100644 index feb1cb71bd20..000000000000 --- a/WordPress/src/main/res/layout/prepublishing_story_title_list_item.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/WordPress/src/main/res/layout/stories_intro_dialog_fragment.xml b/WordPress/src/main/res/layout/stories_intro_dialog_fragment.xml deleted file mode 100644 index 0d0cedce5388..000000000000 --- a/WordPress/src/main/res/layout/stories_intro_dialog_fragment.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index e3ac76c2201e..017bec1fcfa2 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -14,7 +14,6 @@ @dimen/fab_margin_default 16dp - 64dp 24dp 56dp @@ -624,10 +623,6 @@ 4dp 350dp 250dp - 72dp - 48dp - 6dp - 10dp -54dp diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 2532c9731078..0a5e0b5da46f 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -3638,84 +3638,10 @@ Blogging Can\'t decide? You can change the theme at any time. - - Limited Story Editing - This story was edited on a different device and the ability to edit certain objects may be limited. - Can\'t edit Story - Unable to load media for this story. Check your internet connection and try again in a moment. - Can\'t edit Story - We couldn\'t find the media for this story on the site. - GIF files not supported - One or more slides have not been added to your Story because Stories don\'t support GIF files at the moment. Please choose a static image or video background instead. - Story being saved, please wait… - Capture - Flip camera - Flash - Stickers - Text - Sound - Flip - Flash - Saving - Saved - Retry - Saved to photos - SHARE - Share to Close - Saved - Retry - Slide - unselected - selected - errored - Change text alignment - Change text color - Delete story slide? - This slide will be removed from your story. - This slide has not been saved yet. If you delete this slide, you will lose any edits you have made. - Delete - Discard story post? - Your story post will not be saved as a draft. - Discard - pref_camera_selection - pref_flash_mode_selection - Untitled - Saving "%1$s"… - several stories - 1 slide remaining - %1$d slides remaining - Uploading "%1$s"… - "%1$s" published - Unable to upload "%1$s" - Unable to upload "%1$s" - 1 slide requires action - %1$d slides require action - Manage - Unable to save 1 slide - Unable to save %1$d slides - Retry saving or delete the slides, then try publishing your story again. - Insufficient device storage - We need to save the story on your device before it can be published. Review your storage settings and remove files to free up space. - View Storage - Couldn\'t find Story slide - Operation in progress, try again - Error saving image - Video could not be saved This device doesn\'t support Camera2 API. An error occurred while playing your video - - Introducing Story Posts - A new way to create and publish engaging content on your site. - How to create a story post - Example story title - Now stories are for everyone - Combine photos, videos, and text to create engaging and tappable story posts that your visitors will love. - Story posts don\'t disappear - They\’re published as a new blog post on your site so your audience never misses out on a thing. - Create Story Post - %1$s (%2$s) @@ -4079,21 +4005,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> You can edit this block using the web version of the editor. You can rearrange blocks by tapping a block and then tapping the up and down arrows that appear on the bottom left side of the block to move it above or below other blocks. - You need to grant the app audio recording permission in order to record video - Casual - Classic - Strong - Playful - Modern - Bold - Delete - Next Done - Discard changes? - Any changes made will not be saved. - Discard - Text - Background Backup Download @@ -4139,7 +4051,6 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Cloud with X icon icon - Upload Restore diff --git a/build.gradle b/build.gradle index 34b7ee671d95..55e44ebe956c 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,6 @@ ext { // libs automatticAboutVersion = '1.4.0' automatticRestVersion = '1.0.8' - automatticStoriesVersion = '2.4.0' automatticTracksVersion = '3.4.0' gutenbergMobileVersion = 'v1.113.0-alpha1' wordPressAztecVersion = 'v2.0' diff --git a/config/lint/baseline.xml b/config/lint/baseline.xml index ae0f4110297a..ad56c7223528 100644 --- a/config/lint/baseline.xml +++ b/config/lint/baseline.xml @@ -1057,17 +1057,6 @@ column="9"/> - - - -