From a8eb51309161658a11ed156c0680b56f75f1da98 Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Tue, 10 Aug 2021 17:37:09 +0300 Subject: [PATCH] Refact | Renamings (#1726) --- .../features/editor/ClipboardTesting.kt | 16 ++-- .../features/editor/CreateBlockTesting.kt | 16 ++-- .../editor/CreateRelationBlockTesting.kt | 12 +-- .../features/editor/DeleteBlockTesting.kt | 18 ++-- .../features/editor/DescriptionTesting.kt | 10 +- .../editor/EditorIntegrationTesting.kt | 24 ++--- .../editor/FeaturedRelationTesting.kt | 8 +- .../anytype/features/editor/LayoutTesting.kt | 8 +- .../features/editor/ListBlockTesting.kt | 18 ++-- .../features/editor/MergeBlockTesting.kt | 32 +++---- .../features/editor/RelationBlockUITesting.kt | 22 ++--- .../features/editor/ScrollAndMoveTesting.kt | 10 +- .../editor/SlashTextWatcherTesting.kt | 28 +++--- .../features/editor/SlashWidgetTesting.kt | 44 ++++----- .../features/editor/SplitBlockTesting.kt | 48 +++++----- .../features/editor/base/EditorTestSetup.kt | 30 +++--- .../editor/base/TestEditorFragment.kt | 16 ++++ .../features/editor/base/TestPageFragment.kt | 16 ---- .../emoji/DocumentEmojiPickerFragmentTest.kt | 4 +- .../emoji/TestDocumentEmojiPickerFragment.kt | 4 +- .../relations/AddRelationStatusValueTest.kt | 2 +- .../relations/AddRelationTagValueTest.kt | 2 +- .../DisplayRelationStatusValueTest.kt | 2 +- .../relations/DisplayRelationTagValueTest.kt | 2 +- .../relations/EditRelationTagValueTest.kt | 2 +- .../relations/ObjectRelationListTest.kt | 6 +- .../anytypeio/anytype/utils/EspressoExt.kt | 2 +- .../DefaultGradientCollectionProvider.kt | 2 +- .../anytype/di/common/ComponentManager.kt | 36 +++---- .../anytypeio/anytype/di/feature/ArchiveDI.kt | 10 +- .../anytype/di/feature/CreateBookmarkDI.kt | 4 +- .../anytype/di/feature/DashboardDi.kt | 8 +- .../di/feature/DocumentAddNewBlockDi.kt | 4 +- .../di/feature/DocumentEmojiIconPickerDI.kt | 6 +- .../di/feature/DocumentIconActionMenuDI.kt | 8 +- .../di/feature/{PageDI.kt => EditorDI.kt} | 36 +++---- .../anytypeio/anytype/di/feature/LinkAddDI.kt | 4 +- .../anytype/di/feature/ObjectCoverDI.kt | 4 +- .../anytype/di/feature/ObjectLayoutDI.kt | 6 +- .../anytype/di/feature/ObjectMenuDI.kt | 9 +- .../anytype/di/feature/ObjectRelationDI.kt | 4 +- .../anytype/di/feature/ObjectTypeDI.kt | 4 +- .../anytype/di/feature/SelectDocCoverDI.kt | 6 +- .../di/feature/UploadDocCoverImageDI.kt | 4 +- .../anytype/di/main/MainComponent.kt | 2 +- .../com/anytypeio/anytype/ext/MarkupExt.kt | 6 +- .../anytypeio/anytype/navigation/Navigator.kt | 10 +- .../DefaultCoverImageHashProvider.kt | 2 +- .../ui/alert/AlertUpdateAppFragment.kt | 2 +- .../anytype/ui/archive/ArchiveFragment.kt | 6 +- .../DashboardAdapter.kt | 6 +- .../DashboardDragAndDropBehavior.kt | 2 +- .../DashboardFragment.kt} | 28 +++--- .../{desktop => dashboard}/DashboardPager.kt | 2 +- .../DashboardProfileAdapter.kt | 4 +- .../{desktop => dashboard}/DesktopDiffUtil.kt | 4 +- .../ProfileContainerAdapter.kt | 2 +- .../EditorFragment.kt} | 66 +++++++------ .../cover/DocCoverGalleryFragment.kt | 6 +- .../cover/DocCoverSliderFragment.kt | 4 +- .../cover/UploadCoverImageFragment.kt | 4 +- .../gallery/FullScreenPictureFragment.kt | 2 +- .../layout/ObjectLayoutFragment.kt | 4 +- .../modals/AddBlockFragment.kt | 12 +-- .../modals/CreateBookmarkFragment.kt | 8 +- .../modals/ObjectIconPickerBaseFragment.kt | 14 +-- .../SelectProgrammingLanguageFragment.kt | 8 +- .../modals/SetLinkFragment.kt | 10 +- .../modals/TurnIntoFragment.kt | 8 +- .../modals/actions/BlockActionToolbar.kt | 14 +-- .../actions/BlockActionToolbarFactory.kt | 8 +- .../actions/BlockActionToolbarHelper.kt | 2 +- .../actions/BookmarkBlockActionToolbar.kt | 4 +- .../actions/BulletedBlockActionToolbar.kt | 4 +- .../actions/CheckBoxBlockActionToolbar.kt | 4 +- .../modals/actions/CodeBlockActionToolbar.kt | 4 +- .../actions/DividerLineBlockActionToolbar.kt | 4 +- .../actions/DocumentIconActionMenuFragment.kt | 12 +-- .../modals/actions/ErrorActionToolbar.kt | 6 +- .../modals/actions/FileBlockActionToolbar.kt | 6 +- .../actions/HeaderOneBlockActionToolbar.kt | 5 +- .../actions/HeaderThreeBlockActionToolbar.kt | 4 +- .../actions/HeaderTwoBlockActionToolbar.kt | 4 +- .../actions/HighlightBlockActionToolbar.kt | 4 +- .../actions/NumberedBlockActionToolbar.kt | 4 +- .../actions/PageArchiveBlockActionToolbar.kt | 6 +- .../modals/actions/PageBlockActionToolbar.kt | 4 +- .../actions/ParagraphBlockActionToolbar.kt | 4 +- .../actions/PictureBlockActionToolbar.kt | 4 +- .../actions/PlaceholderActionToolbar.kt | 12 +-- .../actions/ProfileIconActionMenuFragment.kt | 8 +- .../actions/RelationDefaultActionToolbar.kt | 6 +- .../RelationPlaceholderActionToolbar.kt | 4 +- .../actions/ToggleBlockActionToolbar.kt | 4 +- .../modals/actions/UploadActionToolbar.kt | 6 +- .../modals/actions/VideoBlockActionToolbar.kt | 6 +- .../sheets/ObjectMenuBaseFragment.kt | 14 +-- .../anytype/ui/menu/AnytypeContextMenu.kt | 2 +- .../ObjectTypeChangeFragment.kt | 12 +-- .../ui/relations/RelationListFragment.kt | 2 +- .../ui/relations/RelationValueBaseFragment.kt | 6 +- .../anytype/ui/sets/ObjectSetFragment.kt | 8 +- .../ui/sets/ObjectSetIconPickerFragment.kt | 6 +- .../anytype/ui/sets/ObjectSetMenuFragment.kt | 4 +- ...ent_desktop.xml => fragment_dashboard.xml} | 2 +- .../res/layout/fragment_doc_cover_slider.xml | 2 +- ...{fragment_page.xml => fragment_editor.xml} | 2 +- app/src/main/res/navigation/graph.xml | 16 ++-- ...scene.xml => fragment_dashboard_scene.xml} | 0 .../com/anytypeio/anytype/ActionBarTest.kt | 8 +- .../anytypeio/anytype/MarkupExtractTest.kt | 4 +- .../anytypeio/anytype/core_ui/common/Color.kt | 4 +- .../anytype/core_ui/common/Markup.kt | 4 +- .../extensions/TextInputWidgetExtension.kt | 2 +- .../core_ui/extensions/ViewExtension.kt | 2 +- .../features/archive/ArchiveAdapter.kt | 12 +-- .../holders/DVGridCellStatusHolder.kt | 2 +- .../dataview/holders/DVGridCellTagHolder.kt | 2 +- .../dataview/modals/FilterStatusViewHolder.kt | 2 +- .../dataview/modals/FilterTagViewHolder.kt | 2 +- .../features/{page => editor}/BlockAdapter.kt | 94 +++++++++---------- .../{page => editor}/BlockTextAdapter.kt | 2 +- .../{page => editor}/BlockViewDiffUtil.kt | 14 +-- .../{page => editor}/BlockViewHolder.kt | 10 +- .../features/{page => editor}/Focus.kt | 2 +- .../{page => editor}/MarkupColorAdapter.kt | 6 +- .../features/{page => editor}/MarkupMapper.kt | 6 +- .../{page => editor}/SupportNesting.kt | 2 +- .../{page => editor}/TextBlockHolder.kt | 16 ++-- .../TurnIntoActionReceiver.kt | 4 +- .../editor/holders/error/BookmarkError.kt | 4 +- .../editor/holders/error/FileError.kt | 4 +- .../editor/holders/error/MediaError.kt | 10 +- .../editor/holders/error/PictureError.kt | 4 +- .../editor/holders/error/VideoError.kt | 4 +- .../holders/ext/EditorHolderExtensions.kt | 6 +- .../editor/holders/interface/TextHolder.kt | 8 +- .../features/editor/holders/media/Bookmark.kt | 12 +-- .../features/editor/holders/media/File.kt | 8 +- .../features/editor/holders/media/Media.kt | 10 +- .../features/editor/holders/media/Picture.kt | 4 +- .../features/editor/holders/media/Video.kt | 4 +- .../features/editor/holders/other/Code.kt | 10 +- .../features/editor/holders/other/Divider.kt | 6 +- .../editor/holders/other/DividerDots.kt | 4 +- .../editor/holders/other/DividerLine.kt | 4 +- .../features/editor/holders/other/Page.kt | 12 +-- .../editor/holders/other/PageArchive.kt | 14 +-- .../features/editor/holders/other/Title.kt | 10 +- .../placeholders/BookmarkPlaceholder.kt | 4 +- .../holders/placeholders/FilePlaceholder.kt | 4 +- .../holders/placeholders/MediaPlaceholder.kt | 10 +- .../placeholders/PicturePlaceholder.kt | 4 +- .../holders/placeholders/VideoPlaceholder.kt | 4 +- .../FeaturedRelationListViewHolder.kt | 6 +- .../holders/relations/RelationViewHolder.kt | 6 +- .../features/editor/holders/text/Bulleted.kt | 14 +-- .../features/editor/holders/text/Checkbox.kt | 12 +-- .../editor/holders/text/Description.kt | 4 +- .../features/editor/holders/text/Header.kt | 14 +-- .../features/editor/holders/text/Highlight.kt | 12 +-- .../features/editor/holders/text/Numbered.kt | 16 ++-- .../features/editor/holders/text/Paragraph.kt | 10 +- .../features/editor/holders/text/Text.kt | 10 +- .../features/editor/holders/text/Toggle.kt | 14 +-- .../editor/holders/upload/FileUpload.kt | 4 +- .../editor/holders/upload/MediaUpload.kt | 10 +- .../editor/holders/upload/PictureUpload.kt | 4 +- .../editor/holders/upload/VideoUpload.kt | 4 +- .../modal/AddBlockOrTurnIntoAdapter.kt | 16 ++-- .../modal/DocCoverGalleryAdapter.kt | 8 +- .../modal/SelectProgrammingLanguageAdapter.kt | 4 +- .../DefaultScrollAndMoveTargetDescriptor.kt | 6 +- .../ScrollAndMoveStateListener.kt | 2 +- .../ScrollAndMoveTargetHighlighter.kt | 14 +-- .../slash/SlashActionsAdapter.kt | 8 +- .../slash/SlashAlignmentAdapter.kt | 8 +- .../slash/SlashBaseAdapter.kt | 6 +- .../slash/SlashColorAdapter.kt | 8 +- .../slash/SlashMainAdapter.kt | 6 +- .../slash/SlashMediaAdapter.kt | 8 +- .../slash/SlashObjectTypesAdapter.kt | 7 +- .../slash/SlashOtherAdapter.kt | 8 +- .../slash/SlashRelationsAdapter.kt | 6 +- .../slash/SlashStyleAdapter.kt | 8 +- .../{page => editor}/slash/SlashWidget.kt | 6 +- .../slash/holders/ActionMenuHolder.kt | 4 +- .../slash/holders/AlignMenuHolder.kt | 4 +- .../slash/holders/ColorMenuHolder.kt | 6 +- .../slash/holders/MainMenuHolder.kt | 4 +- .../slash/holders/MediaMenuHolder.kt | 4 +- .../slash/holders/ObjectTypeMenuHolder.kt | 4 +- .../slash/holders/OtherMenuHolder.kt | 4 +- .../holders/RelationsSubheaderMenuHolder.kt | 2 +- .../slash/holders/StyleMenuHolder.kt | 4 +- .../slash/holders/SubheaderMenuHolder.kt | 4 +- .../ObjectActionAdapter.kt | 4 +- .../ObjectTypeBaseAdapter.kt | 6 +- .../holders/ObjectTypeHolder.kt | 4 +- .../holders/FeaturedRelationViewHolder.kt | 2 +- .../features/sets/CreateFilterAdapter.kt | 2 +- .../core_ui/menu/TextBlockContextMenu.kt | 2 +- .../anytype/core_ui/tools/TextWatchers.kt | 2 +- .../core_ui/widgets/BlockActionBarItem.kt | 2 +- .../widgets/FeaturedRelationGroupWidget.kt | 6 +- .../core_ui/widgets/ObjectCardIconWidget.kt | 2 +- .../core_ui/widgets/ObjectIconWidget.kt | 2 +- .../core_ui/widgets/StyleToolbarMainWidget.kt | 2 +- .../core_ui/widgets/text/StatusWidget.kt | 2 +- .../anytype/core_ui/widgets/text/TagWidget.kt | 3 +- .../toolbar/MarkupColorToolbarWidget.kt | 6 +- .../widgets/toolbar/MarkupToolbarWidget.kt | 6 +- .../widgets/toolbar/SearchToolbarWidget.kt | 2 +- .../toolbar/StyleToolbarExtraWidget.kt | 10 +- .../widgets/toolbar/adapter/MentionAdapter.kt | 2 +- .../widgets/toolbar/style/StyleAdapter.kt | 12 +-- .../style/StyleBackgroundViewHolder.kt | 4 +- .../toolbar/style/StyleColorToolbarWidget.kt | 6 +- .../toolbar/style/StyleTextColorViewHolder.kt | 4 +- .../anytype/core_ui/BlockAdapterTest.kt | 24 ++--- .../anytype/core_ui/BlockViewDiffUtilTest.kt | 12 +-- .../core_ui/BlockViewSearchTextTest.kt | 6 +- .../core_ui/DefaultPatternMatcherTest.kt | 4 +- .../anytype/core_ui/HeaderBlockTest.kt | 10 +- .../anytype/core_ui/HighlightingBlockTest.kt | 8 +- .../anytype/core_ui/MarkupExtTest.kt | 2 +- .../anytype/core_ui/common/SpanTest.kt | 2 +- .../editor/BlockAdapterCheckboxTest.kt | 8 +- .../editor/BlockAdapterCursorBindingTest.kt | 4 +- .../editor/BlockAdapterIndentationTest.kt | 4 +- .../editor/BlockAdapterMovementMethodTest.kt | 6 +- .../editor/BlockAdapterNumberedListTest.kt | 4 +- .../editor/BlockAdapterReadWriteModeTest.kt | 4 +- .../features/editor/BlockAdapterTestSetup.kt | 3 +- .../editor/BlockAdapterTextBindingTest.kt | 3 +- .../editor/BlockAdapterTextColorTest.kt | 6 +- .../features/editor/BlockAdapterToggleTest.kt | 4 +- .../features/editor/TextBlockSetTextTest.kt | 5 +- .../features/navigation/PageLinkViewKtTest.kt | 2 +- .../core_ui/features/page/BlockViewTest.kt | 3 +- ...til.kt => ObjectIconPickerViewDiffUtil.kt} | 4 +- .../ui/DocumentEmojiIconPickerAdapter.kt | 6 +- .../ui/DocumentEmojiIconPickerViewHolder.kt | 2 +- ...DocumentEmojiIconPickerViewDiffUtilTest.kt | 6 +- .../{desktop => dashboard}/Dashboard.kt | 4 +- .../{desktop => dashboard}/DashboardView.kt | 4 +- .../HomeDashboardEventConverter.kt | 2 +- .../HomeDashboardStateMachine.kt | 4 +- .../HomeDashboardViewModel.kt | 10 +- .../HomeDashboardViewModelFactory.kt | 2 +- .../CloseableCoroutineScope.kt | 2 +- .../{page => editor}/ControlPanelMachine.kt | 24 ++--- .../DocumentExternalEventReducer.kt | 2 +- .../presentation/{page => editor}/Editor.kt | 11 +-- .../EditorViewModel.kt} | 84 ++++++++--------- .../EditorViewModelFactory.kt} | 16 ++-- .../{page => editor}/LinkAddViewModel.kt | 2 +- .../{page => editor}/TurnIntoConstants.kt | 4 +- .../archive/ArchiveViewModel.kt | 24 ++--- .../archive/ArchiveViewModelFactory.kt | 8 +- .../bookmark/CreateBookmarkViewModel.kt | 4 +- .../{page => editor}/cover/CoverColor.kt | 2 +- .../{page => editor}/cover/CoverGradient.kt | 2 +- .../cover/CoverImageHashProvider.kt | 2 +- .../cover/DocCoverGalleryView.kt | 2 +- .../cover/SelectDocCoverViewModel.kt | 4 +- .../cover/UploadDocCoverImageViewModel.kt | 2 +- .../editor/BlockDimensions.kt | 2 +- .../{page => editor}/editor/Command.kt | 5 +- .../{page => editor}/editor/Converter.kt | 2 +- .../editor/DetailModificator.kt | 4 +- .../{page => editor}/editor/ErrorViewState.kt | 2 +- .../{page => editor}/editor/Intent.kt | 2 +- .../{page => editor}/editor/Interactor.kt | 10 +- .../{page => editor}/editor/Markup.kt | 2 +- .../{page => editor}/editor/Orchestrator.kt | 4 +- .../{page => editor}/editor/Proxy.kt | 4 +- .../{page => editor}/editor/SideEffect.kt | 2 +- .../{page => editor}/editor/Store.kt | 6 +- .../{page => editor}/editor/ThemeColor.kt | 2 +- .../{page => editor}/editor/Transformation.kt | 4 +- .../{page => editor}/editor/ViewState.kt | 4 +- .../editor/actions/ActionItemType.kt | 2 +- .../editor/control/ControlPanelState.kt | 14 +-- .../editor/ext/BlockViewExt.kt | 12 +-- .../editor/listener/ListenerType.kt | 6 +- .../editor/mention/MentionEvent.kt | 2 +- .../editor/mention/MentionExt.kt | 4 +- .../editor/editor/model/Alignment.kt | 3 + .../editor/model/BlockView.kt | 92 +++++++++--------- .../editor/model/Checkable.kt | 2 +- .../editor/model/Focusable.kt | 2 +- .../{page => editor}/editor/model/Types.kt | 2 +- .../{page => editor}/editor/model/UiBlock.kt | 2 +- .../editor/pattern/DefaultPatternMatcher.kt | 2 +- .../editor/pattern/Matcher.kt | 2 +- .../editor/pattern/Pattern.kt | 2 +- .../editor/sam/ScrollAndMoveTarget.kt | 2 +- .../sam/ScrollAndMoveTargetDescriptor.kt | 2 +- .../editor/search/SearchInDocEvent.kt | 2 +- .../editor/slash/SlashEvent.kt | 2 +- .../editor/slash/SlashExtensions.kt | 8 +- .../editor/slash/SlashItem.kt | 4 +- .../editor/styling/StyleConfig.kt | 6 +- .../editor/styling/StylingEvent.kt | 4 +- .../editor/editor/styling/StylingMode.kt | 5 + .../editor/styling/StylingType.kt | 2 +- .../layout/ObjectLayoutViewModel.kt | 4 +- .../markup/MarkupColorView.kt | 2 +- .../markup/MarkupStyleDescriptor.kt | 2 +- .../{page => editor}/model/TextUpdate.kt | 2 +- .../{page => editor}/picker/AddBlockView.kt | 4 +- .../picker/DocumentAddBlockViewModel.kt | 8 +- .../picker/DocumentIconActionMenuViewModel.kt | 8 +- .../DocumentIconActionMenuViewModelFactory.kt | 4 +- .../picker/EmojiPickerView.kt | 2 +- .../picker/ObjectIconPickerBaseViewModel.kt | 4 +- .../ObjectIconPickerViewModelFactory.kt | 2 +- .../render/BlockViewRenderer.kt | 6 +- .../render/DefaultBlockViewRenderer.kt | 14 +-- .../search/DocumentSearchEngine.kt | 2 +- .../selection/SelectionStateHolder.kt | 2 +- .../toggle/ToggleStateHolder.kt | 2 +- .../extension/DashboardViewExtension.kt | 4 +- .../presentation/extension/MarkupExtension.kt | 4 +- .../presentation/mapper/MapperExtension.kt | 12 +-- .../presentation/navigation/ObjectView.kt | 2 +- .../{object => objects}/ObjectAction.kt | 2 +- .../ObjectCoverPickerViewModel.kt | 6 +- .../{object => objects}/ObjectIcon.kt | 2 +- .../ObjectMenuViewModelBase.kt | 4 +- .../ObjectTypeChangeViewModel.kt | 2 +- .../ObjectTypeChangeViewModelFactory.kt | 6 +- .../{object => objects}/ObjectTypeView.kt | 2 +- .../page/editor/model/Alignment.kt | 3 - .../page/editor/styling/StylingMode.kt | 5 - .../AddObjectRelationValueViewModel.kt | 4 +- .../ObjectRelationListViewModelFactory.kt | 4 +- .../relations/ObjectSetRenderMapper.kt | 4 +- .../relations/RelationListViewModel.kt | 4 +- .../RelationObjectValueAddViewModel.kt | 2 +- .../DefaultObjectRelationProvider.kt | 2 +- .../providers/DefaultObjectValueProvider.kt | 2 +- .../search/ObjectSearchViewModel.kt | 2 +- .../presentation/sets/ObjectSetExtension.kt | 2 +- .../presentation/sets/ObjectSetViewModel.kt | 6 +- .../presentation/sets/ObjectSetViewState.kt | 2 +- .../sets/RelationValueBaseViewModel.kt | 2 +- .../sets/ViewerSortByViewModel.kt | 7 +- .../sets/filter/CreateFilterView.kt | 2 +- .../DashboardDragAndDropTest.kt | 3 +- .../{home => dashboard}/DashboardTestSetup.kt | 4 +- .../HomeDashboardViewModelTest.kt | 6 +- .../{page => editor}/BlockReadModeTest.kt | 16 ++-- .../ControlPanelStateReducerTest.kt | 14 +-- .../DefaultBlockViewRendererTest.kt | 14 +-- .../DocumentExternalEventReducerTest.kt | 2 +- .../EditorViewModelTest.kt} | 60 ++++++------ .../editor/EditorAddBlockTest.kt | 2 +- .../editor/EditorBackButtonTest.kt | 2 +- .../editor/EditorBackspaceNestedDeleteTest.kt | 4 +- .../editor/EditorCheckboxTest.kt | 4 +- .../editor/EditorEmptySpaceInteractionTest.kt | 4 +- .../editor/EditorErrorMessageTest.kt | 2 +- .../editor/EditorEventSubscriptionTest.kt | 2 +- .../editor/EditorFeaturedRelationsTest.kt | 8 +- .../editor/EditorFocusTest.kt | 10 +- .../editor/EditorGranularChangeTest.kt | 4 +- .../editor/EditorListBlockTest.kt | 8 +- .../editor/EditorMentionTest.kt | 15 ++- .../{page => editor}/editor/EditorMenuTest.kt | 6 +- .../editor/EditorMergeTest.kt | 12 +-- .../editor/EditorMoveToTest.kt | 6 +- .../editor/EditorMultiSelectModeTest.kt | 16 ++-- .../editor/EditorPresentationTestSetup.kt | 22 ++--- .../EditorQuickStartingScrollAndMoveTest.kt | 14 +-- .../editor/EditorRelationBlockTest.kt | 4 +- .../editor/EditorScrollAndMoveTest.kt | 18 ++-- .../editor/EditorSlashWidgetActionsTest.kt | 10 +- .../editor/EditorSlashWidgetClicksTest.kt | 10 +- .../editor/EditorSlashWidgetColorTest.kt | 14 +-- .../editor/EditorSlashWidgetCutFilterTest.kt | 10 +- .../editor/EditorSlashWidgetFilterTest.kt | 16 ++-- .../editor/EditorSlashWidgetMarksTest.kt | 12 +-- .../editor/EditorSlashWidgetObjectTypeTest.kt | 10 +- .../editor/EditorSlashWidgetRelationsTest.kt | 12 +-- .../editor/EditorSlashWidgetShowHideTest.kt | 4 +- .../editor/EditorSlashWidgetStyleTypeTest.kt | 8 +- .../editor/EditorStartupTest.kt | 2 +- .../editor/EditorTextUpdateTest.kt | 14 +-- .../editor/EditorTitleAddBlockTest.kt | 2 +- .../editor/EditorTitleTest.kt | 14 +-- .../editor/EditorTurnIntoTest.kt | 16 ++-- .../editor/StyleConfigKtTest.kt | 10 +- .../editor/ext/BlockViewCutTextTest.kt | 8 +- .../editor/mention/MentionExtKtTest.kt | 2 +- .../search/DocumentSearchEngineTest.kt | 2 +- .../extension/DashboardViewExtensionKtTest.kt | 2 +- .../extension/MarkupExtensionKtTest.kt | 2 +- .../extension/MarkupExtensionTest.kt | 2 +- .../mapper/MapperExtensionKtTest.kt | 2 +- .../anytypeio/anytype/sample/StyleActivity.kt | 10 +- 402 files changed, 1492 insertions(+), 1529 deletions(-) create mode 100644 app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestEditorFragment.kt delete mode 100644 app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestPageFragment.kt rename app/src/main/java/com/anytypeio/anytype/di/feature/{PageDI.kt => EditorDI.kt} (94%) rename app/src/main/java/com/anytypeio/anytype/ui/{desktop => dashboard}/DashboardAdapter.kt (98%) rename app/src/main/java/com/anytypeio/anytype/ui/{desktop => dashboard}/DashboardDragAndDropBehavior.kt (93%) rename app/src/main/java/com/anytypeio/anytype/ui/{desktop/HomeDashboardFragment.kt => dashboard/DashboardFragment.kt} (90%) rename app/src/main/java/com/anytypeio/anytype/ui/{desktop => dashboard}/DashboardPager.kt (99%) rename app/src/main/java/com/anytypeio/anytype/ui/{desktop => dashboard}/DashboardProfileAdapter.kt (96%) rename app/src/main/java/com/anytypeio/anytype/ui/{desktop => dashboard}/DesktopDiffUtil.kt (96%) rename app/src/main/java/com/anytypeio/anytype/ui/{desktop => dashboard}/ProfileContainerAdapter.kt (96%) rename app/src/main/java/com/anytypeio/anytype/ui/{page/PageFragment.kt => editor/EditorFragment.kt} (96%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/cover/DocCoverGalleryFragment.kt (95%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/cover/DocCoverSliderFragment.kt (96%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/cover/UploadCoverImageFragment.kt (98%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/gallery/FullScreenPictureFragment.kt (96%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/layout/ObjectLayoutFragment.kt (96%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/AddBlockFragment.kt (90%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/CreateBookmarkFragment.kt (92%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/ObjectIconPickerBaseFragment.kt (92%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/SelectProgrammingLanguageFragment.kt (94%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/SetLinkFragment.kt (94%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/TurnIntoFragment.kt (94%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/BlockActionToolbar.kt (98%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/BlockActionToolbarFactory.kt (97%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/BlockActionToolbarHelper.kt (98%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/BookmarkBlockActionToolbar.kt (94%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/BulletedBlockActionToolbar.kt (91%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/CheckBoxBlockActionToolbar.kt (92%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/CodeBlockActionToolbar.kt (93%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/DividerLineBlockActionToolbar.kt (89%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/DocumentIconActionMenuFragment.kt (95%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/ErrorActionToolbar.kt (89%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/FileBlockActionToolbar.kt (94%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/HeaderOneBlockActionToolbar.kt (92%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/HeaderThreeBlockActionToolbar.kt (93%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/HeaderTwoBlockActionToolbar.kt (93%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/HighlightBlockActionToolbar.kt (90%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/NumberedBlockActionToolbar.kt (93%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/PageArchiveBlockActionToolbar.kt (95%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/PageBlockActionToolbar.kt (94%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/ParagraphBlockActionToolbar.kt (92%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/PictureBlockActionToolbar.kt (86%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/PlaceholderActionToolbar.kt (71%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/ProfileIconActionMenuFragment.kt (96%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/RelationDefaultActionToolbar.kt (98%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/RelationPlaceholderActionToolbar.kt (89%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/ToggleBlockActionToolbar.kt (92%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/UploadActionToolbar.kt (83%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/modals/actions/VideoBlockActionToolbar.kt (91%) rename app/src/main/java/com/anytypeio/anytype/ui/{page => editor}/sheets/ObjectMenuBaseFragment.kt (93%) rename app/src/main/java/com/anytypeio/anytype/ui/{object => objects}/ObjectTypeChangeFragment.kt (87%) rename app/src/main/res/layout/{fragment_desktop.xml => fragment_dashboard.xml} (98%) rename app/src/main/res/layout/{fragment_page.xml => fragment_editor.xml} (99%) rename app/src/main/res/xml/{fragment_desktop_scene.xml => fragment_dashboard_scene.xml} (100%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/BlockAdapter.kt (92%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/BlockTextAdapter.kt (99%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/BlockViewDiffUtil.kt (95%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/BlockViewHolder.kt (88%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/Focus.kt (76%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/MarkupColorAdapter.kt (93%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/MarkupMapper.kt (91%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/SupportNesting.kt (70%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/TextBlockHolder.kt (95%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/TurnIntoActionReceiver.kt (71%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/modal/AddBlockOrTurnIntoAdapter.kt (94%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/modal/DocCoverGalleryAdapter.kt (95%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/modal/SelectProgrammingLanguageAdapter.kt (88%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/scrollandmove/DefaultScrollAndMoveTargetDescriptor.kt (58%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/scrollandmove/ScrollAndMoveStateListener.kt (82%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/scrollandmove/ScrollAndMoveTargetHighlighter.kt (85%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashActionsAdapter.kt (80%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashAlignmentAdapter.kt (80%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashBaseAdapter.kt (89%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashColorAdapter.kt (89%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashMainAdapter.kt (86%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashMediaAdapter.kt (80%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashObjectTypesAdapter.kt (89%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashOtherAdapter.kt (80%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashRelationsAdapter.kt (97%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashStyleAdapter.kt (80%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/SlashWidget.kt (95%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/ActionMenuHolder.kt (94%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/AlignMenuHolder.kt (88%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/ColorMenuHolder.kt (84%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/MainMenuHolder.kt (93%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/MediaMenuHolder.kt (92%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/ObjectTypeMenuHolder.kt (83%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/OtherMenuHolder.kt (85%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/RelationsSubheaderMenuHolder.kt (93%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/StyleMenuHolder.kt (97%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{page => editor}/slash/holders/SubheaderMenuHolder.kt (95%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{object => objects}/ObjectActionAdapter.kt (95%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{object => objects}/ObjectTypeBaseAdapter.kt (86%) rename core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/{object => objects}/holders/ObjectTypeHolder.kt (87%) rename library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/model/{PageIconPickerViewDiffUtil.kt => ObjectIconPickerViewDiffUtil.kt} (85%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{desktop => dashboard}/Dashboard.kt (61%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{desktop => dashboard}/DashboardView.kt (93%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{desktop => dashboard}/HomeDashboardEventConverter.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{desktop => dashboard}/HomeDashboardStateMachine.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{desktop => dashboard}/HomeDashboardViewModel.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{desktop => dashboard}/HomeDashboardViewModelFactory.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/CloseableCoroutineScope.kt (90%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/ControlPanelMachine.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/DocumentExternalEventReducer.kt (99%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/Editor.kt (82%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page/PageViewModel.kt => editor/EditorViewModel.kt} (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page/PageViewModelFactory.kt => editor/EditorViewModelFactory.kt} (89%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/LinkAddViewModel.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/TurnIntoConstants.kt (89%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/archive/ArchiveViewModel.kt (91%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/archive/ArchiveViewModelFactory.kt (84%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/bookmark/CreateBookmarkViewModel.kt (82%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/cover/CoverColor.kt (95%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/cover/CoverGradient.kt (71%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/cover/CoverImageHashProvider.kt (74%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/cover/DocCoverGalleryView.kt (90%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/cover/SelectDocCoverViewModel.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/cover/UploadDocCoverImageViewModel.kt (94%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/BlockDimensions.kt (79%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Command.kt (94%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Converter.kt (59%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/DetailModificator.kt (99%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/ErrorViewState.kt (69%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Intent.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Interactor.kt (92%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Markup.kt (96%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Orchestrator.kt (99%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Proxy.kt (88%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/SideEffect.kt (58%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Store.kt (94%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/ThemeColor.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/Transformation.kt (91%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/ViewState.kt (70%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/actions/ActionItemType.kt (89%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/control/ControlPanelState.kt (95%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/ext/BlockViewExt.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/listener/ListenerType.kt (90%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/mention/MentionEvent.kt (79%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/mention/MentionExt.kt (79%) create mode 100644 presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Alignment.kt rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/model/BlockView.kt (88%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/model/Checkable.kt (60%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/model/Focusable.kt (60%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/model/Types.kt (96%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/model/UiBlock.kt (96%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/pattern/DefaultPatternMatcher.kt (96%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/pattern/Matcher.kt (50%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/pattern/Pattern.kt (58%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/sam/ScrollAndMoveTarget.kt (87%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/sam/ScrollAndMoveTargetDescriptor.kt (82%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/search/SearchInDocEvent.kt (81%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/slash/SlashEvent.kt (90%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/slash/SlashExtensions.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/slash/SlashItem.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/styling/StyleConfig.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/styling/StylingEvent.kt (84%) create mode 100644 presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingMode.kt rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/editor/styling/StylingType.kt (82%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/layout/ObjectLayoutViewModel.kt (95%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/markup/MarkupColorView.kt (86%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/markup/MarkupStyleDescriptor.kt (94%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/model/TextUpdate.kt (95%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/picker/AddBlockView.kt (96%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/picker/DocumentAddBlockViewModel.kt (89%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/picker/DocumentIconActionMenuViewModel.kt (96%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/picker/DocumentIconActionMenuViewModelFactory.kt (86%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/picker/EmojiPickerView.kt (93%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/picker/ObjectIconPickerBaseViewModel.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/picker/ObjectIconPickerViewModelFactory.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/render/BlockViewRenderer.kt (83%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/render/DefaultBlockViewRenderer.kt (98%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/search/DocumentSearchEngine.kt (82%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/selection/SelectionStateHolder.kt (95%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{page => editor}/toggle/ToggleStateHolder.kt (90%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{object => objects}/ObjectAction.kt (71%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{object => objects}/ObjectCoverPickerViewModel.kt (93%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{object => objects}/ObjectIcon.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{object => objects}/ObjectMenuViewModelBase.kt (99%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{object => objects}/ObjectTypeChangeViewModel.kt (97%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{object => objects}/ObjectTypeChangeViewModelFactory.kt (66%) rename presentation/src/main/java/com/anytypeio/anytype/presentation/{object => objects}/ObjectTypeView.kt (78%) delete mode 100644 presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Alignment.kt delete mode 100644 presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingMode.kt rename presentation/src/test/java/com/anytypeio/anytype/presentation/{home => dashboard}/DashboardDragAndDropTest.kt (99%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{home => dashboard}/DashboardTestSetup.kt (96%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{home => dashboard}/HomeDashboardViewModelTest.kt (96%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/BlockReadModeTest.kt (94%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/ControlPanelStateReducerTest.kt (99%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/DefaultBlockViewRendererTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/DocumentExternalEventReducerTest.kt (99%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page/PageViewModelTest.kt => editor/EditorViewModelTest.kt} (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorAddBlockTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorBackButtonTest.kt (96%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorBackspaceNestedDeleteTest.kt (99%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorCheckboxTest.kt (97%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorEmptySpaceInteractionTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorErrorMessageTest.kt (97%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorEventSubscriptionTest.kt (97%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorFeaturedRelationsTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorFocusTest.kt (95%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorGranularChangeTest.kt (96%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorListBlockTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorMentionTest.kt (97%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorMenuTest.kt (92%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorMergeTest.kt (95%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorMoveToTest.kt (95%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorMultiSelectModeTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorPresentationTestSetup.kt (94%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorQuickStartingScrollAndMoveTest.kt (95%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorRelationBlockTest.kt (99%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorScrollAndMoveTest.kt (97%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetActionsTest.kt (97%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetClicksTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetColorTest.kt (97%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetCutFilterTest.kt (96%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetFilterTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetMarksTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetObjectTypeTest.kt (86%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetRelationsTest.kt (96%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetShowHideTest.kt (95%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorSlashWidgetStyleTypeTest.kt (96%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorStartupTest.kt (95%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorTextUpdateTest.kt (94%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorTitleAddBlockTest.kt (99%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorTitleTest.kt (93%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/EditorTurnIntoTest.kt (94%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/StyleConfigKtTest.kt (98%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/ext/BlockViewCutTextTest.kt (95%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/editor/mention/MentionExtKtTest.kt (97%) rename presentation/src/test/java/com/anytypeio/anytype/presentation/{page => editor}/search/DocumentSearchEngineTest.kt (97%) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt index 1deb55ac01..adb9a870f3 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt @@ -18,14 +18,14 @@ import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.data.auth.model.ClipEntity import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import kotlinx.android.synthetic.main.fragment_page.* +import kotlinx.android.synthetic.main.fragment_editor.* import org.hamcrest.CoreMatchers.anyOf import org.junit.Before import org.junit.Rule @@ -44,7 +44,7 @@ class ClipboardTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) @Before override fun setup() { @@ -252,7 +252,7 @@ class ClipboardTesting : EditorTestSetup() { ) } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -540,8 +540,8 @@ class ClipboardTesting : EditorTestSetup() { // STUBBING & SETUP - private fun launchFragment(args: Bundle): FragmentScenario { - return launchFragmentInContainer( + private fun launchFragment(args: Bundle): FragmentScenario { + return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme ) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt index e8c802a241..eb317cfe50 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt @@ -20,14 +20,14 @@ import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import kotlinx.android.synthetic.main.fragment_page.* +import kotlinx.android.synthetic.main.fragment_editor.* import org.junit.Before import org.junit.Rule import org.junit.Test @@ -48,7 +48,7 @@ class CreateBlockTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) @Before override fun setup() { @@ -228,7 +228,7 @@ class CreateBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } private fun shouldReplaceParagraphByPressingEnterInsideAnyEmptyTextBlockExceptLists( @@ -336,7 +336,7 @@ class CreateBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -358,7 +358,7 @@ class CreateBlockTesting : EditorTestSetup() { } - private fun launchFragment(args: Bundle): FragmentScenario { + private fun launchFragment(args: Bundle): FragmentScenario { return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateRelationBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateRelationBlockTesting.kt index d722f03980..9e28d460b8 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateRelationBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateRelationBlockTesting.kt @@ -16,10 +16,10 @@ import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule import org.junit.Before @@ -37,7 +37,7 @@ class CreateRelationBlockTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) private val defaultDetails = Block.Details( mapOf( @@ -326,8 +326,8 @@ class CreateRelationBlockTesting : EditorTestSetup() { // STUBBING & SETUP - private fun launchFragment(args: Bundle): FragmentScenario { - return launchFragmentInContainer( + private fun launchFragment(args: Bundle): FragmentScenario { + return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme ) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt index e1d970ee53..db8099cb71 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt @@ -20,14 +20,14 @@ import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.UnlinkBlocks import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import kotlinx.android.synthetic.main.fragment_page.* +import kotlinx.android.synthetic.main.fragment_editor.* import org.junit.Before import org.junit.Rule import org.junit.Test @@ -48,7 +48,7 @@ class DeleteBlockTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) @Before override fun setup() { @@ -372,7 +372,7 @@ class DeleteBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -630,7 +630,7 @@ class DeleteBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -651,8 +651,8 @@ class DeleteBlockTesting : EditorTestSetup() { } } - private fun launchFragment(args: Bundle): FragmentScenario { - return launchFragmentInContainer( + private fun launchFragment(args: Bundle): FragmentScenario { + return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme ) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt index a690f78aec..682fff6f63 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt @@ -8,13 +8,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.core_models.Relations +import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule import org.junit.Before @@ -32,7 +32,7 @@ class DescriptionTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) private val title = Block( id = MockDataFactory.randomUuid(), @@ -168,7 +168,7 @@ class DescriptionTesting : EditorTestSetup() { } } - private fun launchFragment(args: Bundle): FragmentScenario { + private fun launchFragment(args: Bundle): FragmentScenario { return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt index 39edd17ba1..6a9466deec 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt @@ -21,7 +21,7 @@ import com.anytypeio.anytype.core_ui.features.editor.holders.text.Toggle import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_BULLET import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_CHECKBOX @@ -33,13 +33,13 @@ import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_NUMBERED_1 import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_PARAGRAPH import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_PARAGRAPH_1 import com.anytypeio.anytype.mocking.MockUiTests.BLOCK_TOGGLE -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.anytypeio.anytype.utils.scrollTo import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import kotlinx.android.synthetic.main.fragment_page.* +import kotlinx.android.synthetic.main.fragment_editor.* import org.hamcrest.CoreMatchers.not import org.junit.Before import org.junit.Rule @@ -72,7 +72,7 @@ class EditorIntegrationTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val blocks = listOf( BLOCK_H1, @@ -149,7 +149,7 @@ class EditorIntegrationTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val document = listOf( Block( @@ -187,7 +187,7 @@ class EditorIntegrationTesting : EditorTestSetup() { perform(closeSoftKeyboard()) } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) val expected = BLOCK_PARAGRAPH_1.content.asText().text + text @@ -197,7 +197,7 @@ class EditorIntegrationTesting : EditorTestSetup() { @Test fun shouldClearFocusAfterClickedOnHideKeyboard() { - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val document = listOf( Block( @@ -243,7 +243,7 @@ class EditorIntegrationTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -371,7 +371,7 @@ class EditorIntegrationTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION * 2) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION * 2) } /* @@ -682,8 +682,8 @@ class EditorIntegrationTesting : EditorTestSetup() { // SETUP - private fun launchFragment(args: Bundle) : FragmentScenario { - return launchFragmentInContainer( + private fun launchFragment(args: Bundle) : FragmentScenario { + return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme ) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt index 5e92e1c30d..60e07c7658 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt @@ -12,9 +12,9 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.checkHasViewGroupChildWithText import com.anytypeio.anytype.utils.matchView @@ -34,7 +34,7 @@ class FeaturedRelationTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) private val title = Block( id = MockDataFactory.randomUuid(), @@ -280,7 +280,7 @@ class FeaturedRelationTesting : EditorTestSetup() { } } - private fun launchFragment(args: Bundle): FragmentScenario { + private fun launchFragment(args: Bundle): FragmentScenario { return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt index 8510f4ff3c..0078c9ee31 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt @@ -5,15 +5,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.core_models.CoverType import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.core_models.ext.content -import com.anytypeio.anytype.core_models.CoverType import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.cover.CoverColor -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.cover.CoverColor +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule import org.junit.Before @@ -31,7 +31,7 @@ class LayoutTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) private val title = Block( id = MockDataFactory.randomUuid(), diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt index 6764a00198..35e72cdd64 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt @@ -16,14 +16,14 @@ import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import kotlinx.android.synthetic.main.fragment_page.* +import kotlinx.android.synthetic.main.fragment_editor.* import org.junit.Before import org.junit.Rule import org.junit.Test @@ -41,7 +41,7 @@ class ListBlockTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) @Before override fun setup() { @@ -210,7 +210,7 @@ class ListBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -361,7 +361,7 @@ class ListBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } // STUBBING & SETUP @@ -394,8 +394,8 @@ class ListBlockTesting : EditorTestSetup() { } } - private fun launchFragment(args: Bundle): FragmentScenario { - return launchFragmentInContainer( + private fun launchFragment(args: Bundle): FragmentScenario { + return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme ) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt index e379f87d9c..e7fb6966be 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt @@ -19,14 +19,14 @@ import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.MergeBlocks import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import kotlinx.android.synthetic.main.fragment_page.* +import kotlinx.android.synthetic.main.fragment_editor.* import org.junit.Before import org.junit.Rule import org.junit.Test @@ -54,7 +54,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.P @@ -68,7 +68,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.H1 @@ -82,7 +82,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.H2 @@ -96,7 +96,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.H3 @@ -110,7 +110,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.QUOTE @@ -124,7 +124,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.CHECKBOX @@ -138,7 +138,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.BULLET @@ -152,7 +152,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.NUMBERED @@ -166,7 +166,7 @@ class MergeBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val style = Block.Content.Text.Style.TOGGLE @@ -304,7 +304,7 @@ class MergeBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } /** @@ -324,8 +324,8 @@ class MergeBlockTesting : EditorTestSetup() { } } - private fun launchFragment(args: Bundle) : FragmentScenario { - return launchFragmentInContainer( + private fun launchFragment(args: Bundle) : FragmentScenario { + return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme ) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt index 0084a2256a..4edac922df 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt @@ -15,11 +15,11 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule import org.junit.Before @@ -37,7 +37,7 @@ class RelationBlockUITesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) private val defaultDetails = Block.Details( mapOf( @@ -635,12 +635,12 @@ class RelationBlockUITesting : EditorTestSetup() { onView(withId(R.id.multiSelectModeButton)).perform(click()) - advance(PageViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) + advance(EditorViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) rvMatcher.onItemView(1, R.id.textContent).perform(click()) rvMatcher.onItemView(2, R.id.placeholderContainer).perform(click()) - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -1042,7 +1042,7 @@ class RelationBlockUITesting : EditorTestSetup() { onView(withId(R.id.multiSelectModeButton)).perform(click()) - advance(PageViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) + advance(EditorViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) rvMatcher.onItemView(1, R.id.textContent).perform(click()) rvMatcher.onItemView(2, R.id.content).perform(click()) @@ -1051,7 +1051,7 @@ class RelationBlockUITesting : EditorTestSetup() { rvMatcher.onItemView(5, R.id.content).perform(click()) rvMatcher.onItemView(6, R.id.content).perform(click()) - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) with(rvMatcher) { checkIsRecyclerSize(7) @@ -1066,8 +1066,8 @@ class RelationBlockUITesting : EditorTestSetup() { // STUBBING & SETUP - private fun launchFragment(args: Bundle): FragmentScenario { - return launchFragmentInContainer( + private fun launchFragment(args: Bundle): FragmentScenario { + return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme ) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt index 3119e079b8..a1fc7d50f2 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt @@ -12,10 +12,10 @@ import androidx.test.filters.LargeTest import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule @@ -34,7 +34,7 @@ class ScrollAndMoveTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) private val title = Block( id = MockDataFactory.randomUuid(), @@ -127,7 +127,7 @@ class ScrollAndMoveTesting : EditorTestSetup() { // STUBBING & SETUP - private fun launchFragment(args: Bundle): FragmentScenario { + private fun launchFragment(args: Bundle): FragmentScenario { return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt index 84a162b8c3..e3dbad7a04 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt @@ -12,10 +12,10 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule import org.junit.Before @@ -33,7 +33,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) private val defaultDetails = Block.Details( mapOf( @@ -108,7 +108,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -151,7 +151,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -192,7 +192,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -234,7 +234,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -277,7 +277,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -318,7 +318,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -361,7 +361,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsNotDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -408,7 +408,7 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsNotDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -465,13 +465,13 @@ class SlashTextWatcherTesting : EditorTestSetup() { R.id.slashWidget.matchView().checkIsNotDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } // STUBBING & SETUP - private fun launchFragment(args: Bundle): FragmentScenario { + private fun launchFragment(args: Bundle): FragmentScenario { return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt index 13b2f1b60d..c2113316c8 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt @@ -13,16 +13,16 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.* -import com.anytypeio.anytype.core_ui.features.page.slash.holders.MainMenuHolder -import com.anytypeio.anytype.core_ui.features.page.slash.holders.MediaMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.MainMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.MediaMenuHolder import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.emojifier.data.DefaultDocumentEmojiIconProvider import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel +import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.relations.NumberParser -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.* import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule import org.junit.Before @@ -40,7 +40,7 @@ class SlashWidgetTesting : EditorTestSetup() { @get:Rule val coroutineTestRule = CoroutinesTestRule() - private val args = bundleOf(PageFragment.ID_KEY to root) + private val args = bundleOf(EditorFragment.ID_KEY to root) private val defaultDetails = Block.Details( mapOf( @@ -144,7 +144,7 @@ class SlashWidgetTesting : EditorTestSetup() { checkIsRecyclerSize(9) } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -194,7 +194,7 @@ class SlashWidgetTesting : EditorTestSetup() { checkIsRecyclerSize(9) } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -249,7 +249,7 @@ class SlashWidgetTesting : EditorTestSetup() { onView(withId(R.id.flBack)).checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -304,7 +304,7 @@ class SlashWidgetTesting : EditorTestSetup() { checkIsRecyclerSize(9) } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -359,7 +359,7 @@ class SlashWidgetTesting : EditorTestSetup() { onView(withId(R.id.flBack)).checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -414,7 +414,7 @@ class SlashWidgetTesting : EditorTestSetup() { checkIsRecyclerSize(9) } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -503,7 +503,7 @@ class SlashWidgetTesting : EditorTestSetup() { checkIsRecyclerSize(3) } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -581,7 +581,7 @@ class SlashWidgetTesting : EditorTestSetup() { onItemView(0, R.id.flBack).checkIsDisplayed() } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -675,7 +675,7 @@ class SlashWidgetTesting : EditorTestSetup() { onView(withId(R.id.slashWidget)).checkIsNotDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -773,7 +773,7 @@ class SlashWidgetTesting : EditorTestSetup() { onView(withId(R.id.slashWidget)).checkIsNotDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -871,7 +871,7 @@ class SlashWidgetTesting : EditorTestSetup() { onView(withId(R.id.slashWidget)).checkIsNotDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -965,7 +965,7 @@ class SlashWidgetTesting : EditorTestSetup() { onView(withId(R.id.slashWidget)).checkIsNotDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -1023,7 +1023,7 @@ class SlashWidgetTesting : EditorTestSetup() { onView(withId(R.id.flBack)).checkIsDisplayed() - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -1070,7 +1070,7 @@ class SlashWidgetTesting : EditorTestSetup() { onItemView(1, R.id.textContent).checkHasText("FooBar/") } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion @@ -1123,13 +1123,13 @@ class SlashWidgetTesting : EditorTestSetup() { checkIsRecyclerSize(9) } - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //endregion // STUBBING & SETUP - private fun launchFragment(args: Bundle): FragmentScenario { + private fun launchFragment(args: Bundle): FragmentScenario { return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt index 3fc5137231..7c6f4b3e19 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt @@ -17,14 +17,14 @@ import com.anytypeio.anytype.core_models.Command import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.features.editor.base.EditorTestSetup -import com.anytypeio.anytype.features.editor.base.TestPageFragment +import com.anytypeio.anytype.features.editor.base.TestEditorFragment import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.utils.CoroutinesTestRule import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import com.bartoszlipinski.disableanimationsrule.DisableAnimationsRule -import kotlinx.android.synthetic.main.fragment_page.* +import kotlinx.android.synthetic.main.fragment_editor.* import org.junit.Before import org.junit.Rule import org.junit.Test @@ -54,7 +54,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -197,7 +197,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -205,7 +205,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -346,7 +346,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -354,7 +354,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -495,7 +495,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -503,7 +503,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -644,7 +644,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -652,7 +652,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -795,7 +795,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -803,7 +803,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -946,7 +946,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -954,7 +954,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -1097,7 +1097,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -1105,7 +1105,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -1248,7 +1248,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -1256,7 +1256,7 @@ class SplitBlockTesting : EditorTestSetup() { // SETUP - val args = bundleOf(PageFragment.ID_KEY to root) + val args = bundleOf(EditorFragment.ID_KEY to root) val text = "FooBar" @@ -1399,7 +1399,7 @@ class SplitBlockTesting : EditorTestSetup() { // Release pending coroutines - advance(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } //region SETUPØ @@ -1411,8 +1411,8 @@ class SplitBlockTesting : EditorTestSetup() { coroutineTestRule.advanceTime(millis) } - private fun launchFragment(args: Bundle) : FragmentScenario { - return launchFragmentInContainer( + private fun launchFragment(args: Bundle) : FragmentScenario { + return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme ) diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt index fc217fc163..01328a851e 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt @@ -34,18 +34,18 @@ import com.anytypeio.anytype.domain.page.navigation.GetListPages import com.anytypeio.anytype.domain.status.InterceptThreadStatus import com.anytypeio.anytype.domain.status.ThreadStatusChannel import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.DocumentExternalEventReducer -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.PageViewModelFactory -import com.anytypeio.anytype.presentation.page.cover.CoverImageHashProvider -import com.anytypeio.anytype.presentation.page.editor.Interactor -import com.anytypeio.anytype.presentation.page.editor.InternalDetailModificationManager -import com.anytypeio.anytype.presentation.page.editor.Orchestrator -import com.anytypeio.anytype.presentation.page.editor.Proxy -import com.anytypeio.anytype.presentation.page.editor.pattern.DefaultPatternMatcher -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder -import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder +import com.anytypeio.anytype.presentation.editor.DocumentExternalEventReducer +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.EditorViewModelFactory +import com.anytypeio.anytype.presentation.editor.cover.CoverImageHashProvider +import com.anytypeio.anytype.presentation.editor.editor.Interactor +import com.anytypeio.anytype.presentation.editor.editor.InternalDetailModificationManager +import com.anytypeio.anytype.presentation.editor.editor.Orchestrator +import com.anytypeio.anytype.presentation.editor.editor.Proxy +import com.anytypeio.anytype.presentation.editor.editor.pattern.DefaultPatternMatcher +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.util.Dispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.emptyFlow @@ -229,9 +229,9 @@ open class EditorTestSetup { updateDetail = UpdateDetail(repo) getCompatibleObjectTypes = GetCompatibleObjectTypes(repo) - TestPageFragment.testViewModelFactory = PageViewModelFactory( + TestEditorFragment.testViewModelFactory = EditorViewModelFactory( openPage = openPage, - closePage = closePage, + closeObject = closePage, interceptEvents = interceptEvents, updateLinkMarks = updateLinkMarks, removeLinkMark = removeLinkMark, @@ -415,7 +415,7 @@ open class EditorTestSetup { } } - fun launch(args: Bundle): FragmentScenario { + fun launch(args: Bundle): FragmentScenario { return launchFragmentInContainer( fragmentArgs = args, themeResId = R.style.AppTheme diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestEditorFragment.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestEditorFragment.kt new file mode 100644 index 0000000000..a6f0c1aed7 --- /dev/null +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestEditorFragment.kt @@ -0,0 +1,16 @@ +package com.anytypeio.anytype.features.editor.base + +import com.anytypeio.anytype.presentation.editor.EditorViewModelFactory +import com.anytypeio.anytype.ui.editor.EditorFragment + +class TestEditorFragment : EditorFragment() { + init { + factory = testViewModelFactory + } + override fun injectDependencies() {} + override fun releaseDependencies() {} + + companion object { + lateinit var testViewModelFactory: EditorViewModelFactory + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestPageFragment.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestPageFragment.kt deleted file mode 100644 index 336024a043..0000000000 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestPageFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.anytypeio.anytype.features.editor.base - -import com.anytypeio.anytype.presentation.page.PageViewModelFactory -import com.anytypeio.anytype.ui.page.PageFragment - -class TestPageFragment : PageFragment() { - init { - factory = testViewModelFactory - } - override fun injectDependencies() {} - override fun releaseDependencies() {} - - companion object { - lateinit var testViewModelFactory: PageViewModelFactory - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt index 97c516465b..00150c3fad 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt @@ -21,8 +21,8 @@ import com.anytypeio.anytype.emojifier.data.EmojiProvider import com.anytypeio.anytype.emojifier.suggest.EmojiSuggester import com.anytypeio.anytype.emojifier.suggest.model.EmojiModel import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager -import com.anytypeio.anytype.presentation.page.picker.ObjectIconPickerViewModelFactory +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.picker.ObjectIconPickerViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import kotlinx.android.synthetic.main.fragment_page_icon_picker.* diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/TestDocumentEmojiPickerFragment.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/TestDocumentEmojiPickerFragment.kt index 3005c7d5df..74b6ac2374 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/TestDocumentEmojiPickerFragment.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/emoji/TestDocumentEmojiPickerFragment.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.features.emoji -import com.anytypeio.anytype.presentation.page.picker.ObjectIconPickerViewModelFactory -import com.anytypeio.anytype.ui.page.modals.ObjectIconPickerFragment +import com.anytypeio.anytype.presentation.editor.picker.ObjectIconPickerViewModelFactory +import com.anytypeio.anytype.ui.editor.modals.ObjectIconPickerFragment class TestDocumentEmojiPickerFragment : ObjectIconPickerFragment() { init { diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt index 5020e691e3..a6cff9dd3d 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt @@ -19,7 +19,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRec import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddObjectRelationOption import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.RelationOptionValueDVAddViewModel import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt index f23f8484a0..a83f1324ce 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt @@ -19,7 +19,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRec import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddObjectRelationOption import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.RelationOptionValueDVAddViewModel import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt index 53e1917c3a..32be4d8a94 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt @@ -19,7 +19,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.* import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToRecord import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt index 2cd330775e..e01e869f41 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt @@ -19,7 +19,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.* import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToRecord import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt index 4facda0eee..90ab0b3ed8 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt @@ -16,7 +16,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.* import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToRecord import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt index 0af2e552f2..29604946b3 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt @@ -24,9 +24,9 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.RemoveFromFeaturedRelations import com.anytypeio.anytype.mocking.MockDataFactory -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectRelationListViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.ui.relations.RelationListFragment diff --git a/app/src/androidTest/java/com/anytypeio/anytype/utils/EspressoExt.kt b/app/src/androidTest/java/com/anytypeio/anytype/utils/EspressoExt.kt index 5425f6cc08..46a6263bf1 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/utils/EspressoExt.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/utils/EspressoExt.kt @@ -10,7 +10,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.utils.TestUtils.withRecyclerView import org.hamcrest.Matchers.not diff --git a/app/src/main/java/com/anytypeio/anytype/device/DefaultGradientCollectionProvider.kt b/app/src/main/java/com/anytypeio/anytype/device/DefaultGradientCollectionProvider.kt index d6b272c230..8ae335c8f9 100644 --- a/app/src/main/java/com/anytypeio/anytype/device/DefaultGradientCollectionProvider.kt +++ b/app/src/main/java/com/anytypeio/anytype/device/DefaultGradientCollectionProvider.kt @@ -2,7 +2,7 @@ package com.anytypeio.anytype.device import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.domain.cover.GradientCollectionProvider -import com.anytypeio.anytype.presentation.page.cover.CoverGradient +import com.anytypeio.anytype.presentation.editor.cover.CoverGradient class DefaultGradientCollectionProvider : GradientCollectionProvider { override fun provide(): List = listOf( diff --git a/app/src/main/java/com/anytypeio/anytype/di/common/ComponentManager.kt b/app/src/main/java/com/anytypeio/anytype/di/common/ComponentManager.kt index 18edb66a39..2fc86f925e 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/common/ComponentManager.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/common/ComponentManager.kt @@ -100,16 +100,16 @@ class ComponentManager(private val main: MainComponent) { .build() } - val desktopComponent = Component { + val dashboardComponent = Component { main .homeDashboardComponentBuilder() .homeDashboardModule(HomeDashboardModule) .build() } - val pageComponent = ComponentMap { + val editorComponent = ComponentMap { main - .pageComponentBuilder() + .editorComponentBuilder() .session(EditorSessionModule) .usecase(EditorUseCaseModule) .build() @@ -129,7 +129,7 @@ class ComponentManager(private val main: MainComponent) { } val documentIconActionMenuComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .documentActionMenuComponentBuilder() .documentIconActionMenuModule(DocumentIconActionMenuModule()) @@ -137,7 +137,7 @@ class ComponentManager(private val main: MainComponent) { } val objectIconPickerComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .objectIconPickerComponent() .base(ObjectIconPickerBaseModule) @@ -155,7 +155,7 @@ class ComponentManager(private val main: MainComponent) { } val objectLayoutComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .objectLayoutComponent() .module(ObjectLayoutModule) @@ -213,7 +213,7 @@ class ComponentManager(private val main: MainComponent) { } val documentRelationComponent = DependentComponentMap { id -> - pageComponent + editorComponent .get(id) .documentRelationSubComponent() .module(DocumentRelationModule) @@ -237,7 +237,7 @@ class ComponentManager(private val main: MainComponent) { } val relationTextValueComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .relationTextValueComponent() .module(RelationTextValueModule) @@ -253,7 +253,7 @@ class ComponentManager(private val main: MainComponent) { } val objectObjectRelationDateValueComponet = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .editRelationDateComponent() .module(RelationDateValueModule) @@ -261,7 +261,7 @@ class ComponentManager(private val main: MainComponent) { } val documentAddNewBlockComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .documentAddNewBlockComponentBuilder() .documentAddNewBlockModule(DocumentAddNewBlockModule) @@ -325,7 +325,7 @@ class ComponentManager(private val main: MainComponent) { } val objectObjectRelationValueComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .editDocRelationComponent() .module(ObjectRelationValueModule) @@ -462,7 +462,7 @@ class ComponentManager(private val main: MainComponent) { } val docCoverGalleryComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .docCoverGalleryComponentBuilder() .module(SelectDocCoverModule) @@ -470,7 +470,7 @@ class ComponentManager(private val main: MainComponent) { } val objectCoverPickerComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .objectCoverPickerComponent() .module(ObjectCoverPickerModule) @@ -478,7 +478,7 @@ class ComponentManager(private val main: MainComponent) { } val objectMenuComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .objectMenuComponent() .base(ObjectMenuModuleBase) @@ -496,7 +496,7 @@ class ComponentManager(private val main: MainComponent) { } val uploadDocCoverImageComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .uploadDocCoverImageComponentBuilder() .module(UploadDocCoverImageModule) @@ -504,7 +504,7 @@ class ComponentManager(private val main: MainComponent) { } val relationAddToObjectComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .relationAddToObjectComponent() .module(RelationAddToObjectModule) @@ -520,7 +520,7 @@ class ComponentManager(private val main: MainComponent) { } val relationCreateFromScratchForObjectComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .relationCreateFromScratchForObjectComponent() .module(RelationCreateFromScratchForObjectModule) @@ -536,7 +536,7 @@ class ComponentManager(private val main: MainComponent) { } val objectTypeChangeComponent = DependentComponentMap { ctx -> - pageComponent + editorComponent .get(ctx) .objectTypeChangeComponent() .module(ObjectTypeChangeModule) diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ArchiveDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ArchiveDI.kt index cee06aa0db..d0f1932e4d 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ArchiveDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ArchiveDI.kt @@ -6,11 +6,11 @@ import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.page.ArchiveDocument import com.anytypeio.anytype.domain.page.CloseBlock import com.anytypeio.anytype.domain.page.OpenPage -import com.anytypeio.anytype.presentation.page.DocumentExternalEventReducer -import com.anytypeio.anytype.presentation.page.archive.ArchiveViewModelFactory -import com.anytypeio.anytype.presentation.page.editor.Orchestrator -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.DocumentExternalEventReducer +import com.anytypeio.anytype.presentation.editor.archive.ArchiveViewModelFactory +import com.anytypeio.anytype.presentation.editor.editor.Orchestrator +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder import com.anytypeio.anytype.ui.archive.ArchiveFragment import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/CreateBookmarkDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/CreateBookmarkDI.kt index 544a4d0c27..838ce23854 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/CreateBookmarkDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/CreateBookmarkDI.kt @@ -1,8 +1,8 @@ package com.anytypeio.anytype.di.feature import com.anytypeio.anytype.core_utils.di.scope.PerScreen -import com.anytypeio.anytype.presentation.page.bookmark.CreateBookmarkViewModel -import com.anytypeio.anytype.ui.page.modals.CreateBookmarkFragment +import com.anytypeio.anytype.presentation.editor.bookmark.CreateBookmarkViewModel +import com.anytypeio.anytype.ui.editor.modals.CreateBookmarkFragment import dagger.Module import dagger.Provides import dagger.Subcomponent diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt index ea2dfdacd6..2f2a61b08c 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt @@ -16,9 +16,9 @@ import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.icon.DocumentEmojiIconProvider import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.page.CreatePage -import com.anytypeio.anytype.presentation.desktop.HomeDashboardEventConverter -import com.anytypeio.anytype.presentation.desktop.HomeDashboardViewModelFactory -import com.anytypeio.anytype.ui.desktop.HomeDashboardFragment +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardEventConverter +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardViewModelFactory +import com.anytypeio.anytype.ui.dashboard.DashboardFragment import dagger.Module import dagger.Provides import dagger.Subcomponent @@ -37,7 +37,7 @@ interface HomeDashboardSubComponent { fun build(): HomeDashboardSubComponent } - fun inject(fragment: HomeDashboardFragment) + fun inject(fragment: DashboardFragment) } @Module diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentAddNewBlockDi.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentAddNewBlockDi.kt index 9602e40942..20ac347724 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentAddNewBlockDi.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentAddNewBlockDi.kt @@ -3,8 +3,8 @@ package com.anytypeio.anytype.di.feature import com.anytypeio.anytype.core_utils.di.scope.PerModal import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes import com.anytypeio.anytype.domain.config.GetFlavourConfig -import com.anytypeio.anytype.presentation.page.picker.DocumentAddBlockViewModelFactory -import com.anytypeio.anytype.ui.page.modals.AddBlockFragment +import com.anytypeio.anytype.presentation.editor.picker.DocumentAddBlockViewModelFactory +import com.anytypeio.anytype.ui.editor.modals.AddBlockFragment import dagger.Module import dagger.Provides import dagger.Subcomponent diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentEmojiIconPickerDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentEmojiIconPickerDI.kt index acb8ffaa66..ef8f8121a8 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentEmojiIconPickerDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentEmojiIconPickerDI.kt @@ -8,10 +8,10 @@ import com.anytypeio.anytype.domain.icon.SetDocumentEmojiIcon import com.anytypeio.anytype.domain.icon.SetDocumentImageIcon import com.anytypeio.anytype.emojifier.data.Emoji import com.anytypeio.anytype.emojifier.suggest.EmojiSuggester -import com.anytypeio.anytype.presentation.page.picker.ObjectIconPickerViewModelFactory -import com.anytypeio.anytype.presentation.page.picker.ObjectSetIconPickerViewModelFactory +import com.anytypeio.anytype.presentation.editor.picker.ObjectIconPickerViewModelFactory +import com.anytypeio.anytype.presentation.editor.picker.ObjectSetIconPickerViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher -import com.anytypeio.anytype.ui.page.modals.ObjectIconPickerFragment +import com.anytypeio.anytype.ui.editor.modals.ObjectIconPickerFragment import com.anytypeio.anytype.ui.sets.ObjectSetIconPickerFragment import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentIconActionMenuDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentIconActionMenuDI.kt index 3ee70fa289..819001c158 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentIconActionMenuDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/DocumentIconActionMenuDI.kt @@ -5,11 +5,11 @@ import com.anytypeio.anytype.core_utils.di.scope.PerModal import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.icon.SetDocumentEmojiIcon import com.anytypeio.anytype.domain.icon.SetDocumentImageIcon -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModelFactory +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher -import com.anytypeio.anytype.ui.page.modals.actions.DocumentIconActionMenuFragment -import com.anytypeio.anytype.ui.page.modals.actions.ProfileIconActionMenuFragment +import com.anytypeio.anytype.ui.editor.modals.actions.DocumentIconActionMenuFragment +import com.anytypeio.anytype.ui.editor.modals.actions.ProfileIconActionMenuFragment import dagger.Module import dagger.Provides import dagger.Subcomponent diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/PageDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt similarity index 94% rename from app/src/main/java/com/anytypeio/anytype/di/feature/PageDI.kt rename to app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt index b522d79d30..89fb7d0a4b 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/PageDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt @@ -35,22 +35,22 @@ import com.anytypeio.anytype.domain.page.navigation.GetListPages import com.anytypeio.anytype.domain.relations.AddFileToObject import com.anytypeio.anytype.domain.status.InterceptThreadStatus import com.anytypeio.anytype.domain.status.ThreadStatusChannel -import com.anytypeio.anytype.presentation.page.DocumentExternalEventReducer -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.PageViewModelFactory -import com.anytypeio.anytype.presentation.page.cover.CoverImageHashProvider -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager -import com.anytypeio.anytype.presentation.page.editor.Interactor -import com.anytypeio.anytype.presentation.page.editor.InternalDetailModificationManager -import com.anytypeio.anytype.presentation.page.editor.Orchestrator -import com.anytypeio.anytype.presentation.page.editor.pattern.DefaultPatternMatcher -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder -import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder +import com.anytypeio.anytype.presentation.editor.DocumentExternalEventReducer +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.EditorViewModelFactory +import com.anytypeio.anytype.presentation.editor.cover.CoverImageHashProvider +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.editor.Interactor +import com.anytypeio.anytype.presentation.editor.editor.InternalDetailModificationManager +import com.anytypeio.anytype.presentation.editor.editor.Orchestrator +import com.anytypeio.anytype.presentation.editor.editor.pattern.DefaultPatternMatcher +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.relations.providers.* import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.providers.DefaultCoverImageHashProvider -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.ui.editor.EditorFragment import dagger.Module import dagger.Provides import dagger.Subcomponent @@ -58,16 +58,16 @@ import kotlinx.coroutines.Dispatchers @Subcomponent(modules = [EditorSessionModule::class, EditorUseCaseModule::class]) @PerScreen -interface PageSubComponent { +interface EditorSubComponent { @Subcomponent.Builder interface Builder { fun session(module: EditorSessionModule): Builder fun usecase(module: EditorUseCaseModule): Builder - fun build(): PageSubComponent + fun build(): EditorSubComponent } - fun inject(fragment: PageFragment) + fun inject(fragment: EditorFragment) fun objectIconPickerComponent(): ObjectIconPickerComponent.Builder fun documentActionMenuComponentBuilder(): DocumentActionMenuSubComponent.Builder @@ -148,9 +148,9 @@ object EditorSessionModule { getCompatibleObjectTypes: GetCompatibleObjectTypes, getFlavourConfig: GetFlavourConfig, objectTypesProvider: ObjectTypesProvider - ): PageViewModelFactory = PageViewModelFactory( + ): EditorViewModelFactory = EditorViewModelFactory( openPage = openPage, - closePage = closePage, + closeObject = closePage, createPage = createPage, createDocument = createDocument, createObject = createObject, diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/LinkAddDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/LinkAddDI.kt index 3d0788fb3e..86af2f2be6 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/LinkAddDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/LinkAddDI.kt @@ -2,8 +2,8 @@ package com.anytypeio.anytype.di.feature import com.anytypeio.anytype.core_utils.di.scope.PerScreen import com.anytypeio.anytype.domain.page.CheckForUnlink -import com.anytypeio.anytype.presentation.page.LinkAddViewModelFactory -import com.anytypeio.anytype.ui.page.modals.SetLinkFragment +import com.anytypeio.anytype.presentation.editor.LinkAddViewModelFactory +import com.anytypeio.anytype.ui.editor.modals.SetLinkFragment import dagger.Module import dagger.Provides import dagger.Subcomponent diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectCoverDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectCoverDI.kt index 323cb3b9a3..ba01a39cb0 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectCoverDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectCoverDI.kt @@ -4,9 +4,9 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_utils.di.scope.PerModal import com.anytypeio.anytype.domain.cover.RemoveDocCover import com.anytypeio.anytype.domain.cover.SetDocCoverImage -import com.anytypeio.anytype.presentation.`object`.ObjectCoverPickerViewModel +import com.anytypeio.anytype.presentation.objects.ObjectCoverPickerViewModel import com.anytypeio.anytype.presentation.util.Dispatcher -import com.anytypeio.anytype.ui.page.cover.DocCoverSliderFragment +import com.anytypeio.anytype.ui.editor.cover.DocCoverSliderFragment import dagger.Module import dagger.Provides import dagger.Subcomponent diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectLayoutDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectLayoutDI.kt index 3bce1f61ca..c4be0f4d7d 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectLayoutDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectLayoutDI.kt @@ -4,10 +4,10 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_utils.di.scope.PerDialog import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.layout.SetObjectLayout -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.layout.ObjectLayoutViewModel +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.layout.ObjectLayoutViewModel import com.anytypeio.anytype.presentation.util.Dispatcher -import com.anytypeio.anytype.ui.page.layout.ObjectLayoutFragment +import com.anytypeio.anytype.ui.editor.layout.ObjectLayoutFragment import dagger.Module import dagger.Provides import dagger.Subcomponent diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectMenuDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectMenuDI.kt index b2a9ecbca9..28901612ca 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectMenuDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectMenuDI.kt @@ -8,12 +8,11 @@ import com.anytypeio.anytype.domain.dashboard.interactor.AddToFavorite import com.anytypeio.anytype.domain.dashboard.interactor.CheckIsFavorite import com.anytypeio.anytype.domain.dashboard.interactor.RemoveFromFavorite import com.anytypeio.anytype.domain.page.ArchiveDocument -import com.anytypeio.anytype.presentation.`object`.ObjectMenuViewModel -import com.anytypeio.anytype.presentation.`object`.ObjectSetMenuViewModel -import com.anytypeio.anytype.presentation.page.Editor +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.objects.ObjectMenuViewModel +import com.anytypeio.anytype.presentation.objects.ObjectSetMenuViewModel import com.anytypeio.anytype.presentation.sets.ObjectSet -import com.anytypeio.anytype.presentation.sets.ObjectSetReducer -import com.anytypeio.anytype.ui.page.sheets.ObjectMenuFragment +import com.anytypeio.anytype.ui.editor.sheets.ObjectMenuFragment import com.anytypeio.anytype.ui.sets.ObjectSetMenuFragment import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt index 89d2134a09..d8e96f9222 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt @@ -8,8 +8,8 @@ import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.RemoveFromFeaturedRelations -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager import com.anytypeio.anytype.presentation.relations.ObjectRelationListViewModelFactory import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.ui.relations.RelationListFragment diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectTypeDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectTypeDI.kt index 13f35a523b..4a12bc311a 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectTypeDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectTypeDI.kt @@ -2,8 +2,8 @@ package com.anytypeio.anytype.di.feature import com.anytypeio.anytype.core_utils.di.scope.PerModal import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes -import com.anytypeio.anytype.presentation.`object`.ObjectTypeChangeViewModelFactory -import com.anytypeio.anytype.ui.`object`.ObjectTypeChangeFragment +import com.anytypeio.anytype.presentation.objects.ObjectTypeChangeViewModelFactory +import com.anytypeio.anytype.ui.objects.ObjectTypeChangeFragment import dagger.Module import dagger.Provides import dagger.Subcomponent diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/SelectDocCoverDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/SelectDocCoverDI.kt index a28f47728b..ad5a5f99b0 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/SelectDocCoverDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/SelectDocCoverDI.kt @@ -8,10 +8,10 @@ import com.anytypeio.anytype.device.DeviceCoverCollectionProvider import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.cover.* import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.page.cover.SelectDocCoverViewModel -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.cover.SelectDocCoverViewModel +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager import com.anytypeio.anytype.presentation.util.Dispatcher -import com.anytypeio.anytype.ui.page.cover.DocCoverGalleryFragment +import com.anytypeio.anytype.ui.editor.cover.DocCoverGalleryFragment import com.google.gson.Gson import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/UploadDocCoverImageDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/UploadDocCoverImageDI.kt index b97ae36f77..889562080f 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/UploadDocCoverImageDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/UploadDocCoverImageDI.kt @@ -4,9 +4,9 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_utils.di.scope.PerModal import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.cover.SetDocCoverImage -import com.anytypeio.anytype.presentation.page.cover.UploadDocCoverImageViewModel +import com.anytypeio.anytype.presentation.editor.cover.UploadDocCoverImageViewModel import com.anytypeio.anytype.presentation.util.Dispatcher -import com.anytypeio.anytype.ui.page.cover.UploadCoverImageFragment +import com.anytypeio.anytype.ui.editor.cover.UploadCoverImageFragment import dagger.Module import dagger.Provides import dagger.Subcomponent diff --git a/app/src/main/java/com/anytypeio/anytype/di/main/MainComponent.kt b/app/src/main/java/com/anytypeio/anytype/di/main/MainComponent.kt index a5381ff5c9..54698cb989 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/main/MainComponent.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/main/MainComponent.kt @@ -27,7 +27,7 @@ interface MainComponent { fun splashComponentBuilder(): SplashSubComponent.Builder fun keychainPhraseComponentBuilder(): KeychainPhraseSubComponent.Builder fun homeDashboardComponentBuilder(): HomeDashboardSubComponent.Builder - fun pageComponentBuilder(): PageSubComponent.Builder + fun editorComponentBuilder(): EditorSubComponent.Builder fun archiveComponentBuilder(): ArchiveSubComponent.Builder fun linkAddComponentBuilder(): LinkSubComponent.Builder fun createBookmarkBuilder(): CreateBookmarkSubComponent.Builder diff --git a/app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt b/app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt index 45881853b9..9ea2dad560 100644 --- a/app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt +++ b/app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt @@ -2,12 +2,12 @@ package com.anytypeio.anytype.ext import android.text.Editable import android.text.Spanned -import com.anytypeio.anytype.core_ui.common.Span -import com.anytypeio.anytype.core_ui.widgets.text.MentionSpan import com.anytypeio.anytype.core_models.Block.Content.Text.Mark import com.anytypeio.anytype.core_models.ext.overlap import com.anytypeio.anytype.core_models.misc.Overlap -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.core_ui.common.Span +import com.anytypeio.anytype.core_ui.widgets.text.MentionSpan +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor fun Editable.extractMarks(): List = getSpans(0, length, Span::class.java).mapNotNull { span -> when (span) { diff --git a/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt b/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt index 24f847d824..e8ae0242cf 100644 --- a/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt +++ b/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt @@ -12,10 +12,10 @@ import com.anytypeio.anytype.presentation.settings.EditorSettings import com.anytypeio.anytype.ui.archive.ArchiveFragment import com.anytypeio.anytype.ui.auth.Keys import com.anytypeio.anytype.ui.auth.account.CreateAccountFragment.Companion.ARGS_CODE +import com.anytypeio.anytype.ui.editor.EditorFragment import com.anytypeio.anytype.ui.linking.LinkToObjectFragment import com.anytypeio.anytype.ui.moving.MoveToFragment import com.anytypeio.anytype.ui.navigation.PageNavigationFragment -import com.anytypeio.anytype.ui.page.PageFragment import com.anytypeio.anytype.ui.sets.CreateObjectSetFragment import com.anytypeio.anytype.ui.sets.ObjectSetFragment @@ -78,9 +78,9 @@ class Navigator : AppNavigation { navController?.navigate( R.id.objectNavigation, Bundle().apply { - putString(PageFragment.ID_KEY, id) + putString(EditorFragment.ID_KEY, id) editorSettings?.let { - putParcelable(PageFragment.DEBUG_SETTINGS, it) + putParcelable(EditorFragment.DEBUG_SETTINGS, it) } } ) @@ -89,7 +89,7 @@ class Navigator : AppNavigation { override fun launchDocument(id: String) { navController?.navigate( R.id.objectNavigation, - bundleOf(PageFragment.ID_KEY to id), + bundleOf(EditorFragment.ID_KEY to id), navOptions { popUpTo = R.id.desktopScreen launchSingleTop = true @@ -194,7 +194,7 @@ class Navigator : AppNavigation { override fun exitToDesktopAndOpenPage(pageId: String) { navController?.navigate( R.id.desktopScreen, - bundleOf(PageFragment.ID_KEY to pageId), + bundleOf(EditorFragment.ID_KEY to pageId), navOptions { popUpTo = R.id.desktopScreen launchSingleTop = true diff --git a/app/src/main/java/com/anytypeio/anytype/providers/DefaultCoverImageHashProvider.kt b/app/src/main/java/com/anytypeio/anytype/providers/DefaultCoverImageHashProvider.kt index 1545ef8757..41c5509a87 100644 --- a/app/src/main/java/com/anytypeio/anytype/providers/DefaultCoverImageHashProvider.kt +++ b/app/src/main/java/com/anytypeio/anytype/providers/DefaultCoverImageHashProvider.kt @@ -2,7 +2,7 @@ package com.anytypeio.anytype.providers import com.anytypeio.anytype.core_models.Hash import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.presentation.page.cover.CoverImageHashProvider +import com.anytypeio.anytype.presentation.editor.cover.CoverImageHashProvider class DefaultCoverImageHashProvider : CoverImageHashProvider { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/alert/AlertUpdateAppFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/alert/AlertUpdateAppFragment.kt index 0a68db5aa0..49a7adac42 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/alert/AlertUpdateAppFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/alert/AlertUpdateAppFragment.kt @@ -9,7 +9,7 @@ import android.view.View import android.view.ViewGroup import com.anytypeio.anytype.R import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment -import com.anytypeio.anytype.ui.page.OnFragmentInteractionListener +import com.anytypeio.anytype.ui.editor.OnFragmentInteractionListener import kotlinx.android.synthetic.main.fragment_alert.* class AlertUpdateAppFragment : BaseBottomSheetFragment() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/archive/ArchiveFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/archive/ArchiveFragment.kt index dd566a012a..035166af0b 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/archive/ArchiveFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/archive/ArchiveFragment.kt @@ -14,9 +14,9 @@ import com.anytypeio.anytype.core_utils.ext.hideSoftInput import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.page.archive.ArchiveViewModel -import com.anytypeio.anytype.presentation.page.archive.ArchiveViewModelFactory -import com.anytypeio.anytype.presentation.page.archive.ArchiveViewState +import com.anytypeio.anytype.presentation.editor.archive.ArchiveViewModel +import com.anytypeio.anytype.presentation.editor.archive.ArchiveViewModelFactory +import com.anytypeio.anytype.presentation.editor.archive.ArchiveViewState import com.anytypeio.anytype.ui.base.NavigationFragment import com.google.android.material.bottomsheet.BottomSheetBehavior import kotlinx.android.synthetic.main.fragment_archive.* diff --git a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardAdapter.kt b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardAdapter.kt similarity index 98% rename from app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardAdapter.kt rename to app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardAdapter.kt index 1cd896038a..587c898544 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardAdapter.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.desktop +package com.anytypeio.anytype.ui.dashboard import android.view.LayoutInflater import android.view.View @@ -15,8 +15,8 @@ import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.shift import com.anytypeio.anytype.core_utils.ext.typeOf import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.`object`.ObjectIcon -import com.anytypeio.anytype.presentation.desktop.DashboardView +import com.anytypeio.anytype.presentation.dashboard.DashboardView +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.facebook.shimmer.ShimmerFrameLayout import kotlinx.android.synthetic.main.item_dashboard_card_default.view.* import kotlinx.android.synthetic.main.item_desktop_archive.view.* diff --git a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardDragAndDropBehavior.kt b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardDragAndDropBehavior.kt similarity index 93% rename from app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardDragAndDropBehavior.kt rename to app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardDragAndDropBehavior.kt index 9d1fd40edf..53be8c5937 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardDragAndDropBehavior.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardDragAndDropBehavior.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.desktop +package com.anytypeio.anytype.ui.dashboard import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.tools.DefaultDragAndDropBehavior diff --git a/app/src/main/java/com/anytypeio/anytype/ui/desktop/HomeDashboardFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardFragment.kt similarity index 90% rename from app/src/main/java/com/anytypeio/anytype/ui/desktop/HomeDashboardFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardFragment.kt index 0fa26594e9..9d93c3e6c8 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/desktop/HomeDashboardFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.desktop +package com.anytypeio.anytype.ui.dashboard import android.os.Bundle import android.view.View @@ -11,22 +11,22 @@ import com.anytypeio.anytype.core_utils.ext.toast import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.di.common.componentManager import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.desktop.DashboardView -import com.anytypeio.anytype.presentation.desktop.HomeDashboardStateMachine.State -import com.anytypeio.anytype.presentation.desktop.HomeDashboardViewModel -import com.anytypeio.anytype.presentation.desktop.HomeDashboardViewModel.TAB -import com.anytypeio.anytype.presentation.desktop.HomeDashboardViewModelFactory +import com.anytypeio.anytype.presentation.dashboard.DashboardView +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardStateMachine.State +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardViewModel +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardViewModel.TAB +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardViewModelFactory import com.anytypeio.anytype.ui.base.ViewStateFragment -import com.anytypeio.anytype.ui.page.PageFragment +import com.anytypeio.anytype.ui.editor.EditorFragment import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator -import kotlinx.android.synthetic.main.fragment_desktop.* +import kotlinx.android.synthetic.main.fragment_dashboard.* import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import timber.log.Timber import javax.inject.Inject -class HomeDashboardFragment : ViewStateFragment(R.layout.fragment_desktop) { +class DashboardFragment : ViewStateFragment(R.layout.fragment_dashboard) { private val vm by viewModels { factory } @@ -131,7 +131,7 @@ class HomeDashboardFragment : ViewStateFragment(R.layout.fragment_desktop setup() dashboardRoot.progress = motionProgress with(vm) { - state.observe(viewLifecycleOwner, this@HomeDashboardFragment) + state.observe(viewLifecycleOwner, this@DashboardFragment) navigation.observe(viewLifecycleOwner, navObserver) } parseIntent() @@ -168,9 +168,9 @@ class HomeDashboardFragment : ViewStateFragment(R.layout.fragment_desktop } private fun parseIntent() { - val deepLinkPage = arguments?.getString(PageFragment.ID_KEY, null) + val deepLinkPage = arguments?.getString(EditorFragment.ID_KEY, null) if (deepLinkPage != null) { - arguments?.remove(PageFragment.ID_KEY) + arguments?.remove(EditorFragment.ID_KEY) vm.onNavigationDeepLink(deepLinkPage) } else { vm.onViewCreated() @@ -251,11 +251,11 @@ class HomeDashboardFragment : ViewStateFragment(R.layout.fragment_desktop } override fun injectDependencies() { - componentManager().desktopComponent.get().inject(this) + componentManager().dashboardComponent.get().inject(this) } override fun releaseDependencies() { - componentManager().desktopComponent.release() + componentManager().dashboardComponent.release() } private val tabs by lazy { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardPager.kt b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardPager.kt similarity index 99% rename from app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardPager.kt rename to app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardPager.kt index 530a15204d..a6ed0d6617 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardPager.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardPager.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.desktop +package com.anytypeio.anytype.ui.dashboard import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardProfileAdapter.kt b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardProfileAdapter.kt similarity index 96% rename from app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardProfileAdapter.kt rename to app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardProfileAdapter.kt index 09c0ca0b23..8543525814 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardProfileAdapter.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardProfileAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.desktop +package com.anytypeio.anytype.ui.dashboard import android.view.LayoutInflater import android.view.View @@ -8,7 +8,7 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.extensions.avatarColor import com.anytypeio.anytype.core_utils.ext.firstDigitByHash import com.anytypeio.anytype.core_utils.ext.typeOf -import com.anytypeio.anytype.presentation.desktop.DashboardView +import com.anytypeio.anytype.presentation.dashboard.DashboardView import kotlinx.android.synthetic.main.item_dashboard_profile_header.view.* class DashboardProfileAdapter( diff --git a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DesktopDiffUtil.kt b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DesktopDiffUtil.kt similarity index 96% rename from app/src/main/java/com/anytypeio/anytype/ui/desktop/DesktopDiffUtil.kt rename to app/src/main/java/com/anytypeio/anytype/ui/dashboard/DesktopDiffUtil.kt index 8baa72c6a8..6e3220534a 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/desktop/DesktopDiffUtil.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/DesktopDiffUtil.kt @@ -1,7 +1,7 @@ -package com.anytypeio.anytype.ui.desktop +package com.anytypeio.anytype.ui.dashboard import androidx.recyclerview.widget.DiffUtil -import com.anytypeio.anytype.presentation.desktop.DashboardView +import com.anytypeio.anytype.presentation.dashboard.DashboardView import timber.log.Timber class DesktopDiffUtil( diff --git a/app/src/main/java/com/anytypeio/anytype/ui/desktop/ProfileContainerAdapter.kt b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/ProfileContainerAdapter.kt similarity index 96% rename from app/src/main/java/com/anytypeio/anytype/ui/desktop/ProfileContainerAdapter.kt rename to app/src/main/java/com/anytypeio/anytype/ui/dashboard/ProfileContainerAdapter.kt index 704ea68754..c5cabdec59 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/desktop/ProfileContainerAdapter.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/dashboard/ProfileContainerAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.desktop +package com.anytypeio.anytype.ui.dashboard import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/PageFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt similarity index 96% rename from app/src/main/java/com/anytypeio/anytype/ui/page/PageFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt index 0c00f33960..2d1e099253 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/PageFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page +package com.anytypeio.anytype.ui.editor import android.Manifest import android.animation.ObjectAnimator @@ -47,11 +47,11 @@ import com.anytypeio.anytype.core_models.ext.getFirstLinkMarkupParam import com.anytypeio.anytype.core_models.ext.getSubstring import com.anytypeio.anytype.core_ui.extensions.cursorYBottomCoordinate import com.anytypeio.anytype.core_ui.extensions.isKeyboardVisible -import com.anytypeio.anytype.core_ui.features.page.BlockAdapter -import com.anytypeio.anytype.core_ui.features.page.TurnIntoActionReceiver -import com.anytypeio.anytype.core_ui.features.page.scrollandmove.DefaultScrollAndMoveTargetDescriptor -import com.anytypeio.anytype.core_ui.features.page.scrollandmove.ScrollAndMoveStateListener -import com.anytypeio.anytype.core_ui.features.page.scrollandmove.ScrollAndMoveTargetHighlighter +import com.anytypeio.anytype.core_ui.features.editor.BlockAdapter +import com.anytypeio.anytype.core_ui.features.editor.TurnIntoActionReceiver +import com.anytypeio.anytype.core_ui.features.editor.scrollandmove.DefaultScrollAndMoveTargetDescriptor +import com.anytypeio.anytype.core_ui.features.editor.scrollandmove.ScrollAndMoveStateListener +import com.anytypeio.anytype.core_ui.features.editor.scrollandmove.ScrollAndMoveTargetHighlighter import com.anytypeio.anytype.core_ui.reactive.clicks import com.anytypeio.anytype.core_ui.reactive.layoutChanges import com.anytypeio.anytype.core_ui.tools.* @@ -62,27 +62,27 @@ import com.anytypeio.anytype.core_utils.ext.PopupExtensions.calculateRectInWindo import com.anytypeio.anytype.di.common.componentManager import com.anytypeio.anytype.emojifier.Emojifier import com.anytypeio.anytype.ext.extractMarks -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.PageViewModelFactory -import com.anytypeio.anytype.presentation.page.editor.* -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTarget -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor -import com.anytypeio.anytype.presentation.page.markup.MarkupColorView -import com.anytypeio.anytype.ui.`object`.ObjectTypeChangeFragment +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.EditorViewModelFactory +import com.anytypeio.anytype.presentation.editor.editor.* +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTarget +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor +import com.anytypeio.anytype.presentation.editor.markup.MarkupColorView import com.anytypeio.anytype.ui.alert.AlertUpdateAppFragment import com.anytypeio.anytype.ui.base.NavigationFragment -import com.anytypeio.anytype.ui.page.cover.DocCoverAction -import com.anytypeio.anytype.ui.page.cover.DocCoverSliderFragment -import com.anytypeio.anytype.ui.page.gallery.FullScreenPictureFragment -import com.anytypeio.anytype.ui.page.layout.ObjectLayoutFragment -import com.anytypeio.anytype.ui.page.modals.* -import com.anytypeio.anytype.ui.page.modals.actions.BlockActionToolbarFactory -import com.anytypeio.anytype.ui.page.sheets.ObjectMenuBaseFragment.DocumentMenuActionReceiver -import com.anytypeio.anytype.ui.page.sheets.ObjectMenuFragment +import com.anytypeio.anytype.ui.editor.cover.DocCoverAction +import com.anytypeio.anytype.ui.editor.cover.DocCoverSliderFragment +import com.anytypeio.anytype.ui.editor.gallery.FullScreenPictureFragment +import com.anytypeio.anytype.ui.editor.layout.ObjectLayoutFragment +import com.anytypeio.anytype.ui.editor.modals.* +import com.anytypeio.anytype.ui.editor.modals.actions.BlockActionToolbarFactory +import com.anytypeio.anytype.ui.editor.sheets.ObjectMenuBaseFragment.DocumentMenuActionReceiver +import com.anytypeio.anytype.ui.editor.sheets.ObjectMenuFragment +import com.anytypeio.anytype.ui.objects.ObjectTypeChangeFragment import com.anytypeio.anytype.ui.relations.RelationDateValueFragment import com.anytypeio.anytype.ui.relations.RelationListFragment import com.anytypeio.anytype.ui.relations.RelationTextValueFragment @@ -92,7 +92,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.hbisoft.pickit.PickiT import com.hbisoft.pickit.PickiTCallbacks import jp.wasabeef.blurry.Blurry -import kotlinx.android.synthetic.main.fragment_page.* +import kotlinx.android.synthetic.main.fragment_editor.* import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.delay import kotlinx.coroutines.flow.* @@ -101,12 +101,10 @@ import permissions.dispatcher.* import timber.log.Timber import javax.inject.Inject - const val REQUEST_FILE_CODE = 745 @RuntimePermissions -open class PageFragment : - NavigationFragment(R.layout.fragment_page), +open class EditorFragment : NavigationFragment(R.layout.fragment_editor), OnFragmentInteractionListener, AddBlockFragment.AddBlockActionReceiver, TurnIntoActionReceiver, @@ -181,7 +179,7 @@ open class PageFragment : private val slashWidgetFooter by lazy { SlashWidgetFooterItemDecorator(screen) } private val styleToolbarFooter by lazy { StyleToolbarItemDecorator(screen) } - private val vm by viewModels { factory } + private val vm by viewModels { factory } private lateinit var pickiT: PickiT @@ -380,7 +378,7 @@ open class PageFragment : } @Inject - lateinit var factory: PageViewModelFactory + lateinit var factory: EditorViewModelFactory override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -683,7 +681,7 @@ open class PageFragment : vm.commands.observe(viewLifecycleOwner) { execute(it) } vm.toasts.onEach { toast(it) }.launchIn(lifecycleScope) vm.searchResultScrollPosition - .filter { it != PageViewModel.NO_SEARCH_RESULT_POSITION } + .filter { it != EditorViewModel.NO_SEARCH_RESULT_POSITION } .onEach { recycler.smoothScrollToPosition(it) } .launchIn(lifecycleScope) @@ -1499,11 +1497,11 @@ open class PageFragment : } override fun injectDependencies() { - componentManager().pageComponent.get(extractDocumentId()).inject(this) + componentManager().editorComponent.get(extractDocumentId()).inject(this) } override fun releaseDependencies() { - componentManager().pageComponent.release(extractDocumentId()) + componentManager().editorComponent.release(extractDocumentId()) } private fun getEditorSettings() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/cover/DocCoverGalleryFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/cover/DocCoverGalleryFragment.kt similarity index 95% rename from app/src/main/java/com/anytypeio/anytype/ui/page/cover/DocCoverGalleryFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/cover/DocCoverGalleryFragment.kt index 86cd1e1cdb..69e8fbb425 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/cover/DocCoverGalleryFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/cover/DocCoverGalleryFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.cover +package com.anytypeio.anytype.ui.editor.cover import android.graphics.Rect import android.os.Bundle @@ -11,14 +11,14 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.core_ui.features.page.modal.DocCoverGalleryAdapter +import com.anytypeio.anytype.core_ui.features.editor.modal.DocCoverGalleryAdapter import com.anytypeio.anytype.core_utils.ext.arg import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.subscribe import com.anytypeio.anytype.core_utils.ext.withParent import com.anytypeio.anytype.core_utils.ui.BaseFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.page.cover.SelectDocCoverViewModel +import com.anytypeio.anytype.presentation.editor.cover.SelectDocCoverViewModel import kotlinx.android.synthetic.main.fragment_doc_cover_gallery.* import javax.inject.Inject diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/cover/DocCoverSliderFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/cover/DocCoverSliderFragment.kt similarity index 96% rename from app/src/main/java/com/anytypeio/anytype/ui/page/cover/DocCoverSliderFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/cover/DocCoverSliderFragment.kt index 78beb67a84..73959679b5 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/cover/DocCoverSliderFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/cover/DocCoverSliderFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.cover +package com.anytypeio.anytype.ui.editor.cover import android.os.Bundle import android.view.LayoutInflater @@ -17,7 +17,7 @@ import com.anytypeio.anytype.core_utils.ext.arg import com.anytypeio.anytype.core_utils.ext.subscribe import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.`object`.ObjectCoverPickerViewModel +import com.anytypeio.anytype.presentation.objects.ObjectCoverPickerViewModel import com.google.android.material.tabs.TabLayoutMediator import kotlinx.android.synthetic.main.fragment_doc_cover_slider.* import javax.inject.Inject diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/cover/UploadCoverImageFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/cover/UploadCoverImageFragment.kt similarity index 98% rename from app/src/main/java/com/anytypeio/anytype/ui/page/cover/UploadCoverImageFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/cover/UploadCoverImageFragment.kt index e1259dd3fb..a402a407c2 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/cover/UploadCoverImageFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/cover/UploadCoverImageFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.cover +package com.anytypeio.anytype.ui.editor.cover import android.Manifest import android.app.Activity @@ -11,6 +11,7 @@ import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.lifecycle.lifecycleScope import com.anytypeio.anytype.R +import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_ui.reactive.clicks import com.anytypeio.anytype.core_utils.ext.arg import com.anytypeio.anytype.core_utils.ext.parsePath @@ -18,7 +19,6 @@ import com.anytypeio.anytype.core_utils.ext.subscribe import com.anytypeio.anytype.core_utils.ext.withParent import com.anytypeio.anytype.core_utils.ui.BaseFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.core_models.Id import kotlinx.android.synthetic.main.fragment_upload_cover_image.* import timber.log.Timber diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/gallery/FullScreenPictureFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/gallery/FullScreenPictureFragment.kt similarity index 96% rename from app/src/main/java/com/anytypeio/anytype/ui/page/gallery/FullScreenPictureFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/gallery/FullScreenPictureFragment.kt index 134136f165..79d6710c89 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/gallery/FullScreenPictureFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/gallery/FullScreenPictureFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.gallery +package com.anytypeio.anytype.ui.editor.gallery import android.os.Bundle import android.view.View diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/layout/ObjectLayoutFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/layout/ObjectLayoutFragment.kt similarity index 96% rename from app/src/main/java/com/anytypeio/anytype/ui/page/layout/ObjectLayoutFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/layout/ObjectLayoutFragment.kt index 5caa171557..9e0eab345b 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/layout/ObjectLayoutFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/layout/ObjectLayoutFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.layout +package com.anytypeio.anytype.ui.editor.layout import android.content.DialogInterface import android.os.Bundle @@ -17,7 +17,7 @@ import com.anytypeio.anytype.core_utils.ext.subscribe import com.anytypeio.anytype.core_utils.ext.toast import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.page.layout.ObjectLayoutViewModel +import com.anytypeio.anytype.presentation.editor.layout.ObjectLayoutViewModel import kotlinx.android.synthetic.main.fragment_object_layout.* import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/AddBlockFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/AddBlockFragment.kt similarity index 90% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/AddBlockFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/AddBlockFragment.kt index efaeb99e66..cdb37c390f 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/AddBlockFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/AddBlockFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals +package com.anytypeio.anytype.ui.editor.modals import android.os.Bundle import android.view.LayoutInflater @@ -12,16 +12,16 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.ObjectType -import com.anytypeio.anytype.core_ui.features.page.modal.AddBlockOrTurnIntoAdapter +import com.anytypeio.anytype.core_ui.features.editor.modal.AddBlockOrTurnIntoAdapter import com.anytypeio.anytype.core_utils.ext.argString import com.anytypeio.anytype.core_utils.ext.subscribe import com.anytypeio.anytype.core_utils.ext.withParent import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock -import com.anytypeio.anytype.presentation.page.picker.AddBlockView -import com.anytypeio.anytype.presentation.page.picker.DocumentAddBlockViewModel -import com.anytypeio.anytype.presentation.page.picker.DocumentAddBlockViewModelFactory +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView +import com.anytypeio.anytype.presentation.editor.picker.DocumentAddBlockViewModel +import com.anytypeio.anytype.presentation.editor.picker.DocumentAddBlockViewModelFactory import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.android.synthetic.main.fragment_add_block.* diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/CreateBookmarkFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/CreateBookmarkFragment.kt similarity index 92% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/CreateBookmarkFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/CreateBookmarkFragment.kt index 13fcc21552..193f488160 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/CreateBookmarkFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/CreateBookmarkFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals +package com.anytypeio.anytype.ui.editor.modals import android.os.Bundle import android.view.LayoutInflater @@ -16,9 +16,9 @@ import com.anytypeio.anytype.core_utils.ext.hideKeyboard import com.anytypeio.anytype.core_utils.ext.toast import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.page.bookmark.CreateBookmarkViewModel -import com.anytypeio.anytype.presentation.page.bookmark.CreateBookmarkViewModel.ViewState -import com.anytypeio.anytype.ui.page.OnFragmentInteractionListener +import com.anytypeio.anytype.presentation.editor.bookmark.CreateBookmarkViewModel +import com.anytypeio.anytype.presentation.editor.bookmark.CreateBookmarkViewModel.ViewState +import com.anytypeio.anytype.ui.editor.OnFragmentInteractionListener import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.android.synthetic.main.dialog_create_bookmark.* import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/ObjectIconPickerBaseFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/ObjectIconPickerBaseFragment.kt similarity index 92% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/ObjectIconPickerBaseFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/ObjectIconPickerBaseFragment.kt index 4a3ae83f76..fb626c3104 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/ObjectIconPickerBaseFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/ObjectIconPickerBaseFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals +package com.anytypeio.anytype.ui.editor.modals import android.Manifest import android.app.Activity @@ -23,12 +23,12 @@ import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.di.common.componentManager import com.anytypeio.anytype.library_page_icon_picker_widget.ui.DocumentEmojiIconPickerAdapter -import com.anytypeio.anytype.presentation.page.picker.EmojiPickerView.Companion.HOLDER_EMOJI_CATEGORY_HEADER -import com.anytypeio.anytype.presentation.page.picker.EmojiPickerView.Companion.HOLDER_EMOJI_ITEM -import com.anytypeio.anytype.presentation.page.picker.ObjectIconPickerBaseViewModel -import com.anytypeio.anytype.presentation.page.picker.ObjectIconPickerBaseViewModel.ViewState -import com.anytypeio.anytype.presentation.page.picker.ObjectIconPickerViewModel -import com.anytypeio.anytype.presentation.page.picker.ObjectIconPickerViewModelFactory +import com.anytypeio.anytype.presentation.editor.picker.EmojiPickerView.Companion.HOLDER_EMOJI_CATEGORY_HEADER +import com.anytypeio.anytype.presentation.editor.picker.EmojiPickerView.Companion.HOLDER_EMOJI_ITEM +import com.anytypeio.anytype.presentation.editor.picker.ObjectIconPickerBaseViewModel +import com.anytypeio.anytype.presentation.editor.picker.ObjectIconPickerBaseViewModel.ViewState +import com.anytypeio.anytype.presentation.editor.picker.ObjectIconPickerViewModel +import com.anytypeio.anytype.presentation.editor.picker.ObjectIconPickerViewModelFactory import kotlinx.android.synthetic.main.fragment_page_icon_picker.* import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/SelectProgrammingLanguageFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/SelectProgrammingLanguageFragment.kt similarity index 94% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/SelectProgrammingLanguageFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/SelectProgrammingLanguageFragment.kt index ef6452d929..339d61c9c1 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/SelectProgrammingLanguageFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/SelectProgrammingLanguageFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals +package com.anytypeio.anytype.ui.editor.modals import android.os.Bundle import android.view.LayoutInflater @@ -8,10 +8,10 @@ import android.widget.FrameLayout import androidx.core.os.bundleOf import androidx.recyclerview.widget.LinearLayoutManager import com.anytypeio.anytype.R -import com.anytypeio.anytype.core_ui.extensions.color -import com.anytypeio.anytype.core_ui.features.page.modal.SelectProgrammingLanguageAdapter -import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.core_models.Id +import com.anytypeio.anytype.core_ui.extensions.color +import com.anytypeio.anytype.core_ui.features.editor.modal.SelectProgrammingLanguageAdapter +import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.library_syntax_highlighter.obtainLanguages import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.android.synthetic.main.fragment_select_programming_language.* diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/SetLinkFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/SetLinkFragment.kt similarity index 94% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/SetLinkFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/SetLinkFragment.kt index a8b9eec114..59bb4b79d1 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/SetLinkFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/SetLinkFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals +package com.anytypeio.anytype.ui.editor.modals import android.app.Dialog import android.os.Bundle @@ -19,10 +19,10 @@ import com.anytypeio.anytype.core_utils.ext.multilineIme import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.page.LinkAddViewModel -import com.anytypeio.anytype.presentation.page.LinkAddViewModelFactory -import com.anytypeio.anytype.presentation.page.LinkViewState -import com.anytypeio.anytype.ui.page.OnFragmentInteractionListener +import com.anytypeio.anytype.presentation.editor.LinkAddViewModel +import com.anytypeio.anytype.presentation.editor.LinkAddViewModelFactory +import com.anytypeio.anytype.presentation.editor.LinkViewState +import com.anytypeio.anytype.ui.editor.OnFragmentInteractionListener import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.android.synthetic.main.fragment_link.* diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/TurnIntoFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/TurnIntoFragment.kt similarity index 94% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/TurnIntoFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/TurnIntoFragment.kt index 2cfc14c0ed..69f8a163c0 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/TurnIntoFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/TurnIntoFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals +package com.anytypeio.anytype.ui.editor.modals import android.os.Bundle import android.view.LayoutInflater @@ -9,10 +9,10 @@ import androidx.core.os.bundleOf import androidx.recyclerview.widget.LinearLayoutManager import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.core_ui.features.page.TurnIntoActionReceiver -import com.anytypeio.anytype.core_ui.features.page.modal.AddBlockOrTurnIntoAdapter +import com.anytypeio.anytype.core_ui.features.editor.TurnIntoActionReceiver +import com.anytypeio.anytype.core_ui.features.editor.modal.AddBlockOrTurnIntoAdapter import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.android.synthetic.main.fragment_add_block.* diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbar.kt similarity index 98% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbar.kt index 54421ceb60..c984226d20 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.content.Context import android.os.Bundle @@ -26,12 +26,12 @@ import com.anytypeio.anytype.core_ui.widgets.BlockActionBarItem import com.anytypeio.anytype.core_ui.widgets.text.MentionSpan import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.PopupExtensions -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.ui.page.OnFragmentInteractionListener +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.ui.editor.OnFragmentInteractionListener import kotlinx.android.synthetic.main.action_toolbar.* import timber.log.Timber import kotlin.math.abs diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbarFactory.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbarFactory.kt similarity index 97% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbarFactory.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbarFactory.kt index 175b1e6f22..708d99afcf 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbarFactory.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbarFactory.kt @@ -1,9 +1,9 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import androidx.core.os.bundleOf -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.Types +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.Types object BlockActionToolbarFactory { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbarHelper.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbarHelper.kt similarity index 98% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbarHelper.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbarHelper.kt index bb0959ea46..760ee71826 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbarHelper.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbarHelper.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions object BlockActionToolbarHelper { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BookmarkBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BookmarkBlockActionToolbar.kt similarity index 94% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BookmarkBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BookmarkBlockActionToolbar.kt index d1fd52308c..6391ca71c6 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BookmarkBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BookmarkBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -7,7 +7,7 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.R -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.bumptech.glide.Glide class BookmarkBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BulletedBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BulletedBlockActionToolbar.kt similarity index 91% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BulletedBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BulletedBlockActionToolbar.kt index 0b65fd98e3..bd001b7bc5 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BulletedBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BulletedBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -6,7 +6,7 @@ import android.widget.ImageView import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class BulletedBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/CheckBoxBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/CheckBoxBlockActionToolbar.kt similarity index 92% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/CheckBoxBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/CheckBoxBlockActionToolbar.kt index 9d442e2f33..56efd53904 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/CheckBoxBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/CheckBoxBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.view.View import android.widget.ImageView @@ -6,7 +6,7 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class CheckBoxBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/CodeBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/CodeBlockActionToolbar.kt similarity index 93% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/CodeBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/CodeBlockActionToolbar.kt index e24dbb1451..8f5870f7a4 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/CodeBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/CodeBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.graphics.drawable.GradientDrawable import android.os.Bundle @@ -10,7 +10,7 @@ import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.ThemeColorCode import com.anytypeio.anytype.core_ui.widgets.text.CodeTextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class CodeBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/DividerLineBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/DividerLineBlockActionToolbar.kt similarity index 89% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/DividerLineBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/DividerLineBlockActionToolbar.kt index 35678d70eb..8f9d3f5e15 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/DividerLineBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/DividerLineBlockActionToolbar.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View import android.widget.ImageView import com.anytypeio.anytype.R -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class DividerLineBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/DocumentIconActionMenuFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/DocumentIconActionMenuFragment.kt similarity index 95% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/DocumentIconActionMenuFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/DocumentIconActionMenuFragment.kt index 98e5dbb784..6e077aab7f 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/DocumentIconActionMenuFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/DocumentIconActionMenuFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.Manifest import android.app.Activity.RESULT_OK @@ -32,11 +32,11 @@ import com.anytypeio.anytype.library_page_icon_picker_widget.ui.ActionMenuAdapte import com.anytypeio.anytype.library_page_icon_picker_widget.ui.ActionMenuAdapter.Companion.OPTION_CHOOSE_UPLOAD_PHOTO import com.anytypeio.anytype.library_page_icon_picker_widget.ui.ActionMenuAdapter.Companion.OPTION_REMOVE import com.anytypeio.anytype.library_page_icon_picker_widget.ui.ActionMenuDivider -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModel -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModel.Contract -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModel.ViewState -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModelFactory -import com.anytypeio.anytype.ui.page.modals.ObjectIconPickerFragment +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModel +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModel.Contract +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModel.ViewState +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModelFactory +import com.anytypeio.anytype.ui.editor.modals.ObjectIconPickerFragment import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import kotlinx.android.synthetic.main.action_toolbar_page_icon.* diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ErrorActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ErrorActionToolbar.kt similarity index 89% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ErrorActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ErrorActionToolbar.kt index 2d97f65ffd..ba4d0a0cb8 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ErrorActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ErrorActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -7,8 +7,8 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.R -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class ErrorActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/FileBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/FileBlockActionToolbar.kt similarity index 94% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/FileBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/FileBlockActionToolbar.kt index a247c8499f..99766efa10 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/FileBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/FileBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.text.SpannableString @@ -15,8 +15,8 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.const.MimeTypes -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class FileBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderOneBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderOneBlockActionToolbar.kt similarity index 92% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderOneBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderOneBlockActionToolbar.kt index b126f3929b..e104964b23 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderOneBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderOneBlockActionToolbar.kt @@ -1,15 +1,14 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View import android.widget.FrameLayout import android.widget.ImageView -import androidx.core.view.marginTop import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class HeaderOneBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderThreeBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderThreeBlockActionToolbar.kt similarity index 93% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderThreeBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderThreeBlockActionToolbar.kt index 440a18f92b..7eeed41f81 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderThreeBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderThreeBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -8,7 +8,7 @@ import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class HeaderThreeBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderTwoBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderTwoBlockActionToolbar.kt similarity index 93% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderTwoBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderTwoBlockActionToolbar.kt index 695c4c2768..f6c149de8f 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderTwoBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderTwoBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -8,7 +8,7 @@ import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class HeaderTwoBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HighlightBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HighlightBlockActionToolbar.kt similarity index 90% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HighlightBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HighlightBlockActionToolbar.kt index 30e57109f1..969d4520b8 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HighlightBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HighlightBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -6,7 +6,7 @@ import android.widget.ImageView import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class HighlightBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/NumberedBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/NumberedBlockActionToolbar.kt similarity index 93% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/NumberedBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/NumberedBlockActionToolbar.kt index b7b10781e6..7c2fcb006b 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/NumberedBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/NumberedBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.Gravity @@ -9,7 +9,7 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.addDot -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class NumberedBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PageArchiveBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PageArchiveBlockActionToolbar.kt similarity index 95% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PageArchiveBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PageArchiveBlockActionToolbar.kt index c624cdc4ec..a142bfedbb 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PageArchiveBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PageArchiveBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.text.SpannableStringBuilder @@ -12,8 +12,8 @@ import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.VALUE_ROUNDED import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.emojifier.Emojifier -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PageBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PageBlockActionToolbar.kt similarity index 94% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PageBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PageBlockActionToolbar.kt index 0b909dd96d..93966bf2fb 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PageBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PageBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -7,7 +7,7 @@ import android.widget.TextView import com.anytypeio.anytype.R import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.emojifier.Emojifier -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import timber.log.Timber diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ParagraphBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ParagraphBlockActionToolbar.kt similarity index 92% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ParagraphBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ParagraphBlockActionToolbar.kt index 10ca99ec5e..2b10f28ba4 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ParagraphBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ParagraphBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -8,7 +8,7 @@ import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class ParagraphBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PictureBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PictureBlockActionToolbar.kt similarity index 86% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PictureBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PictureBlockActionToolbar.kt index 148a7e98ab..a972abde6c 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PictureBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PictureBlockActionToolbar.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View import android.widget.ImageView import com.anytypeio.anytype.R -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.bumptech.glide.Glide class PictureBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PlaceholderActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PlaceholderActionToolbar.kt similarity index 71% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PlaceholderActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PlaceholderActionToolbar.kt index a4fa982a05..69515c97f8 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PlaceholderActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PlaceholderActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -7,11 +7,11 @@ import android.widget.FrameLayout.LayoutParams import android.widget.ImageView import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.R -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_BOOKMARK_PLACEHOLDER -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_FILE_PLACEHOLDER -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PICTURE_PLACEHOLDER -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_VIDEO_PLACEHOLDER -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_BOOKMARK_PLACEHOLDER +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_FILE_PLACEHOLDER +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PICTURE_PLACEHOLDER +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_VIDEO_PLACEHOLDER +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class PlaceholderActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ProfileIconActionMenuFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ProfileIconActionMenuFragment.kt similarity index 96% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ProfileIconActionMenuFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ProfileIconActionMenuFragment.kt index d88e9883a4..1b5302c696 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ProfileIconActionMenuFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ProfileIconActionMenuFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.Manifest import android.app.Activity @@ -26,9 +26,9 @@ import com.anytypeio.anytype.core_utils.ui.BaseFragment import com.anytypeio.anytype.di.common.componentManager import com.anytypeio.anytype.library_page_icon_picker_widget.ui.ActionMenuAdapter import com.anytypeio.anytype.library_page_icon_picker_widget.ui.ActionMenuDivider -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModel -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModel.ViewState -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModelFactory +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModel +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModel.ViewState +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModelFactory import com.bumptech.glide.Glide import kotlinx.android.synthetic.main.action_toolbar_profile_icon.* import timber.log.Timber diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/RelationDefaultActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/RelationDefaultActionToolbar.kt similarity index 98% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/RelationDefaultActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/RelationDefaultActionToolbar.kt index 3b7c230558..414bc9f87c 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/RelationDefaultActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/RelationDefaultActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -15,8 +15,8 @@ import com.anytypeio.anytype.core_ui.widgets.RelationObjectItem import com.anytypeio.anytype.core_ui.widgets.text.TagWidget import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.relations.DocumentRelationView class RelationDefaultActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/RelationPlaceholderActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/RelationPlaceholderActionToolbar.kt similarity index 89% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/RelationPlaceholderActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/RelationPlaceholderActionToolbar.kt index 1e41592b4d..1c1555a213 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/RelationPlaceholderActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/RelationPlaceholderActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -6,7 +6,7 @@ import android.widget.FrameLayout import android.widget.ImageView import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class RelationPlaceholderActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ToggleBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ToggleBlockActionToolbar.kt similarity index 92% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ToggleBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ToggleBlockActionToolbar.kt index 60695e4060..eda1ff300b 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ToggleBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ToggleBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View @@ -7,7 +7,7 @@ import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.features.editor.holders.text.Toggle import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class ToggleBlockActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/UploadActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/UploadActionToolbar.kt similarity index 83% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/UploadActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/UploadActionToolbar.kt index 02b06bb7dd..d1851c1957 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/UploadActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/UploadActionToolbar.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.os.Bundle import android.view.View import android.widget.ImageView import com.anytypeio.anytype.R -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class UploadActionToolbar : BlockActionToolbar() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/VideoBlockActionToolbar.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/VideoBlockActionToolbar.kt similarity index 91% rename from app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/VideoBlockActionToolbar.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/VideoBlockActionToolbar.kt index 97e6157bf1..34acbd68a9 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/VideoBlockActionToolbar.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/VideoBlockActionToolbar.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.modals.actions +package com.anytypeio.anytype.ui.editor.modals.actions import android.net.Uri import android.os.Bundle @@ -6,8 +6,8 @@ import android.view.View import android.widget.ImageView import com.anytypeio.anytype.R import com.anytypeio.anytype.core_ui.BuildConfig -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.google.android.exoplayer2.SimpleExoPlayer import com.google.android.exoplayer2.source.ProgressiveMediaSource import com.google.android.exoplayer2.ui.PlayerView diff --git a/app/src/main/java/com/anytypeio/anytype/ui/page/sheets/ObjectMenuBaseFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/sheets/ObjectMenuBaseFragment.kt similarity index 93% rename from app/src/main/java/com/anytypeio/anytype/ui/page/sheets/ObjectMenuBaseFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/editor/sheets/ObjectMenuBaseFragment.kt index c08b846906..c5b128a160 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/page/sheets/ObjectMenuBaseFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/sheets/ObjectMenuBaseFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.page.sheets +package com.anytypeio.anytype.ui.editor.sheets import android.os.Bundle import android.view.LayoutInflater @@ -11,17 +11,17 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.core_ui.features.`object`.ObjectActionAdapter +import com.anytypeio.anytype.core_ui.features.objects.ObjectActionAdapter import com.anytypeio.anytype.core_ui.layout.SpacingItemDecoration import com.anytypeio.anytype.core_ui.reactive.clicks import com.anytypeio.anytype.core_utils.ext.* import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.`object`.ObjectAction -import com.anytypeio.anytype.presentation.`object`.ObjectMenuViewModel -import com.anytypeio.anytype.presentation.`object`.ObjectMenuViewModelBase -import com.anytypeio.anytype.ui.page.cover.DocCoverSliderFragment -import com.anytypeio.anytype.ui.page.modals.ObjectIconPickerBaseFragment +import com.anytypeio.anytype.presentation.objects.ObjectAction +import com.anytypeio.anytype.presentation.objects.ObjectMenuViewModel +import com.anytypeio.anytype.presentation.objects.ObjectMenuViewModelBase +import com.anytypeio.anytype.ui.editor.cover.DocCoverSliderFragment +import com.anytypeio.anytype.ui.editor.modals.ObjectIconPickerBaseFragment import com.anytypeio.anytype.ui.relations.RelationListFragment import kotlinx.android.synthetic.main.fragment_object_menu.* import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/java/com/anytypeio/anytype/ui/menu/AnytypeContextMenu.kt b/app/src/main/java/com/anytypeio/anytype/ui/menu/AnytypeContextMenu.kt index b1f237287f..5569f61adb 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/menu/AnytypeContextMenu.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/menu/AnytypeContextMenu.kt @@ -18,7 +18,7 @@ import com.anytypeio.anytype.core_ui.menu.ContextMenuType import com.anytypeio.anytype.core_utils.ext.PopupExtensions.calculateContentBounds import com.anytypeio.anytype.core_utils.ext.PopupExtensions.calculateRectInWindow import com.anytypeio.anytype.core_utils.ext.PopupExtensions.lerp -import com.anytypeio.anytype.presentation.page.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.Markup import java.lang.ref.WeakReference class AnytypeContextMenu constructor( diff --git a/app/src/main/java/com/anytypeio/anytype/ui/object/ObjectTypeChangeFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/objects/ObjectTypeChangeFragment.kt similarity index 87% rename from app/src/main/java/com/anytypeio/anytype/ui/object/ObjectTypeChangeFragment.kt rename to app/src/main/java/com/anytypeio/anytype/ui/objects/ObjectTypeChangeFragment.kt index ba377a4bc7..74858d7661 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/object/ObjectTypeChangeFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/objects/ObjectTypeChangeFragment.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.ui.`object` +package com.anytypeio.anytype.ui.objects import android.os.Bundle import android.view.LayoutInflater @@ -10,15 +10,15 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import com.anytypeio.anytype.R import com.anytypeio.anytype.core_models.SmartBlockType -import com.anytypeio.anytype.core_ui.features.`object`.ObjectTypeBaseAdapter +import com.anytypeio.anytype.core_ui.features.objects.ObjectTypeBaseAdapter import com.anytypeio.anytype.core_ui.reactive.textChanges import com.anytypeio.anytype.core_utils.ext.* import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.`object`.ObjectTypeChangeViewModel -import com.anytypeio.anytype.presentation.`object`.ObjectTypeChangeViewModelFactory -import com.anytypeio.anytype.presentation.`object`.ObjectTypeView -import com.anytypeio.anytype.ui.page.OnFragmentInteractionListener +import com.anytypeio.anytype.presentation.objects.ObjectTypeChangeViewModel +import com.anytypeio.anytype.presentation.objects.ObjectTypeChangeViewModelFactory +import com.anytypeio.anytype.presentation.objects.ObjectTypeView +import com.anytypeio.anytype.ui.editor.OnFragmentInteractionListener import kotlinx.android.synthetic.main.fragment_object_type_change.* import javax.inject.Inject diff --git a/app/src/main/java/com/anytypeio/anytype/ui/relations/RelationListFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/relations/RelationListFragment.kt index 4656bef6f2..9dd99d9aac 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/relations/RelationListFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/relations/RelationListFragment.kt @@ -21,7 +21,7 @@ import com.anytypeio.anytype.di.common.componentManager import com.anytypeio.anytype.presentation.relations.ObjectRelationListViewModelFactory import com.anytypeio.anytype.presentation.relations.RelationListViewModel import com.anytypeio.anytype.presentation.relations.RelationListViewModel.Command -import com.anytypeio.anytype.ui.page.OnFragmentInteractionListener +import com.anytypeio.anytype.ui.editor.OnFragmentInteractionListener import kotlinx.android.synthetic.main.fragment_relation_list.* import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.onStart diff --git a/app/src/main/java/com/anytypeio/anytype/ui/relations/RelationValueBaseFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/relations/RelationValueBaseFragment.kt index d838df5c41..659725a905 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/relations/RelationValueBaseFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/relations/RelationValueBaseFragment.kt @@ -36,8 +36,8 @@ import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.sets.RelationValueBaseViewModel import com.anytypeio.anytype.presentation.sets.RelationValueDVViewModel import com.anytypeio.anytype.presentation.sets.RelationValueViewModel -import com.anytypeio.anytype.ui.page.PageFragment -import com.anytypeio.anytype.ui.page.REQUEST_FILE_CODE +import com.anytypeio.anytype.ui.editor.EditorFragment +import com.anytypeio.anytype.ui.editor.REQUEST_FILE_CODE import com.anytypeio.anytype.ui.sets.ObjectSetFragment import com.hbisoft.pickit.PickiT import com.hbisoft.pickit.PickiTCallbacks @@ -156,7 +156,7 @@ abstract class RelationValueBaseFragment : BaseBottomSheetFragment(), is AppNavigation.Command.OpenObject -> { findNavController().navigate( R.id.objectNavigation, - bundleOf(PageFragment.ID_KEY to command.id) + bundleOf(EditorFragment.ID_KEY to command.id) ) } else -> toast("Unexpected nav command: $command") diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt index 6131e3ccdc..62bbf82200 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt @@ -39,9 +39,9 @@ import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.OnSwipeListener import com.anytypeio.anytype.core_utils.ext.* import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.page.cover.CoverColor -import com.anytypeio.anytype.presentation.page.cover.CoverGradient -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.cover.CoverColor +import com.anytypeio.anytype.presentation.editor.cover.CoverGradient +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.sets.ObjectSetCommand import com.anytypeio.anytype.presentation.sets.ObjectSetViewModel import com.anytypeio.anytype.presentation.sets.ObjectSetViewModelFactory @@ -49,7 +49,7 @@ import com.anytypeio.anytype.presentation.sets.model.FilterExpression import com.anytypeio.anytype.presentation.sets.model.SortingExpression import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.ui.base.NavigationFragment -import com.anytypeio.anytype.ui.page.sheets.ObjectMenuBaseFragment +import com.anytypeio.anytype.ui.editor.sheets.ObjectMenuBaseFragment import com.anytypeio.anytype.ui.relations.RelationDateValueFragment import com.anytypeio.anytype.ui.relations.RelationDateValueFragment.DateValueEditReceiver import com.anytypeio.anytype.ui.relations.RelationTextValueFragment diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetIconPickerFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetIconPickerFragment.kt index d86251a7ab..f2b8448ad3 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetIconPickerFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetIconPickerFragment.kt @@ -2,9 +2,9 @@ package com.anytypeio.anytype.ui.sets import androidx.fragment.app.viewModels import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.page.picker.ObjectSetIconPickerViewModel -import com.anytypeio.anytype.presentation.page.picker.ObjectSetIconPickerViewModelFactory -import com.anytypeio.anytype.ui.page.modals.ObjectIconPickerBaseFragment +import com.anytypeio.anytype.presentation.editor.picker.ObjectSetIconPickerViewModel +import com.anytypeio.anytype.presentation.editor.picker.ObjectSetIconPickerViewModelFactory +import com.anytypeio.anytype.ui.editor.modals.ObjectIconPickerBaseFragment import javax.inject.Inject class ObjectSetIconPickerFragment : ObjectIconPickerBaseFragment() { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetMenuFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetMenuFragment.kt index 67b37fe9e1..60202ccfd8 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetMenuFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetMenuFragment.kt @@ -2,8 +2,8 @@ package com.anytypeio.anytype.ui.sets import androidx.fragment.app.viewModels import com.anytypeio.anytype.di.common.componentManager -import com.anytypeio.anytype.presentation.`object`.ObjectSetMenuViewModel -import com.anytypeio.anytype.ui.page.sheets.ObjectMenuBaseFragment +import com.anytypeio.anytype.presentation.objects.ObjectSetMenuViewModel +import com.anytypeio.anytype.ui.editor.sheets.ObjectMenuBaseFragment import javax.inject.Inject class ObjectSetMenuFragment : ObjectMenuBaseFragment() { diff --git a/app/src/main/res/layout/fragment_desktop.xml b/app/src/main/res/layout/fragment_dashboard.xml similarity index 98% rename from app/src/main/res/layout/fragment_desktop.xml rename to app/src/main/res/layout/fragment_dashboard.xml index 4576627865..5234968847 100644 --- a/app/src/main/res/layout/fragment_desktop.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/default_dashboard_background_color" - app:layoutDescription="@xml/fragment_desktop_scene"> + app:layoutDescription="@xml/fragment_dashboard_scene"> + tools:context=".ui.editor.cover.DocCoverSliderFragment"> - + tools:layout="@layout/fragment_editor" /> @@ -58,9 +58,9 @@ + tools:layout="@layout/fragment_dashboard"> Unit) = synchronized(this) { val selection = selectionStart..selectionEnd diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ViewExtension.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ViewExtension.kt index e149e0d642..c73d0898ac 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ViewExtension.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ViewExtension.kt @@ -10,7 +10,7 @@ import android.widget.TextView import android.widget.Toast import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.PopupExtensions.calculateRectInWindow -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions import com.anytypeio.anytype.presentation.sets.model.ColumnView fun Context.toast( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/archive/ArchiveAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/archive/ArchiveAdapter.kt index 113f2bcfa8..48539c2438 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/archive/ArchiveAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/archive/ArchiveAdapter.kt @@ -5,15 +5,15 @@ import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_ARCHIVE_TITLE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PAGE_ARCHIVE import com.anytypeio.anytype.core_ui.features.editor.holders.other.PageArchive import com.anytypeio.anytype.core_ui.features.editor.holders.other.Title -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_ARCHIVE_TITLE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PAGE_ARCHIVE import com.anytypeio.anytype.core_utils.ext.typeOf -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import timber.log.Timber class ArchiveAdapter( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellStatusHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellStatusHolder.kt index 178bca7004..2f6504b453 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellStatusHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellStatusHolder.kt @@ -4,7 +4,7 @@ import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.color -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.sets.model.CellView import kotlinx.android.synthetic.main.item_viewer_grid_cell_description.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellTagHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellTagHolder.kt index 9296d8a60b..4768fa8865 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellTagHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellTagHolder.kt @@ -8,7 +8,7 @@ import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.setDrawableColor import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.sets.model.CellView import kotlinx.android.synthetic.main.item_viewer_grid_cell_tag.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterStatusViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterStatusViewHolder.kt index da2a7524cb..e1dfc547c0 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterStatusViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterStatusViewHolder.kt @@ -5,7 +5,7 @@ import android.widget.ImageView import android.widget.TextView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.color -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.sets.model.FilterView import kotlinx.android.synthetic.main.item_dv_viewer_filter_status.view.* import timber.log.Timber diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterTagViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterTagViewHolder.kt index fb7b24ee9d..0f6ae80a7a 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterTagViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterTagViewHolder.kt @@ -8,7 +8,7 @@ import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.sets.model.FilterView import com.anytypeio.anytype.presentation.sets.model.TagView import com.google.android.material.chip.Chip diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapter.kt similarity index 92% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapter.kt index f4a614549a..a6c93b4f82 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor import android.os.Build import android.os.Build.VERSION_CODES.N @@ -12,6 +12,37 @@ import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_ui.BuildConfig import com.anytypeio.anytype.core_ui.R +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_BOOKMARK +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_BOOKMARK_ERROR +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_BOOKMARK_PLACEHOLDER +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_BULLET +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_CHECKBOX +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_CODE_SNIPPET +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_DIVIDER_DOTS +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_DIVIDER_LINE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_FILE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_FILE_ERROR +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_FILE_PLACEHOLDER +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_FILE_UPLOAD +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_HEADER_ONE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_HEADER_THREE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_HEADER_TWO +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_HIGHLIGHT +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_NUMBERED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PAGE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PAGE_ARCHIVE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PARAGRAPH +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PICTURE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PICTURE_ERROR +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PICTURE_PLACEHOLDER +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PICTURE_UPLOAD +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_PROFILE_TITLE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_TITLE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_TOGGLE +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_VIDEO +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_VIDEO_ERROR +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_VIDEO_PLACEHOLDER +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder.Companion.HOLDER_VIDEO_UPLOAD import com.anytypeio.anytype.core_ui.features.editor.holders.`interface`.TextHolder import com.anytypeio.anytype.core_ui.features.editor.holders.error.BookmarkError import com.anytypeio.anytype.core_ui.features.editor.holders.error.FileError @@ -34,58 +65,27 @@ import com.anytypeio.anytype.core_ui.features.editor.holders.text.* import com.anytypeio.anytype.core_ui.features.editor.holders.upload.FileUpload import com.anytypeio.anytype.core_ui.features.editor.holders.upload.PictureUpload import com.anytypeio.anytype.core_ui.features.editor.holders.upload.VideoUpload -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_BOOKMARK -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_BOOKMARK_ERROR -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_BOOKMARK_PLACEHOLDER -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_BULLET -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_CHECKBOX -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_CODE_SNIPPET -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_DIVIDER_DOTS -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_DIVIDER_LINE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_FILE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_FILE_ERROR -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_FILE_PLACEHOLDER -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_FILE_UPLOAD -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_HEADER_ONE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_HEADER_THREE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_HEADER_TWO -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_HIGHLIGHT -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_NUMBERED -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PAGE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PAGE_ARCHIVE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PARAGRAPH -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PICTURE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PICTURE_ERROR -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PICTURE_PLACEHOLDER -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PICTURE_UPLOAD -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_PROFILE_TITLE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_TITLE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_TOGGLE -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_VIDEO -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_VIDEO_ERROR -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_VIDEO_PLACEHOLDER -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_VIDEO_UPLOAD import com.anytypeio.anytype.core_ui.tools.ClipboardInterceptor import com.anytypeio.anytype.core_ui.tools.DefaultTextWatcher import com.anytypeio.anytype.core_ui.tools.LockableFocusChangeListener import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.imm import com.anytypeio.anytype.core_utils.ext.typeOf -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_DESCRIPTION -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_FEATURED_RELATION -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_CHECKBOX -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_DEFAULT -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_FILE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_OBJECT -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_PLACEHOLDER -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_STATUS -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_TAGS -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_TODO_TITLE -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_DESCRIPTION +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_FEATURED_RELATION +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_CHECKBOX +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_DEFAULT +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_FILE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_OBJECT +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_PLACEHOLDER +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_STATUS +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_TAGS +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_TODO_TITLE +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.relations.DocumentRelationView import kotlinx.android.synthetic.main.item_block_description.view.* import timber.log.Timber diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockTextAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockTextAdapter.kt similarity index 99% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockTextAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockTextAdapter.kt index bcf4041c15..78fade57ed 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockTextAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockTextAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor /* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockViewDiffUtil.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockViewDiffUtil.kt similarity index 95% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockViewDiffUtil.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockViewDiffUtil.kt index 7fc99709e7..5f11ce7341 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockViewDiffUtil.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockViewDiffUtil.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor import androidx.recyclerview.widget.DiffUtil -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Indentable -import com.anytypeio.anytype.presentation.page.editor.model.Focusable +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Indentable +import com.anytypeio.anytype.presentation.editor.editor.model.Focusable import timber.log.Timber class BlockViewDiffUtil( @@ -173,7 +173,9 @@ class BlockViewDiffUtil( val isSelectionChanged: Boolean get() = changes.contains(SELECTION_CHANGED) val isTitleIconChanged: Boolean get() = changes.contains(TITLE_ICON_CHANGED) val isSearchHighlightChanged: Boolean get() = changes.contains(SEARCH_HIGHLIGHT_CHANGED) - val isGhostEditorSelectionChanged: Boolean get() = changes.contains(GHOST_EDITOR_SELECTION_CHANGED) + val isGhostEditorSelectionChanged: Boolean get() = changes.contains( + GHOST_EDITOR_SELECTION_CHANGED + ) val isAlignmentChanged: Boolean get() = changes.contains(ALIGNMENT_CHANGED) val isTitleCheckboxChanged: Boolean get() = changes.contains(TITLE_CHECKBOX_CHANGED) diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockViewHolder.kt similarity index 88% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockViewHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockViewHolder.kt index 3fc1aa9b45..3426540b70 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/BlockViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockViewHolder.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Payload +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Payload import com.anytypeio.anytype.core_utils.ext.PopupExtensions -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView /** * Viewholder for rendering different type of blocks (i.e its UI-models). diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/Focus.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/Focus.kt similarity index 76% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/Focus.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/Focus.kt index 1f16e01e45..7a137f61fd 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/Focus.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/Focus.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor /** * Focus/carriage model. diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/MarkupColorAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupColorAdapter.kt similarity index 93% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/MarkupColorAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupColorAdapter.kt index da4f483432..84c1f6b024 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/MarkupColorAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupColorAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor import android.view.LayoutInflater import android.view.View @@ -6,8 +6,8 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.widgets.ColorCircleWidget -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.markup.MarkupColorView +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.markup.MarkupColorView class MarkupColorAdapter( private var items: List, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/MarkupMapper.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupMapper.kt similarity index 91% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/MarkupMapper.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupMapper.kt index 28749cd398..6f8ab2a7bb 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/MarkupMapper.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupMapper.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor import android.text.Editable import com.anytypeio.anytype.core_ui.common.Span import com.anytypeio.anytype.core_ui.widgets.text.MentionSpan -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor fun Editable.marks(): List = getSpans(0, length, Span::class.java).mapNotNull { span -> when (span) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/SupportNesting.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/SupportNesting.kt similarity index 70% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/SupportNesting.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/SupportNesting.kt index 39cb990101..4c1a758d88 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/SupportNesting.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/SupportNesting.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor /** * Children of [BlockViewHolder] implementing this interface are expected to support nesting. diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/TextBlockHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockHolder.kt similarity index 95% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/TextBlockHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockHolder.kt index 7e6eb40dc4..0b9bee726d 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/TextBlockHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockHolder.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor import android.text.Editable import android.text.Spannable @@ -14,13 +14,13 @@ import com.anytypeio.anytype.core_ui.tools.* import com.anytypeio.anytype.core_ui.widgets.text.MentionSpan import com.anytypeio.anytype.core_utils.ext.hideKeyboard import com.anytypeio.anytype.core_utils.ext.removeSpans -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.Checkable -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.Checkable +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import timber.log.Timber /** diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/TurnIntoActionReceiver.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TurnIntoActionReceiver.kt similarity index 71% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/TurnIntoActionReceiver.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TurnIntoActionReceiver.kt index efadeba382..9d765380e5 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/TurnIntoActionReceiver.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TurnIntoActionReceiver.kt @@ -1,6 +1,6 @@ -package com.anytypeio.anytype.core_ui.features.page +package com.anytypeio.anytype.core_ui.features.editor -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock interface TurnIntoActionReceiver { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/BookmarkError.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/BookmarkError.kt index 647137958f..2a4873caac 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/BookmarkError.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/BookmarkError.kt @@ -5,8 +5,8 @@ import android.widget.TextView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import kotlinx.android.synthetic.main.item_block_bookmark_error.view.* class BookmarkError(view: View) : MediaError(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/FileError.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/FileError.kt index 86cc5799fa..97785a5cdd 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/FileError.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/FileError.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class FileError(view: View) : MediaError(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/MediaError.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/MediaError.kt index 95d2601d7e..acc64561f9 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/MediaError.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/MediaError.kt @@ -1,13 +1,13 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.error import android.view.View -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener import com.anytypeio.anytype.core_utils.ext.PopupExtensions -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView abstract class MediaError(view: View) : BlockViewHolder(view), BlockViewHolder.IndentableHolder { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/PictureError.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/PictureError.kt index 9e0edd2fb4..a813385e3e 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/PictureError.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/PictureError.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class PictureError(view: View) : MediaError(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/VideoError.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/VideoError.kt index 1828bcfc82..c0f76d9562 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/VideoError.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/error/VideoError.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class VideoError(view: View) : MediaError(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/ext/EditorHolderExtensions.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/ext/EditorHolderExtensions.kt index 07bc30e6c9..fd6881de1f 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/ext/EditorHolderExtensions.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/ext/EditorHolderExtensions.kt @@ -3,11 +3,11 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.ext import android.view.ViewGroup import androidx.core.view.updatePadding import com.anytypeio.anytype.core_ui.R +import com.anytypeio.anytype.core_ui.features.editor.BlockAdapter import com.anytypeio.anytype.core_ui.features.editor.holders.relations.RelationViewHolder -import com.anytypeio.anytype.core_ui.features.page.BlockAdapter import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView fun RelationViewHolder.setup(adapter: BlockAdapter): RelationViewHolder { with(itemView) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/interface/TextHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/interface/TextHolder.kt index b2b6787c0c..33d36f8aa4 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/interface/TextHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/interface/TextHolder.kt @@ -6,10 +6,10 @@ import android.view.inputmethod.InputMethodManager import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.imm import com.anytypeio.anytype.core_utils.text.BackspaceKeyDetector -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.Focusable +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.Focusable import timber.log.Timber /** diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Bookmark.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Bookmark.kt index 0ff7e21185..d5f34c3c24 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Bookmark.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Bookmark.kt @@ -8,16 +8,16 @@ import android.widget.TextView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.SearchHighlightSpan import com.anytypeio.anytype.core_ui.common.SearchTargetHighlightSpan -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.removeSpans import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_DESCRIPTION_KEY -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_TITLE_KEY -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_URL_KEY +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_DESCRIPTION_KEY +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_TITLE_KEY +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_URL_KEY import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/File.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/File.kt index d09360ed4d..9af625a56d 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/File.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/File.kt @@ -11,14 +11,14 @@ import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.SearchHighlightSpan import com.anytypeio.anytype.core_ui.common.SearchTargetHighlightSpan import com.anytypeio.anytype.core_ui.extensions.color -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil import com.anytypeio.anytype.core_utils.const.MimeTypes import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize import com.anytypeio.anytype.core_utils.ext.removeSpans -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import kotlinx.android.synthetic.main.item_block_file.view.* class File(view: View) : Media(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Media.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Media.kt index 8609c94355..eb0d61530c 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Media.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Media.kt @@ -1,13 +1,13 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.media import android.view.View -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener import com.anytypeio.anytype.core_utils.ext.PopupExtensions -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView abstract class Media(view: View) : BlockViewHolder(view), BlockViewHolder.IndentableHolder { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Picture.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Picture.kt index 78bfbd950b..60316f5600 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Picture.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Picture.kt @@ -7,8 +7,8 @@ import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Video.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Video.kt index cf5c1887b3..6364b29f14 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Video.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Video.kt @@ -7,8 +7,8 @@ import com.anytypeio.anytype.core_ui.BuildConfig import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.google.android.exoplayer2.SimpleExoPlayer import com.google.android.exoplayer2.source.ProgressiveMediaSource import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt index 5afa2b648a..22959c12bd 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt @@ -13,8 +13,8 @@ import android.widget.TextView import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.ThemeColorCode -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.tools.DefaultTextWatcher import com.anytypeio.anytype.core_ui.widgets.text.CodeTextInputWidget import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener @@ -22,9 +22,9 @@ import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.imm import com.anytypeio.anytype.core_utils.text.BackspaceKeyDetector import com.anytypeio.anytype.library_syntax_highlighter.Syntaxes -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.Focusable +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.Focusable import kotlinx.android.synthetic.main.item_block_code_snippet.view.* import timber.log.Timber diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Divider.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Divider.kt index 8effc6e3fa..63304a7449 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Divider.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Divider.kt @@ -4,11 +4,11 @@ import android.view.View import android.widget.FrameLayout import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import kotlinx.android.synthetic.main.item_block_divider_line.view.* open class Divider(view: View) : BlockViewHolder(view), BlockViewHolder.IndentableHolder { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/DividerDots.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/DividerDots.kt index 4474d3aab1..21df477837 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/DividerDots.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/DividerDots.kt @@ -1,8 +1,8 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.other import android.view.View -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class DividerDots(view: View) : Divider(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/DividerLine.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/DividerLine.kt index 93e7af25eb..a5a2419eab 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/DividerLine.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/DividerLine.kt @@ -1,8 +1,8 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.other import android.view.View -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class DividerLine(view: View) : Divider(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Page.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Page.kt index fe8050fc42..8400562747 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Page.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Page.kt @@ -6,18 +6,18 @@ import android.widget.TextView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.SearchHighlightSpan import com.anytypeio.anytype.core_ui.common.SearchTargetHighlightSpan -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.core_ui.features.page.SupportNesting +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.SupportNesting import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.removeSpans import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.emojifier.Emojifier -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Searchable.Field.Companion.DEFAULT_SEARCH_FIELD_KEY +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Searchable.Field.Companion.DEFAULT_SEARCH_FIELD_KEY import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import kotlinx.android.synthetic.main.item_block_page.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/PageArchive.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/PageArchive.kt index b3778f7afd..671eb18b1b 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/PageArchive.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/PageArchive.kt @@ -8,19 +8,19 @@ import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.SearchHighlightSpan import com.anytypeio.anytype.core_ui.common.SearchTargetHighlightSpan import com.anytypeio.anytype.core_ui.common.Span -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.core_ui.features.page.SupportNesting +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.SupportNesting import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener import com.anytypeio.anytype.core_utils.ext.VALUE_ROUNDED import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.removeSpans import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.emojifier.Emojifier -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Searchable.Field.Companion.DEFAULT_SEARCH_FIELD_KEY +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Searchable.Field.Companion.DEFAULT_SEARCH_FIELD_KEY import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import kotlinx.android.synthetic.main.item_block_page_archived.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Title.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Title.kt index 3ad99ee22a..927685588e 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Title.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Title.kt @@ -13,17 +13,17 @@ import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.SearchHighlightSpan import com.anytypeio.anytype.core_ui.common.SearchTargetHighlightSpan +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.features.editor.holders.`interface`.TextHolder -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder import com.anytypeio.anytype.core_ui.tools.DefaultSpannableFactory import com.anytypeio.anytype.core_ui.tools.DefaultTextWatcher import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.* import com.anytypeio.anytype.emojifier.Emojifier -import com.anytypeio.anytype.presentation.page.cover.CoverColor -import com.anytypeio.anytype.presentation.page.cover.CoverGradient -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.cover.CoverColor +import com.anytypeio.anytype.presentation.editor.cover.CoverGradient +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import kotlinx.android.synthetic.main.item_block_title.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/BookmarkPlaceholder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/BookmarkPlaceholder.kt index 4f302340d3..ac0061eca2 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/BookmarkPlaceholder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/BookmarkPlaceholder.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class BookmarkPlaceholder(view: View) : MediaPlaceholder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/FilePlaceholder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/FilePlaceholder.kt index 4a426a05a3..2c4aec15ff 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/FilePlaceholder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/FilePlaceholder.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class FilePlaceholder(view: View) : MediaPlaceholder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/MediaPlaceholder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/MediaPlaceholder.kt index a4ac2feb0d..b4f5f97b0a 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/MediaPlaceholder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/MediaPlaceholder.kt @@ -1,13 +1,13 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.placeholders import android.view.View -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener import com.anytypeio.anytype.core_utils.ext.PopupExtensions -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView abstract class MediaPlaceholder(view: View) : BlockViewHolder(view), BlockViewHolder.IndentableHolder { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/PicturePlaceholder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/PicturePlaceholder.kt index 7789c25245..a0b0260572 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/PicturePlaceholder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/PicturePlaceholder.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class PicturePlaceholder(view: View) : MediaPlaceholder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/VideoPlaceholder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/VideoPlaceholder.kt index f9ee67ddc4..334bec1e44 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/VideoPlaceholder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/placeholders/VideoPlaceholder.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class VideoPlaceholder(view: View) : MediaPlaceholder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/FeaturedRelationListViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/FeaturedRelationListViewHolder.kt index 4106b273e2..0ccde9d43e 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/FeaturedRelationListViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/FeaturedRelationListViewHolder.kt @@ -1,9 +1,9 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.relations import android.view.View -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import kotlinx.android.synthetic.main.item_block_featured_relations.view.* class FeaturedRelationListViewHolder(view: View) : BlockViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt index a6a7dc1583..837e10cff6 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt @@ -8,15 +8,15 @@ import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.color -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.widgets.GridCellFileItem import com.anytypeio.anytype.core_ui.widgets.RelationObjectItem import com.anytypeio.anytype.core_ui.widgets.text.TagWidget import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.relations.DocumentRelationView import kotlinx.android.synthetic.main.item_document_relation_file.view.* import kotlinx.android.synthetic.main.item_document_relation_object.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Bulleted.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Bulleted.kt index 944d7b8d6c..ee94e41112 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Bulleted.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Bulleted.kt @@ -6,15 +6,15 @@ import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_ui.extensions.tint -import com.anytypeio.anytype.core_ui.features.page.SupportNesting -import com.anytypeio.anytype.core_ui.features.page.marks +import com.anytypeio.anytype.core_ui.features.editor.SupportNesting +import com.anytypeio.anytype.core_ui.features.editor.marks import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import kotlinx.android.synthetic.main.item_block_bulleted.view.* class Bulleted( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Checkbox.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Checkbox.kt index de6f0008a6..602a01661f 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Checkbox.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Checkbox.kt @@ -5,14 +5,14 @@ import android.view.View import android.widget.ImageView import androidx.core.view.updatePadding import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.SupportNesting -import com.anytypeio.anytype.core_ui.features.page.marks +import com.anytypeio.anytype.core_ui.features.editor.SupportNesting +import com.anytypeio.anytype.core_ui.features.editor.marks import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import kotlinx.android.synthetic.main.item_block_checkbox.view.* class Checkbox( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Description.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Description.kt index 19321890b1..69653718c0 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Description.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Description.kt @@ -2,8 +2,8 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.text import android.view.View import android.widget.TextView -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import kotlinx.android.synthetic.main.item_block_description.view.* class Description(view: View) : BlockViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Header.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Header.kt index bdc5e62e1b..28e6f4bed1 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Header.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Header.kt @@ -4,15 +4,15 @@ import android.text.Editable import android.view.View import androidx.core.view.updatePadding import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.core_ui.features.page.TextBlockHolder -import com.anytypeio.anytype.core_ui.features.page.marks +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.TextBlockHolder +import com.anytypeio.anytype.core_ui.features.editor.marks import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent abstract class Header( view: View diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Highlight.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Highlight.kt index d9d5b87205..88e0997bb0 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Highlight.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Highlight.kt @@ -4,15 +4,15 @@ import android.text.Editable import android.view.View import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.core_ui.features.page.marks +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.marks import com.anytypeio.anytype.core_ui.tools.DefaultSpannableFactory import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import kotlinx.android.synthetic.main.item_block_highlight.view.* class Highlight( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Numbered.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Numbered.kt index 63d921d7e9..64f3641fd7 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Numbered.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Numbered.kt @@ -6,17 +6,17 @@ import android.view.View import android.widget.LinearLayout import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.SupportNesting -import com.anytypeio.anytype.core_ui.features.page.marks +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.SupportNesting +import com.anytypeio.anytype.core_ui.features.editor.marks import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.addDot import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import kotlinx.android.synthetic.main.item_block_numbered.view.* class Numbered( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Paragraph.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Paragraph.kt index 422357d33b..0b95753091 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Paragraph.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Paragraph.kt @@ -4,13 +4,13 @@ import android.text.Editable import android.view.View import androidx.core.view.updatePadding import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.SupportNesting +import com.anytypeio.anytype.core_ui.features.editor.SupportNesting import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import kotlinx.android.synthetic.main.item_block_text.view.* class Paragraph( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Text.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Text.kt index c9f5143cee..2db9fc65d5 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Text.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Text.kt @@ -10,14 +10,14 @@ import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.extensions.applyMovementMethod import com.anytypeio.anytype.core_ui.extensions.color -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.core_ui.features.page.TextBlockHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.TextBlockHolder import com.anytypeio.anytype.core_ui.tools.DefaultTextWatcher import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener import com.anytypeio.anytype.core_utils.ext.imm -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.Checkable +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.Checkable abstract class Text( view: View diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Toggle.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Toggle.kt index b2f9c724bb..0307270a69 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Toggle.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Toggle.kt @@ -4,15 +4,15 @@ import android.text.Editable import android.view.View import androidx.core.view.isVisible import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.SupportNesting -import com.anytypeio.anytype.core_ui.features.page.marks +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.SupportNesting +import com.anytypeio.anytype.core_ui.features.editor.marks import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import kotlinx.android.synthetic.main.item_block_toggle.view.* class Toggle( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/FileUpload.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/FileUpload.kt index ba465c4f83..11281cfb39 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/FileUpload.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/FileUpload.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class FileUpload(view: View) : MediaUpload(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/MediaUpload.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/MediaUpload.kt index 8babd8d5a6..4f6682d2f7 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/MediaUpload.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/MediaUpload.kt @@ -1,13 +1,13 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.upload import android.view.View -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener import com.anytypeio.anytype.core_utils.ext.PopupExtensions -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView abstract class MediaUpload(view: View) : BlockViewHolder(view), BlockViewHolder.IndentableHolder { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/PictureUpload.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/PictureUpload.kt index 533f9e2a54..0724136039 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/PictureUpload.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/PictureUpload.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class PictureUpload(view: View) : MediaUpload(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/VideoUpload.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/VideoUpload.kt index a54c3248a8..ce51938f77 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/VideoUpload.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/upload/VideoUpload.kt @@ -4,8 +4,8 @@ import android.view.View import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.indentize -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView class VideoUpload(view: View) : MediaUpload(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/AddBlockOrTurnIntoAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/AddBlockOrTurnIntoAdapter.kt similarity index 94% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/AddBlockOrTurnIntoAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/AddBlockOrTurnIntoAdapter.kt index dbe3387ea7..9187dcba2e 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/AddBlockOrTurnIntoAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/AddBlockOrTurnIntoAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page.modal +package com.anytypeio.anytype.core_ui.features.editor.modal import android.view.LayoutInflater import android.view.View @@ -6,13 +6,13 @@ import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock -import com.anytypeio.anytype.presentation.page.picker.AddBlockView -import com.anytypeio.anytype.presentation.page.picker.AddBlockView.Companion.VIEW_HOLDER_ADD_BLOCK_HEADER -import com.anytypeio.anytype.presentation.page.picker.AddBlockView.Companion.VIEW_HOLDER_ITEM -import com.anytypeio.anytype.presentation.page.picker.AddBlockView.Companion.VIEW_HOLDER_OBJECT_TYPES -import com.anytypeio.anytype.presentation.page.picker.AddBlockView.Companion.VIEW_HOLDER_SECTION -import com.anytypeio.anytype.presentation.page.picker.AddBlockView.Companion.VIEW_HOLDER_TURN_INTO_HEADER +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView.Companion.VIEW_HOLDER_ADD_BLOCK_HEADER +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView.Companion.VIEW_HOLDER_ITEM +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView.Companion.VIEW_HOLDER_OBJECT_TYPES +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView.Companion.VIEW_HOLDER_SECTION +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView.Companion.VIEW_HOLDER_TURN_INTO_HEADER import kotlinx.android.synthetic.main.item_add_block_or_turn_into_item.view.* import kotlinx.android.synthetic.main.item_add_block_or_turn_into_object_type.view.* import kotlinx.android.synthetic.main.item_add_block_or_turn_into_section.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/DocCoverGalleryAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/DocCoverGalleryAdapter.kt similarity index 95% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/DocCoverGalleryAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/DocCoverGalleryAdapter.kt index b43f274ed6..967b8e6778 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/DocCoverGalleryAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/DocCoverGalleryAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page.modal +package com.anytypeio.anytype.core_ui.features.editor.modal import android.view.LayoutInflater import android.view.View @@ -6,9 +6,9 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.tint -import com.anytypeio.anytype.presentation.page.cover.CoverColor -import com.anytypeio.anytype.presentation.page.cover.CoverGradient -import com.anytypeio.anytype.presentation.page.cover.DocCoverGalleryView +import com.anytypeio.anytype.presentation.editor.cover.CoverColor +import com.anytypeio.anytype.presentation.editor.cover.CoverGradient +import com.anytypeio.anytype.presentation.editor.cover.DocCoverGalleryView import com.bumptech.glide.Glide import kotlinx.android.synthetic.main.item_doc_cover_gallery_gradient.view.* import kotlinx.android.synthetic.main.item_doc_cover_gallery_header.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/SelectProgrammingLanguageAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/SelectProgrammingLanguageAdapter.kt similarity index 88% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/SelectProgrammingLanguageAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/SelectProgrammingLanguageAdapter.kt index dfbb353b37..278172dc35 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/modal/SelectProgrammingLanguageAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/modal/SelectProgrammingLanguageAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page.modal +package com.anytypeio.anytype.core_ui.features.editor.modal import android.view.LayoutInflater import android.view.View @@ -6,7 +6,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.modal.SelectProgrammingLanguageAdapter.Holder +import com.anytypeio.anytype.core_ui.features.editor.modal.SelectProgrammingLanguageAdapter.Holder import kotlinx.android.synthetic.main.item_select_programming_language.view.* class SelectProgrammingLanguageAdapter( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/DefaultScrollAndMoveTargetDescriptor.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/DefaultScrollAndMoveTargetDescriptor.kt similarity index 58% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/DefaultScrollAndMoveTargetDescriptor.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/DefaultScrollAndMoveTargetDescriptor.kt index 26043d6e25..2d8be31d8e 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/DefaultScrollAndMoveTargetDescriptor.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/DefaultScrollAndMoveTargetDescriptor.kt @@ -1,7 +1,7 @@ -package com.anytypeio.anytype.core_ui.features.page.scrollandmove +package com.anytypeio.anytype.core_ui.features.editor.scrollandmove -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTarget -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTarget +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor class DefaultScrollAndMoveTargetDescriptor : ScrollAndMoveTargetDescriptor { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/ScrollAndMoveStateListener.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/ScrollAndMoveStateListener.kt similarity index 82% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/ScrollAndMoveStateListener.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/ScrollAndMoveStateListener.kt index da44b8488b..9e17aa2e44 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/ScrollAndMoveStateListener.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/ScrollAndMoveStateListener.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page.scrollandmove +package com.anytypeio.anytype.core_ui.features.editor.scrollandmove import androidx.recyclerview.widget.RecyclerView diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/ScrollAndMoveTargetHighlighter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/ScrollAndMoveTargetHighlighter.kt similarity index 85% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/ScrollAndMoveTargetHighlighter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/ScrollAndMoveTargetHighlighter.kt index 4bc5eed588..24982697dd 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/scrollandmove/ScrollAndMoveTargetHighlighter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/scrollandmove/ScrollAndMoveTargetHighlighter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page.scrollandmove +package com.anytypeio.anytype.core_ui.features.editor.scrollandmove import android.graphics.Canvas import android.graphics.Point @@ -6,12 +6,12 @@ import android.graphics.Rect import android.graphics.drawable.Drawable import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.core_ui.features.page.SupportNesting -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTarget -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor.Companion.END_RANGE -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor.Companion.INNER_RANGE -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor.Companion.START_RANGE +import com.anytypeio.anytype.core_ui.features.editor.SupportNesting +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTarget +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor.Companion.END_RANGE +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor.Companion.INNER_RANGE +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor.Companion.START_RANGE class ScrollAndMoveTargetHighlighter( private val screen: Point, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashActionsAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashActionsAdapter.kt similarity index 80% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashActionsAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashActionsAdapter.kt index 13b3308844..9fe68231a8 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashActionsAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashActionsAdapter.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.ActionMenuHolder -import com.anytypeio.anytype.core_ui.features.page.slash.holders.SubheaderMenuHolder -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.ActionMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.SubheaderMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem class SlashActionsAdapter( items: List, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashAlignmentAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashAlignmentAdapter.kt similarity index 80% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashAlignmentAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashAlignmentAdapter.kt index f30be519bb..85c492cd6a 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashAlignmentAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashAlignmentAdapter.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.AlignMenuHolder -import com.anytypeio.anytype.core_ui.features.page.slash.holders.SubheaderMenuHolder -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.AlignMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.SubheaderMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem class SlashAlignmentAdapter( items: List, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashBaseAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashBaseAdapter.kt similarity index 89% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashBaseAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashBaseAdapter.kt index 4321a0ba45..6fd934d3dc 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashBaseAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashBaseAdapter.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.SubheaderMenuHolder -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.SubheaderMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_subheader.view.* abstract class SlashBaseAdapter( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashColorAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashColorAdapter.kt similarity index 89% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashColorAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashColorAdapter.kt index 6dc8c7b3d7..d7d2227591 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashColorAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashColorAdapter.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.ColorMenuHolder -import com.anytypeio.anytype.core_ui.features.page.slash.holders.SubheaderMenuHolder -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.ColorMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.SubheaderMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_subheader.view.* class SlashColorAdapter( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashMainAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashMainAdapter.kt similarity index 86% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashMainAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashMainAdapter.kt index f8ce0a3d87..3f970bb066 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashMainAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashMainAdapter.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.MainMenuHolder -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.MainMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem class SlashMainAdapter( private var items: List, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashMediaAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashMediaAdapter.kt similarity index 80% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashMediaAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashMediaAdapter.kt index d0ca4922af..78beb30156 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashMediaAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashMediaAdapter.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.MediaMenuHolder -import com.anytypeio.anytype.core_ui.features.page.slash.holders.SubheaderMenuHolder -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.MediaMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.SubheaderMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem class SlashMediaAdapter( items: List, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashObjectTypesAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashObjectTypesAdapter.kt similarity index 89% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashObjectTypesAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashObjectTypesAdapter.kt index 552a40a2f4..065b0fb673 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashObjectTypesAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashObjectTypesAdapter.kt @@ -1,11 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.* -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.ObjectTypeMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.SubheaderMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_subheader.view.* class SlashObjectTypesAdapter( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashOtherAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashOtherAdapter.kt similarity index 80% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashOtherAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashOtherAdapter.kt index 52de87152b..7e45563ef4 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashOtherAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashOtherAdapter.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.OtherMenuHolder -import com.anytypeio.anytype.core_ui.features.page.slash.holders.SubheaderMenuHolder -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.OtherMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.SubheaderMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem class SlashOtherAdapter( items: List, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashRelationsAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashRelationsAdapter.kt similarity index 97% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashRelationsAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashRelationsAdapter.kt index a6b36b3371..260355c0c2 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashRelationsAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashRelationsAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.View @@ -7,12 +7,12 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.features.editor.holders.relations.RelationViewHolder -import com.anytypeio.anytype.core_ui.features.page.slash.holders.RelationsSubheaderMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.RelationsSubheaderMenuHolder import com.anytypeio.anytype.core_ui.features.relations.DocumentRelationAdapter import com.anytypeio.anytype.core_utils.diff.DefaultDiffUtil import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.relations.RelationListViewModel import kotlinx.android.synthetic.main.item_slash_widget_subheader.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashStyleAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashStyleAdapter.kt similarity index 80% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashStyleAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashStyleAdapter.kt index 70ce3bc5f9..454afc18cb 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashStyleAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashStyleAdapter.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.slash.holders.StyleMenuHolder -import com.anytypeio.anytype.core_ui.features.page.slash.holders.SubheaderMenuHolder -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.StyleMenuHolder +import com.anytypeio.anytype.core_ui.features.editor.slash.holders.SubheaderMenuHolder +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem class SlashStyleAdapter( items: List, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashWidget.kt similarity index 95% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashWidget.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashWidget.kt index 680c822742..ce9748725d 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/SlashWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/SlashWidget.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page.slash +package com.anytypeio.anytype.core_ui.features.editor.slash import android.content.Context import android.util.AttributeSet @@ -7,8 +7,8 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.LinearLayoutManager import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.slash.SlashWidgetState -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState import kotlinx.android.synthetic.main.widget_editor_slash.view.* import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.consumeAsFlow diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ActionMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ActionMenuHolder.kt similarity index 94% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ActionMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ActionMenuHolder.kt index c66f70dc36..e01745e248 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ActionMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ActionMenuHolder.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.gone -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_style.view.* class ActionMenuHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/AlignMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/AlignMenuHolder.kt similarity index 88% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/AlignMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/AlignMenuHolder.kt index cb1229c44e..285de42533 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/AlignMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/AlignMenuHolder.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.gone -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_style.view.* class AlignMenuHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ColorMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ColorMenuHolder.kt similarity index 84% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ColorMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ColorMenuHolder.kt index 1f816fe5bc..35b1ad1516 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ColorMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ColorMenuHolder.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_color.view.* import java.util.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/MainMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/MainMenuHolder.kt similarity index 93% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/MainMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/MainMenuHolder.kt index 9b96a09190..45c6bde540 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/MainMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/MainMenuHolder.kt @@ -1,9 +1,9 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_main.view.* class MainMenuHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/MediaMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/MediaMenuHolder.kt similarity index 92% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/MediaMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/MediaMenuHolder.kt index 3ce304be51..f62b41b07d 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/MediaMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/MediaMenuHolder.kt @@ -1,9 +1,9 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_style.view.* class MediaMenuHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ObjectTypeMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ObjectTypeMenuHolder.kt similarity index 83% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ObjectTypeMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ObjectTypeMenuHolder.kt index a4b8e58463..84e6ca3954 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/ObjectTypeMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/ObjectTypeMenuHolder.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_object_type.view.* class ObjectTypeMenuHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/OtherMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/OtherMenuHolder.kt similarity index 85% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/OtherMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/OtherMenuHolder.kt index e49be8bd89..a3702a80f6 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/OtherMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/OtherMenuHolder.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.gone -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_style.view.* class OtherMenuHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/RelationsSubheaderMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/RelationsSubheaderMenuHolder.kt similarity index 93% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/RelationsSubheaderMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/RelationsSubheaderMenuHolder.kt index 578c182d79..7fc71ffb82 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/RelationsSubheaderMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/RelationsSubheaderMenuHolder.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/StyleMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/StyleMenuHolder.kt similarity index 97% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/StyleMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/StyleMenuHolder.kt index bfaba0d31f..af731499f6 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/StyleMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/StyleMenuHolder.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_style.view.* class StyleMenuHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/SubheaderMenuHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/SubheaderMenuHolder.kt similarity index 95% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/SubheaderMenuHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/SubheaderMenuHolder.kt index 3861a40a64..6b40c60cd4 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/page/slash/holders/SubheaderMenuHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/slash/holders/SubheaderMenuHolder.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.core_ui.features.page.slash.holders +package com.anytypeio.anytype.core_ui.features.editor.slash.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import kotlinx.android.synthetic.main.item_slash_widget_subheader.view.* class SubheaderMenuHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/ObjectActionAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectActionAdapter.kt similarity index 95% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/ObjectActionAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectActionAdapter.kt index a1df0a5bf3..aa6b868ca2 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/ObjectActionAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectActionAdapter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.`object` +package com.anytypeio.anytype.core_ui.features.objects import android.view.LayoutInflater import android.view.ViewGroup @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.`object`.ObjectAction +import com.anytypeio.anytype.presentation.objects.ObjectAction import kotlinx.android.synthetic.main.item_object_menu_action.view.* class ObjectActionAdapter( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/ObjectTypeBaseAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectTypeBaseAdapter.kt similarity index 86% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/ObjectTypeBaseAdapter.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectTypeBaseAdapter.kt index e26e194a5d..19db408489 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/ObjectTypeBaseAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectTypeBaseAdapter.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.core_ui.features.`object` +package com.anytypeio.anytype.core_ui.features.objects import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.`object`.holders.ObjectTypeHolder -import com.anytypeio.anytype.presentation.`object`.ObjectTypeView +import com.anytypeio.anytype.core_ui.features.objects.holders.ObjectTypeHolder +import com.anytypeio.anytype.presentation.objects.ObjectTypeView class ObjectTypeBaseAdapter( private val onItemClick: (String) -> Unit diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/holders/ObjectTypeHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/holders/ObjectTypeHolder.kt similarity index 87% rename from core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/holders/ObjectTypeHolder.kt rename to core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/holders/ObjectTypeHolder.kt index 949d95b54e..6b4b982caf 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/object/holders/ObjectTypeHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/holders/ObjectTypeHolder.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.core_ui.features.`object`.holders +package com.anytypeio.anytype.core_ui.features.objects.holders import android.view.LayoutInflater import android.view.ViewGroup @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.`object`.ObjectTypeView +import com.anytypeio.anytype.presentation.objects.ObjectTypeView import kotlinx.android.synthetic.main.item_object_type_item.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/relations/holders/FeaturedRelationViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/relations/holders/FeaturedRelationViewHolder.kt index 1702993c03..4c2c51701f 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/relations/holders/FeaturedRelationViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/relations/holders/FeaturedRelationViewHolder.kt @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_utils.ext.setDrawableColor -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.DocumentRelationView import kotlinx.android.synthetic.main.item_featured_relation_default.view.* import kotlinx.android.synthetic.main.item_featured_relation_status.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/sets/CreateFilterAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/sets/CreateFilterAdapter.kt index c345a78fd5..4c4209b331 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/sets/CreateFilterAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/sets/CreateFilterAdapter.kt @@ -10,7 +10,7 @@ import com.anytypeio.anytype.core_utils.ext.formatTimestamp import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.setDrawableColor import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.relations.DateDescription import com.anytypeio.anytype.presentation.sets.filter.CreateFilterView import kotlinx.android.synthetic.main.item_create_filter_checkbox.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/menu/TextBlockContextMenu.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/menu/TextBlockContextMenu.kt index 27f1da90d9..5999928e29 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/menu/TextBlockContextMenu.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/menu/TextBlockContextMenu.kt @@ -4,7 +4,7 @@ import android.view.ActionMode import android.view.Menu import android.view.MenuItem import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.Markup class TextBlockContextMenu( private val menuType: ContextMenuType, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/tools/TextWatchers.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/tools/TextWatchers.kt index 32b0f8b4bb..511c573f20 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/tools/TextWatchers.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/tools/TextWatchers.kt @@ -4,7 +4,7 @@ import android.text.Editable import android.text.TextWatcher import com.anytypeio.anytype.core_ui.tools.MentionHelper.isMentionDeleted import com.anytypeio.anytype.core_ui.tools.MentionHelper.isMentionSuggestTriggered -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent import timber.log.Timber class DefaultTextWatcher(val onTextChanged: (Editable) -> Unit) : TextWatcher { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/BlockActionBarItem.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/BlockActionBarItem.kt index 775a293382..f346a23eb2 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/BlockActionBarItem.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/BlockActionBarItem.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.drawable -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType import kotlinx.android.synthetic.main.action_item.view.* class BlockActionBarItem @JvmOverloads constructor( diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/FeaturedRelationGroupWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/FeaturedRelationGroupWidget.kt index ed230d0526..0826f667eb 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/FeaturedRelationGroupWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/FeaturedRelationGroupWidget.kt @@ -11,9 +11,9 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.setDrawableColor -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.relations.DocumentRelationView class FeaturedRelationGroupWidget : ConstraintLayout { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectCardIconWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectCardIconWidget.kt index 799b5d737d..cbb3f7d55f 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectCardIconWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectCardIconWidget.kt @@ -7,7 +7,7 @@ import android.widget.FrameLayout import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.emojifier.Emojifier -import com.anytypeio.anytype.presentation.`object`.ObjectIcon +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.bitmap.CenterCrop diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt index 7f4f5bff15..8445e05f5a 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt @@ -13,7 +13,7 @@ import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.emojifier.Emojifier -import com.anytypeio.anytype.presentation.`object`.ObjectIcon +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import kotlinx.android.synthetic.main.widget_object_icon.view.* diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StyleToolbarMainWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StyleToolbarMainWidget.kt index 1e748f97ba..e84f42f2bb 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StyleToolbarMainWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StyleToolbarMainWidget.kt @@ -11,7 +11,7 @@ import com.anytypeio.anytype.core_models.TextStyle import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.toast import com.anytypeio.anytype.core_ui.reactive.clicks -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock import kotlinx.android.synthetic.main.widget_style_toolbar_main.view.* import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt index cb39bd77b8..7c7c169d55 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt @@ -5,7 +5,7 @@ import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.color -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor class StatusWidget @JvmOverloads constructor( context: Context, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt index c54ad3f5b1..553a99e207 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt @@ -3,14 +3,13 @@ package com.anytypeio.anytype.core_ui.widgets.text import android.content.Context import android.text.TextUtils import android.util.AttributeSet -import android.widget.TextView import androidx.appcompat.widget.AppCompatTextView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.setDrawableColor import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor class TagWidget @JvmOverloads constructor( context: Context, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupColorToolbarWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupColorToolbarWidget.kt index 038530d1ed..42da49648d 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupColorToolbarWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupColorToolbarWidget.kt @@ -5,11 +5,11 @@ import android.util.AttributeSet import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.features.page.MarkupColorAdapter +import com.anytypeio.anytype.core_ui.features.editor.MarkupColorAdapter import com.anytypeio.anytype.core_ui.layout.SpacingItemDecoration import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.markup.MarkupColorView +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.markup.MarkupColorView class MarkupColorToolbarWidget @JvmOverloads constructor( context: Context, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupToolbarWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupToolbarWidget.kt index df31bac851..219d5fe35b 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupToolbarWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupToolbarWidget.kt @@ -9,9 +9,9 @@ import com.anytypeio.anytype.core_ui.extensions.tint import com.anytypeio.anytype.core_ui.reactive.clicks import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.markup.MarkupStyleDescriptor +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.markup.MarkupStyleDescriptor import kotlinx.android.synthetic.main.widget_markup_toolbar_main.view.* import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/SearchToolbarWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/SearchToolbarWidget.kt index 75bbab172f..6905fcd69f 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/SearchToolbarWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/SearchToolbarWidget.kt @@ -13,7 +13,7 @@ import com.anytypeio.anytype.core_utils.ext.focusAndShowKeyboard import com.anytypeio.anytype.core_utils.ext.hideKeyboard import kotlinx.android.synthetic.main.widget_doc_search_engine_toolbar.view.* import kotlinx.coroutines.flow.* -import com.anytypeio.anytype.presentation.page.editor.search.SearchInDocEvent as Event +import com.anytypeio.anytype.presentation.editor.editor.search.SearchInDocEvent as Event class SearchToolbarWidget : ConstraintLayout { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/StyleToolbarExtraWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/StyleToolbarExtraWidget.kt index 6480b61349..545e38abad 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/StyleToolbarExtraWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/StyleToolbarExtraWidget.kt @@ -6,11 +6,11 @@ import android.view.LayoutInflater import androidx.cardview.widget.CardView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.reactive.clicks -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.styling.StyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.StylingEvent +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingEvent import kotlinx.android.synthetic.main.widget_block_style_extra.view.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/adapter/MentionAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/adapter/MentionAdapter.kt index 993f82f0bb..f4ae584977 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/adapter/MentionAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/adapter/MentionAdapter.kt @@ -6,8 +6,8 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.features.navigation.DefaultObjectViewAdapter +import com.anytypeio.anytype.presentation.editor.editor.mention.filterMentionsBy import com.anytypeio.anytype.presentation.navigation.DefaultObjectView -import com.anytypeio.anytype.presentation.page.editor.mention.filterMentionsBy class MentionAdapter( private var data: ArrayList, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleAdapter.kt index d68a0a3f0a..64369d8ac3 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleAdapter.kt @@ -4,12 +4,12 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.styling.StyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.StylingEvent -import com.anytypeio.anytype.presentation.page.editor.styling.StylingType +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingEvent +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingType class StyleAdapter( var props: ControlPanelState.Toolbar.Styling.Props?, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleBackgroundViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleBackgroundViewHolder.kt index 9d6d51cc2b..68643ee288 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleBackgroundViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleBackgroundViewHolder.kt @@ -2,8 +2,8 @@ package com.anytypeio.anytype.core_ui.widgets.toolbar.style import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.styling.StylingEvent +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingEvent import kotlinx.android.synthetic.main.block_style_toolbar_background.view.* class StyleBackgroundViewHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleColorToolbarWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleColorToolbarWidget.kt index c5db3add24..840aaa798c 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleColorToolbarWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleColorToolbarWidget.kt @@ -6,9 +6,9 @@ import android.view.LayoutInflater import android.widget.TextView import androidx.cardview.widget.CardView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.styling.StyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.StylingEvent +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingEvent import com.google.android.material.tabs.TabLayoutMediator import kotlinx.android.synthetic.main.widget_block_style_toolbar_new.view.* import kotlinx.coroutines.channels.Channel diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleTextColorViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleTextColorViewHolder.kt index f3fe91c337..9f66d005ed 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleTextColorViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleTextColorViewHolder.kt @@ -2,8 +2,8 @@ package com.anytypeio.anytype.core_ui.widgets.toolbar.style import android.view.View import androidx.recyclerview.widget.RecyclerView -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.styling.StylingEvent +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingEvent import kotlinx.android.synthetic.main.block_style_toolbar_color.view.* class StyleTextColorViewHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockAdapterTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockAdapterTest.kt index e9ccd23a6e..803c8df141 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockAdapterTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockAdapterTest.kt @@ -10,6 +10,16 @@ import androidx.core.view.marginLeft import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider +import com.anytypeio.anytype.core_ui.features.editor.BlockAdapter +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.BACKGROUND_COLOR_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.CURSOR_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.FOCUS_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.READ_WRITE_MODE_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.SELECTION_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.TEXT_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.TEXT_COLOR_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.features.editor.holders.error.FileError import com.anytypeio.anytype.core_ui.features.editor.holders.error.PictureError import com.anytypeio.anytype.core_ui.features.editor.holders.error.VideoError @@ -26,21 +36,11 @@ import com.anytypeio.anytype.core_ui.features.editor.holders.text.* import com.anytypeio.anytype.core_ui.features.editor.holders.upload.FileUpload import com.anytypeio.anytype.core_ui.features.editor.holders.upload.PictureUpload import com.anytypeio.anytype.core_ui.features.editor.holders.upload.VideoUpload -import com.anytypeio.anytype.core_ui.features.page.BlockAdapter -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.BACKGROUND_COLOR_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.CURSOR_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.FOCUS_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.READ_WRITE_MODE_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.SELECTION_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.TEXT_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.TEXT_COLOR_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder import com.anytypeio.anytype.core_ui.tools.ClipboardInterceptor import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.hexColorCode -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import kotlinx.android.synthetic.main.item_block_bookmark_placeholder.view.* import kotlinx.android.synthetic.main.item_block_checkbox.view.* import kotlinx.android.synthetic.main.item_block_page.view.* diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewDiffUtilTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewDiffUtilTest.kt index ed854ba7de..e9fd748eb7 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewDiffUtilTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewDiffUtilTest.kt @@ -1,11 +1,11 @@ package com.anytypeio.anytype.core_ui -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.MARKUP_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Companion.TEXT_CHANGED -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil.Payload -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.MARKUP_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.TEXT_CHANGED +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Payload +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewSearchTextTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewSearchTextTest.kt index 045dd1f86b..74020634a8 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewSearchTextTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/BlockViewSearchTextTest.kt @@ -1,8 +1,8 @@ package com.anytypeio.anytype.core_ui -import com.anytypeio.anytype.presentation.page.editor.ext.nextSearchTarget -import com.anytypeio.anytype.presentation.page.editor.ext.previousSearchTarget -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.ext.nextSearchTarget +import com.anytypeio.anytype.presentation.editor.editor.ext.previousSearchTarget +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import kotlin.test.assertEquals diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/DefaultPatternMatcherTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/DefaultPatternMatcherTest.kt index a3cb9ebea9..0459c466a8 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/DefaultPatternMatcherTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/DefaultPatternMatcherTest.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.core_ui -import com.anytypeio.anytype.presentation.page.editor.pattern.DefaultPatternMatcher -import com.anytypeio.anytype.presentation.page.editor.pattern.Pattern +import com.anytypeio.anytype.presentation.editor.editor.pattern.DefaultPatternMatcher +import com.anytypeio.anytype.presentation.editor.editor.pattern.Pattern import org.junit.Test import kotlin.test.assertEquals diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HeaderBlockTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HeaderBlockTest.kt index a9535b422a..f69af6b9ae 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HeaderBlockTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HeaderBlockTest.kt @@ -8,15 +8,15 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider import com.anytypeio.anytype.core_ui.common.Span +import com.anytypeio.anytype.core_ui.features.editor.BlockAdapter +import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.features.editor.holders.text.HeaderOne import com.anytypeio.anytype.core_ui.features.editor.holders.text.HeaderThree import com.anytypeio.anytype.core_ui.features.editor.holders.text.HeaderTwo -import com.anytypeio.anytype.core_ui.features.page.BlockAdapter -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder import com.anytypeio.anytype.core_ui.tools.ClipboardInterceptor -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HighlightingBlockTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HighlightingBlockTest.kt index 0682b86889..c793e720d6 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HighlightingBlockTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/HighlightingBlockTest.kt @@ -9,12 +9,12 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider import com.anytypeio.anytype.core_ui.common.Span +import com.anytypeio.anytype.core_ui.features.editor.BlockAdapter +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.features.editor.holders.text.Highlight -import com.anytypeio.anytype.core_ui.features.page.BlockAdapter -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder import com.anytypeio.anytype.core_ui.tools.ClipboardInterceptor -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/MarkupExtTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/MarkupExtTest.kt index daff91f952..fe931140a5 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/MarkupExtTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/MarkupExtTest.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.core_ui import com.anytypeio.anytype.core_ui.common.isLinksOrMentionsPresent -import com.anytypeio.anytype.presentation.page.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.Markup import org.junit.Test import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/common/SpanTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/common/SpanTest.kt index 64f8909f9f..f091ebda1b 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/common/SpanTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/common/SpanTest.kt @@ -2,7 +2,7 @@ package com.anytypeio.anytype.core_ui.common import androidx.core.text.getSpans import com.anytypeio.anytype.core_utils.ext.hasSpan -import com.anytypeio.anytype.presentation.page.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.Markup import org.mockito.MockitoAnnotations import org.mockito.kotlin.doReturn import org.mockito.kotlin.stub diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCheckboxTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCheckboxTest.kt index 4a27987b70..8bfec6d8e0 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCheckboxTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCheckboxTest.kt @@ -8,11 +8,9 @@ import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.common.CheckedCheckboxColorSpan import com.anytypeio.anytype.core_ui.features.editor.holders.text.Bulleted import com.anytypeio.anytype.core_ui.features.editor.holders.text.Checkbox -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCursorBindingTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCursorBindingTest.kt index f2de8147b5..777f7bba28 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCursorBindingTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterCursorBindingTest.kt @@ -8,10 +8,8 @@ import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ApplicationProvider import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.* -import com.anytypeio.anytype.core_ui.features.page.BlockAdapter -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder import com.anytypeio.anytype.core_ui.tools.ClipboardInterceptor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterIndentationTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterIndentationTest.kt index de5084a464..cbcc9e0b2b 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterIndentationTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterIndentationTest.kt @@ -7,10 +7,8 @@ import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.features.editor.holders.text.* -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder import com.anytypeio.anytype.core_utils.ext.dimen -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterMovementMethodTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterMovementMethodTest.kt index 63d497bdab..e971401374 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterMovementMethodTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterMovementMethodTest.kt @@ -6,11 +6,9 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Paragraph -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder import com.anytypeio.anytype.core_ui.tools.CustomBetterLinkMovementMethod -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterNumberedListTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterNumberedListTest.kt index c3160084ee..ea53fe5e85 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterNumberedListTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterNumberedListTest.kt @@ -5,9 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Numbered -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterReadWriteModeTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterReadWriteModeTest.kt index 117153c590..fb96b6feaf 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterReadWriteModeTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterReadWriteModeTest.kt @@ -8,9 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Checkbox import com.anytypeio.anytype.core_ui.features.editor.holders.text.Paragraph -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTestSetup.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTestSetup.kt index f60321f791..cfbe52bb46 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTestSetup.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTestSetup.kt @@ -3,9 +3,8 @@ package com.anytypeio.anytype.core_ui.features.editor import android.content.Context import android.text.Editable import androidx.test.core.app.ApplicationProvider -import com.anytypeio.anytype.core_ui.features.page.BlockAdapter import com.anytypeio.anytype.core_ui.tools.ClipboardInterceptor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import java.util.* open class BlockAdapterTestSetup { diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextBindingTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextBindingTest.kt index 87a0292d72..501304b3ff 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextBindingTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextBindingTest.kt @@ -5,8 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.* -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextColorTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextColorTest.kt index 50df234711..cbdcecdc60 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextColorTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterTextColorTest.kt @@ -5,10 +5,8 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Bulleted -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterToggleTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterToggleTest.kt index 402ddcec63..69d16e3fd0 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterToggleTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/BlockAdapterToggleTest.kt @@ -5,9 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Toggle -import com.anytypeio.anytype.core_ui.features.page.BlockViewDiffUtil -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockSetTextTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockSetTextTest.kt index 88d88a0455..09c3741e10 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockSetTextTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockSetTextTest.kt @@ -6,10 +6,9 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.MockDataFactory import com.anytypeio.anytype.core_ui.features.editor.holders.text.Paragraph -import com.anytypeio.anytype.core_ui.features.page.BlockViewHolder import com.anytypeio.anytype.core_ui.tools.CustomBetterLinkMovementMethod -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/navigation/PageLinkViewKtTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/navigation/PageLinkViewKtTest.kt index 2d9d44478a..fc8c50e6f2 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/navigation/PageLinkViewKtTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/navigation/PageLinkViewKtTest.kt @@ -1,10 +1,10 @@ package com.anytypeio.anytype.core_ui.features.navigation import com.anytypeio.anytype.core_ui.MockDataFactory -import com.anytypeio.anytype.presentation.`object`.ObjectIcon import com.anytypeio.anytype.presentation.navigation.ObjectView import com.anytypeio.anytype.presentation.navigation.filterBy import com.anytypeio.anytype.presentation.navigation.isContainsText +import com.anytypeio.anytype.presentation.objects.ObjectIcon import org.junit.Assert.* import org.junit.Test diff --git a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/page/BlockViewTest.kt b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/page/BlockViewTest.kt index 7de317cd5c..a74b785850 100644 --- a/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/page/BlockViewTest.kt +++ b/core-ui/src/test/java/com/anytypeio/anytype/core_ui/features/page/BlockViewTest.kt @@ -1,7 +1,8 @@ package com.anytypeio.anytype.core_ui.features.page import com.anytypeio.anytype.core_ui.MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Assert.assertEquals import org.junit.Test diff --git a/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/model/PageIconPickerViewDiffUtil.kt b/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/model/ObjectIconPickerViewDiffUtil.kt similarity index 85% rename from library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/model/PageIconPickerViewDiffUtil.kt rename to library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/model/ObjectIconPickerViewDiffUtil.kt index 8d32173c59..d94d90afb9 100644 --- a/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/model/PageIconPickerViewDiffUtil.kt +++ b/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/model/ObjectIconPickerViewDiffUtil.kt @@ -1,9 +1,9 @@ package com.anytypeio.anytype.library_page_icon_picker_widget.model import androidx.recyclerview.widget.DiffUtil -import com.anytypeio.anytype.presentation.page.picker.EmojiPickerView +import com.anytypeio.anytype.presentation.editor.picker.EmojiPickerView -class PageIconPickerViewDiffUtil( +class ObjectIconPickerViewDiffUtil( private val old: List, private val new: List ) : DiffUtil.Callback() { diff --git a/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/ui/DocumentEmojiIconPickerAdapter.kt b/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/ui/DocumentEmojiIconPickerAdapter.kt index 7a22da2cb2..3a805f60c4 100644 --- a/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/ui/DocumentEmojiIconPickerAdapter.kt +++ b/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/ui/DocumentEmojiIconPickerAdapter.kt @@ -4,9 +4,9 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.library_page_icon_picker_widget.R -import com.anytypeio.anytype.presentation.page.picker.EmojiPickerView -import com.anytypeio.anytype.presentation.page.picker.EmojiPickerView.Companion.HOLDER_EMOJI_CATEGORY_HEADER -import com.anytypeio.anytype.presentation.page.picker.EmojiPickerView.Companion.HOLDER_EMOJI_ITEM +import com.anytypeio.anytype.presentation.editor.picker.EmojiPickerView +import com.anytypeio.anytype.presentation.editor.picker.EmojiPickerView.Companion.HOLDER_EMOJI_CATEGORY_HEADER +import com.anytypeio.anytype.presentation.editor.picker.EmojiPickerView.Companion.HOLDER_EMOJI_ITEM class DocumentEmojiIconPickerAdapter( private var views: List, diff --git a/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/ui/DocumentEmojiIconPickerViewHolder.kt b/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/ui/DocumentEmojiIconPickerViewHolder.kt index 2f1d46f4ff..25d7bc9c66 100644 --- a/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/ui/DocumentEmojiIconPickerViewHolder.kt +++ b/library-page-icon-picker-widget/src/main/java/com/anytypeio/anytype/library_page_icon_picker_widget/ui/DocumentEmojiIconPickerViewHolder.kt @@ -5,7 +5,7 @@ import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.emojifier.Emojifier import com.anytypeio.anytype.emojifier.data.Emoji import com.anytypeio.anytype.library_page_icon_picker_widget.R -import com.anytypeio.anytype.presentation.page.picker.EmojiPickerView +import com.anytypeio.anytype.presentation.editor.picker.EmojiPickerView import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import kotlinx.android.synthetic.main.item_page_icon_picker_emoji_category_header.view.* diff --git a/library-page-icon-picker-widget/src/test/java/com/anytypeio/anytype/library_page_icon_picker_widget/DocumentEmojiIconPickerViewDiffUtilTest.kt b/library-page-icon-picker-widget/src/test/java/com/anytypeio/anytype/library_page_icon_picker_widget/DocumentEmojiIconPickerViewDiffUtilTest.kt index d515dd8362..08351399f7 100644 --- a/library-page-icon-picker-widget/src/test/java/com/anytypeio/anytype/library_page_icon_picker_widget/DocumentEmojiIconPickerViewDiffUtilTest.kt +++ b/library-page-icon-picker-widget/src/test/java/com/anytypeio/anytype/library_page_icon_picker_widget/DocumentEmojiIconPickerViewDiffUtilTest.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.library_page_icon_picker_widget -import com.anytypeio.anytype.library_page_icon_picker_widget.model.PageIconPickerViewDiffUtil -import com.anytypeio.anytype.presentation.page.picker.EmojiPickerView +import com.anytypeio.anytype.library_page_icon_picker_widget.model.ObjectIconPickerViewDiffUtil +import com.anytypeio.anytype.presentation.editor.picker.EmojiPickerView import org.junit.Test import kotlin.test.assertEquals @@ -29,7 +29,7 @@ class DocumentEmojiIconPickerViewDiffUtilTest { ) ) - val util = PageIconPickerViewDiffUtil( + val util = ObjectIconPickerViewDiffUtil( old = old, new = new ) diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/Dashboard.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/Dashboard.kt similarity index 61% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/Dashboard.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/Dashboard.kt index 70954cd5d7..71deb83dde 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/Dashboard.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/Dashboard.kt @@ -1,7 +1,7 @@ -package com.anytypeio.anytype.presentation.desktop +package com.anytypeio.anytype.presentation.dashboard import com.anytypeio.anytype.core_models.ObjectType -import com.anytypeio.anytype.presentation.page.editor.Store +import com.anytypeio.anytype.presentation.editor.editor.Store interface Dashboard { data class Storage( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/DashboardView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/DashboardView.kt similarity index 93% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/DashboardView.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/DashboardView.kt index 3053f727aa..3ed76cf26f 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/DashboardView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/DashboardView.kt @@ -1,9 +1,9 @@ -package com.anytypeio.anytype.presentation.desktop +package com.anytypeio.anytype.presentation.dashboard import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Url -import com.anytypeio.anytype.presentation.`object`.ObjectIcon +import com.anytypeio.anytype.presentation.objects.ObjectIcon sealed class DashboardView { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardEventConverter.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardEventConverter.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardEventConverter.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardEventConverter.kt index dd9e28968c..662a760625 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardEventConverter.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardEventConverter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.desktop +package com.anytypeio.anytype.presentation.dashboard import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_models.SmartBlockType diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardStateMachine.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardStateMachine.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardStateMachine.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardStateMachine.kt index 08307c3a9d..fd411d161d 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardStateMachine.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardStateMachine.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.desktop +package com.anytypeio.anytype.presentation.dashboard import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Id @@ -9,7 +9,7 @@ import com.anytypeio.anytype.core_models.ext.set import com.anytypeio.anytype.core_models.ext.unset import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.common.StateReducer -import com.anytypeio.anytype.presentation.desktop.HomeDashboardStateMachine.* +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardStateMachine.* import com.anytypeio.anytype.presentation.extension.addAndSortByIds import com.anytypeio.anytype.presentation.extension.sortByIds import com.anytypeio.anytype.presentation.extension.updateDetails diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModel.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModel.kt index 577f8c5e73..aa2a39de0f 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.desktop +package com.anytypeio.anytype.presentation.dashboard import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope @@ -29,18 +29,18 @@ import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.page.CreatePage import com.anytypeio.anytype.presentation.BuildConfig -import com.anytypeio.anytype.presentation.`object`.ObjectIcon -import com.anytypeio.anytype.presentation.desktop.HomeDashboardStateMachine.Interactor -import com.anytypeio.anytype.presentation.desktop.HomeDashboardStateMachine.State +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardStateMachine.Interactor +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardStateMachine.State import com.anytypeio.anytype.presentation.mapper.toView import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.navigation.SupportNavigation +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.settings.EditorSettings import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import timber.log.Timber -import com.anytypeio.anytype.presentation.desktop.HomeDashboardStateMachine as Machine +import com.anytypeio.anytype.presentation.dashboard.HomeDashboardStateMachine as Machine class HomeDashboardViewModel( private val getProfile: GetProfile, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelFactory.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardViewModelFactory.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelFactory.kt index 75a3b2dda4..285a33d218 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/desktop/HomeDashboardViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.desktop +package com.anytypeio.anytype.presentation.dashboard import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/CloseableCoroutineScope.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/CloseableCoroutineScope.kt similarity index 90% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/CloseableCoroutineScope.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/CloseableCoroutineScope.kt index 9bc2a11fd0..5f392474be 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/CloseableCoroutineScope.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/CloseableCoroutineScope.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/ControlPanelMachine.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/ControlPanelMachine.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/ControlPanelMachine.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/ControlPanelMachine.kt index 1a7bf6b0b2..2cb2339286 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/ControlPanelMachine.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/ControlPanelMachine.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.TextBlock @@ -6,21 +6,21 @@ import com.anytypeio.anytype.core_models.TextStyle import com.anytypeio.anytype.core_models.ext.overlap import com.anytypeio.anytype.core_models.misc.Overlap import com.anytypeio.anytype.presentation.common.StateReducer +import com.anytypeio.anytype.presentation.editor.ControlPanelMachine.* +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState.Companion.init +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState.Toolbar +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingMode +import com.anytypeio.anytype.presentation.editor.editor.styling.getStyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.getSupportedMarkupTypes import com.anytypeio.anytype.presentation.extension.isInRange import com.anytypeio.anytype.presentation.extension.style import com.anytypeio.anytype.presentation.mapper.marks import com.anytypeio.anytype.presentation.navigation.DefaultObjectView -import com.anytypeio.anytype.presentation.page.ControlPanelMachine.* -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState.Companion.init -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState.Toolbar -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.slash.SlashWidgetState -import com.anytypeio.anytype.presentation.page.editor.styling.StylingMode -import com.anytypeio.anytype.presentation.page.editor.styling.getStyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.getSupportedMarkupTypes import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/DocumentExternalEventReducer.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducer.kt similarity index 99% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/DocumentExternalEventReducer.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducer.kt index 577274593a..1919a37ff4 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/DocumentExternalEventReducer.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducer.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/Editor.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/Editor.kt similarity index 82% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/Editor.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/Editor.kt index a9750190b6..0fe176b69c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/Editor.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/Editor.kt @@ -1,13 +1,12 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction import com.anytypeio.anytype.domain.editor.Editor import com.anytypeio.anytype.domain.editor.Editor.Focus -import com.anytypeio.anytype.presentation.page.editor.Proxy -import com.anytypeio.anytype.presentation.page.editor.Store -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.editor.Proxy +import com.anytypeio.anytype.presentation.editor.editor.Store +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder interface Editor { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/PageViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/PageViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt index b6cb5cad5b..98db06e977 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/PageViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -54,51 +54,51 @@ import com.anytypeio.anytype.domain.status.InterceptThreadStatus import com.anytypeio.anytype.presentation.BuildConfig import com.anytypeio.anytype.presentation.common.StateReducer import com.anytypeio.anytype.presentation.common.SupportCommand +import com.anytypeio.anytype.presentation.editor.ControlPanelMachine.Interactor +import com.anytypeio.anytype.presentation.editor.Editor.Restore +import com.anytypeio.anytype.presentation.editor.TurnIntoConstants.excludeCategoriesForDivider +import com.anytypeio.anytype.presentation.editor.TurnIntoConstants.excludeTypesForDotsDivider +import com.anytypeio.anytype.presentation.editor.TurnIntoConstants.excludeTypesForLineDivider +import com.anytypeio.anytype.presentation.editor.TurnIntoConstants.excludeTypesForText +import com.anytypeio.anytype.presentation.editor.TurnIntoConstants.excludedCategoriesForTextExperimental +import com.anytypeio.anytype.presentation.editor.TurnIntoConstants.excludedCategoriesForTextStable +import com.anytypeio.anytype.presentation.editor.editor.* +import com.anytypeio.anytype.presentation.editor.editor.Command +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.ext.* +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionConst.MENTION_PREFIX +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionConst.MENTION_TITLE_EMPTY +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.mention.getMentionName +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.Focusable +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor.Companion.END_RANGE +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor.Companion.INNER_RANGE +import com.anytypeio.anytype.presentation.editor.editor.sam.ScrollAndMoveTargetDescriptor.Companion.START_RANGE +import com.anytypeio.anytype.presentation.editor.editor.search.SearchInDocEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.* +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashExtensions.SLASH_CHAR +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashExtensions.SLASH_EMPTY_SEARCH_MAX +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashExtensions.getSlashWidgetAlignmentItems +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashExtensions.getSlashWidgetStyleItems +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingEvent +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingMode +import com.anytypeio.anytype.presentation.editor.model.TextUpdate +import com.anytypeio.anytype.presentation.editor.render.BlockViewRenderer +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.search.search +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.mapper.mark import com.anytypeio.anytype.presentation.mapper.style import com.anytypeio.anytype.presentation.mapper.toMentionView import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.navigation.DefaultObjectView import com.anytypeio.anytype.presentation.navigation.SupportNavigation -import com.anytypeio.anytype.presentation.page.ControlPanelMachine.Interactor -import com.anytypeio.anytype.presentation.page.Editor.Restore -import com.anytypeio.anytype.presentation.page.TurnIntoConstants.excludeCategoriesForDivider -import com.anytypeio.anytype.presentation.page.TurnIntoConstants.excludeTypesForDotsDivider -import com.anytypeio.anytype.presentation.page.TurnIntoConstants.excludeTypesForLineDivider -import com.anytypeio.anytype.presentation.page.TurnIntoConstants.excludeTypesForText -import com.anytypeio.anytype.presentation.page.TurnIntoConstants.excludedCategoriesForTextExperimental -import com.anytypeio.anytype.presentation.page.TurnIntoConstants.excludedCategoriesForTextStable -import com.anytypeio.anytype.presentation.page.editor.* -import com.anytypeio.anytype.presentation.page.editor.Command -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.ext.* -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.mention.MentionConst.MENTION_PREFIX -import com.anytypeio.anytype.presentation.page.editor.mention.MentionConst.MENTION_TITLE_EMPTY -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.mention.getMentionName -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.Focusable -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor.Companion.END_RANGE -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor.Companion.INNER_RANGE -import com.anytypeio.anytype.presentation.page.editor.sam.ScrollAndMoveTargetDescriptor.Companion.START_RANGE -import com.anytypeio.anytype.presentation.page.editor.search.SearchInDocEvent -import com.anytypeio.anytype.presentation.page.editor.slash.* -import com.anytypeio.anytype.presentation.page.editor.slash.SlashExtensions.SLASH_CHAR -import com.anytypeio.anytype.presentation.page.editor.slash.SlashExtensions.SLASH_EMPTY_SEARCH_MAX -import com.anytypeio.anytype.presentation.page.editor.slash.SlashExtensions.getSlashWidgetAlignmentItems -import com.anytypeio.anytype.presentation.page.editor.slash.SlashExtensions.getSlashWidgetStyleItems -import com.anytypeio.anytype.presentation.page.editor.styling.StylingEvent -import com.anytypeio.anytype.presentation.page.editor.styling.StylingMode -import com.anytypeio.anytype.presentation.page.model.TextUpdate -import com.anytypeio.anytype.presentation.page.render.BlockViewRenderer -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.search.search -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder -import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.relations.RelationListViewModel import com.anytypeio.anytype.presentation.relations.views @@ -111,9 +111,9 @@ import kotlinx.coroutines.launch import timber.log.Timber import java.util.* import java.util.regex.Pattern -import com.anytypeio.anytype.presentation.page.Editor.Mode as EditorMode +import com.anytypeio.anytype.presentation.editor.Editor.Mode as EditorMode -class PageViewModel( +class EditorViewModel( private val openPage: OpenPage, private val closePage: CloseBlock, private val createPage: CreatePage, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/PageViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModelFactory.kt similarity index 89% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/PageViewModelFactory.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModelFactory.kt index 4bba41cc63..0f80be5b2c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/PageViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -20,14 +20,14 @@ import com.anytypeio.anytype.domain.page.* import com.anytypeio.anytype.domain.page.navigation.GetListPages import com.anytypeio.anytype.domain.status.InterceptThreadStatus import com.anytypeio.anytype.presentation.common.StateReducer -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager -import com.anytypeio.anytype.presentation.page.editor.Orchestrator -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.editor.Orchestrator +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer import com.anytypeio.anytype.presentation.util.Dispatcher -open class PageViewModelFactory( +open class EditorViewModelFactory( private val openPage: OpenPage, - private val closePage: CloseBlock, + private val closeObject: CloseBlock, private val createPage: CreatePage, private val createDocument: CreateDocument, private val createObject: CreateObject, @@ -55,9 +55,9 @@ open class PageViewModelFactory( @Suppress("UNCHECKED_CAST") override fun create(modelClass: Class): T { - return PageViewModel( + return EditorViewModel( openPage = openPage, - closePage = closePage, + closePage = closeObject, archiveDocument = archiveDocument, interceptEvents = interceptEvents, interceptThreadStatus = interceptThreadStatus, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/LinkAddViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/LinkAddViewModel.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/LinkAddViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/LinkAddViewModel.kt index fff84e2359..6267d59824 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/LinkAddViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/LinkAddViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import androidx.lifecycle.* import com.anytypeio.anytype.domain.page.CheckForUnlink diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/TurnIntoConstants.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/TurnIntoConstants.kt similarity index 89% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/TurnIntoConstants.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/TurnIntoConstants.kt index 3d5caa6bad..d3f9d5f58a 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/TurnIntoConstants.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/TurnIntoConstants.kt @@ -1,6 +1,6 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock object TurnIntoConstants { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/archive/ArchiveViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/archive/ArchiveViewModel.kt similarity index 91% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/archive/ArchiveViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/archive/ArchiveViewModel.kt index 2e2463841c..58caa4941c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/archive/ArchiveViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/archive/ArchiveViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.archive +package com.anytypeio.anytype.presentation.editor.archive import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -23,23 +23,23 @@ import com.anytypeio.anytype.domain.page.CloseBlock import com.anytypeio.anytype.domain.page.OpenPage import com.anytypeio.anytype.presentation.common.StateReducer import com.anytypeio.anytype.presentation.common.SupportCommand +import com.anytypeio.anytype.presentation.editor.editor.Command +import com.anytypeio.anytype.presentation.editor.editor.Orchestrator +import com.anytypeio.anytype.presentation.editor.editor.Proxy +import com.anytypeio.anytype.presentation.editor.editor.ext.updateSelection +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.render.BlockViewRenderer +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.navigation.SupportNavigation -import com.anytypeio.anytype.presentation.page.editor.Command -import com.anytypeio.anytype.presentation.page.editor.Orchestrator -import com.anytypeio.anytype.presentation.page.editor.Proxy -import com.anytypeio.anytype.presentation.page.editor.ext.updateSelection -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.render.BlockViewRenderer -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder -import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder import kotlinx.coroutines.Job import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import timber.log.Timber -import com.anytypeio.anytype.presentation.page.Editor.Mode as EditorMode +import com.anytypeio.anytype.presentation.editor.Editor.Mode as EditorMode sealed class ArchiveViewState { object Loading : ArchiveViewState() diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/archive/ArchiveViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/archive/ArchiveViewModelFactory.kt similarity index 84% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/archive/ArchiveViewModelFactory.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/archive/ArchiveViewModelFactory.kt index 8884b7b9b6..15fcadf114 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/archive/ArchiveViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/archive/ArchiveViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.archive +package com.anytypeio.anytype.presentation.editor.archive import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -10,9 +10,9 @@ import com.anytypeio.anytype.domain.page.ArchiveDocument import com.anytypeio.anytype.domain.page.CloseBlock import com.anytypeio.anytype.domain.page.OpenPage import com.anytypeio.anytype.presentation.common.StateReducer -import com.anytypeio.anytype.presentation.page.editor.Orchestrator -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.editor.Orchestrator +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder open class ArchiveViewModelFactory( private val openPage: OpenPage, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/bookmark/CreateBookmarkViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/bookmark/CreateBookmarkViewModel.kt similarity index 82% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/bookmark/CreateBookmarkViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/bookmark/CreateBookmarkViewModel.kt index 66db846b92..195323c2fd 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/bookmark/CreateBookmarkViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/bookmark/CreateBookmarkViewModel.kt @@ -1,9 +1,9 @@ -package com.anytypeio.anytype.presentation.page.bookmark +package com.anytypeio.anytype.presentation.editor.bookmark import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.anytypeio.anytype.core_utils.ui.ViewStateViewModel -import com.anytypeio.anytype.presentation.page.bookmark.CreateBookmarkViewModel.ViewState +import com.anytypeio.anytype.presentation.editor.bookmark.CreateBookmarkViewModel.ViewState class CreateBookmarkViewModel() : ViewStateViewModel() { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverColor.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverColor.kt similarity index 95% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverColor.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverColor.kt index 3a09dae969..6827a3b421 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverColor.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverColor.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.cover +package com.anytypeio.anytype.presentation.editor.cover import android.graphics.Color diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverGradient.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverGradient.kt similarity index 71% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverGradient.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverGradient.kt index 70c1a3eeb1..3e40662e8a 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverGradient.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverGradient.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.cover +package com.anytypeio.anytype.presentation.editor.cover object CoverGradient { const val YELLOW = "yellow" diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverImageHashProvider.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverImageHashProvider.kt similarity index 74% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverImageHashProvider.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverImageHashProvider.kt index c37fb50486..b8d09f2a07 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/CoverImageHashProvider.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/CoverImageHashProvider.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.cover +package com.anytypeio.anytype.presentation.editor.cover import com.anytypeio.anytype.core_models.Hash import com.anytypeio.anytype.core_models.Id diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/DocCoverGalleryView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/DocCoverGalleryView.kt similarity index 90% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/DocCoverGalleryView.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/DocCoverGalleryView.kt index 85d8ee9e90..be3a9e3add 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/DocCoverGalleryView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/DocCoverGalleryView.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.cover +package com.anytypeio.anytype.presentation.editor.cover import com.anytypeio.anytype.core_models.Hash import com.anytypeio.anytype.core_models.Url diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/SelectDocCoverViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/SelectDocCoverViewModel.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/SelectDocCoverViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/SelectDocCoverViewModel.kt index 060b117b9f..58bdc9d63c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/SelectDocCoverViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/SelectDocCoverViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.cover +package com.anytypeio.anytype.presentation.editor.cover import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -7,7 +7,7 @@ import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.cover.* import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager import com.anytypeio.anytype.presentation.util.Dispatcher import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/UploadDocCoverImageViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/UploadDocCoverImageViewModel.kt similarity index 94% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/UploadDocCoverImageViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/UploadDocCoverImageViewModel.kt index 0461a3c3dd..83a65205f4 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/cover/UploadDocCoverImageViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/cover/UploadDocCoverImageViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.cover +package com.anytypeio.anytype.presentation.editor.cover import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/BlockDimensions.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/BlockDimensions.kt similarity index 79% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/BlockDimensions.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/BlockDimensions.kt index 15de98f7b4..8f907b0366 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/BlockDimensions.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/BlockDimensions.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import android.os.Parcelable import kotlinx.android.parcel.Parcelize diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Command.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Command.kt similarity index 94% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Command.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Command.kt index 32655daded..7a1027c274 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Command.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Command.kt @@ -1,10 +1,9 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.SmartBlockType -import com.anytypeio.anytype.core_models.SyncStatus import com.anytypeio.anytype.core_models.Url -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView sealed class Command { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Converter.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Converter.kt similarity index 59% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Converter.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Converter.kt index 8b9bc7fd19..f4efdf6351 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Converter.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Converter.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor interface Converter { fun convert(input: INPUT): OUTPUT diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/DetailModificator.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/DetailModificator.kt similarity index 99% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/DetailModificator.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/DetailModificator.kt index e4c5d57246..424b78f139 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/DetailModificator.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/DetailModificator.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.core_models.CoverType import com.anytypeio.anytype.core_models.Hash import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_utils.const.DetailsKeys -import com.anytypeio.anytype.core_models.CoverType import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ErrorViewState.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ErrorViewState.kt similarity index 69% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ErrorViewState.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ErrorViewState.kt index a8af396061..2f39d66c85 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ErrorViewState.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ErrorViewState.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor sealed class ErrorViewState { data class Toast(val msg: String) : ErrorViewState() diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Intent.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Intent.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Intent.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Intent.kt index 265d6cfe4f..f106389a47 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Intent.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Intent.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Id diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Interactor.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Interactor.kt similarity index 92% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Interactor.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Interactor.kt index 4c2a179ce5..aecddbf342 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Interactor.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Interactor.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.editor.pattern.Matcher -import com.anytypeio.anytype.presentation.page.editor.pattern.Pattern -import com.anytypeio.anytype.presentation.page.model.TextUpdate +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.editor.pattern.Matcher +import com.anytypeio.anytype.presentation.editor.editor.pattern.Pattern +import com.anytypeio.anytype.presentation.editor.model.TextUpdate interface Interactor { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Markup.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Markup.kt similarity index 96% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Markup.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Markup.kt index ca4ab24b8d..c56d1d9ce5 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Markup.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Markup.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import android.os.Parcelable import android.text.Spannable diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Orchestrator.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Orchestrator.kt similarity index 99% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Orchestrator.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Orchestrator.kt index 6c8357f77f..64915b20c3 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Orchestrator.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Orchestrator.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.analytics.base.EventsDictionary.BLOCK_BACKGROUND_COLOR @@ -43,9 +43,9 @@ import com.anytypeio.anytype.domain.page.Redo import com.anytypeio.anytype.domain.page.Undo import com.anytypeio.anytype.domain.page.UpdateTitle import com.anytypeio.anytype.domain.page.bookmark.SetupBookmark +import com.anytypeio.anytype.presentation.editor.Editor import com.anytypeio.anytype.presentation.extension.getAnalyticsEvent import com.anytypeio.anytype.presentation.extension.getProps -import com.anytypeio.anytype.presentation.page.Editor import kotlinx.coroutines.flow.collect import timber.log.Timber diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Proxy.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Proxy.kt similarity index 88% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Proxy.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Proxy.kt index c2243b3419..8099ce2248 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Proxy.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Proxy.kt @@ -1,7 +1,7 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.core_models.Payload -import com.anytypeio.anytype.presentation.page.model.TextUpdate +import com.anytypeio.anytype.presentation.editor.model.TextUpdate import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.consumeAsFlow diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/SideEffect.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/SideEffect.kt similarity index 58% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/SideEffect.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/SideEffect.kt index d8ee63a27c..40c9231201 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/SideEffect.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/SideEffect.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor sealed class SideEffect { object ClearMultiSelectSelection : SideEffect() diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Store.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Store.kt similarity index 94% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Store.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Store.kt index b9e21a29fa..0dc5484f71 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Store.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Store.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.ObjectType -import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction import com.anytypeio.anytype.core_models.Relation +import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction import com.anytypeio.anytype.domain.editor.Editor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import kotlinx.coroutines.channels.ConflatedBroadcastChannel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ThemeColor.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ThemeColor.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ThemeColor.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ThemeColor.kt index d9cefa9117..d3052d5185 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ThemeColor.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ThemeColor.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import android.graphics.Color diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Transformation.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Transformation.kt similarity index 91% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Transformation.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Transformation.kt index 724bc24024..2d82a0c097 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/Transformation.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Transformation.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Block.Content.Text.Mark import com.anytypeio.anytype.core_models.ext.addMark import com.anytypeio.anytype.core_models.ext.content -import com.anytypeio.anytype.presentation.page.model.TextUpdate +import com.anytypeio.anytype.presentation.editor.model.TextUpdate fun Block.updateText(update: TextUpdate): Block { return copy( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ViewState.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ViewState.kt similarity index 70% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ViewState.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ViewState.kt index cc91895340..92497ee3b2 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ViewState.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ViewState.kt @@ -1,7 +1,7 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView sealed class ViewState { object Loading : ViewState() diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/actions/ActionItemType.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/actions/ActionItemType.kt similarity index 89% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/actions/ActionItemType.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/actions/ActionItemType.kt index dab7d1cc12..a729cbdc8e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/actions/ActionItemType.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/actions/ActionItemType.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.actions +package com.anytypeio.anytype.presentation.editor.editor.actions sealed class ActionItemType { object AddBelow : ActionItemType() diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/control/ControlPanelState.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/control/ControlPanelState.kt similarity index 95% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/control/ControlPanelState.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/control/ControlPanelState.kt index a2d4e1a288..ce9322085c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/control/ControlPanelState.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/control/ControlPanelState.kt @@ -1,13 +1,13 @@ -package com.anytypeio.anytype.presentation.page.editor.control +package com.anytypeio.anytype.presentation.editor.editor.control import com.anytypeio.anytype.core_models.TextStyle +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState +import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingMode +import com.anytypeio.anytype.presentation.editor.markup.MarkupStyleDescriptor import com.anytypeio.anytype.presentation.navigation.DefaultObjectView -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.slash.SlashWidgetState -import com.anytypeio.anytype.presentation.page.editor.styling.StyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.StylingMode -import com.anytypeio.anytype.presentation.page.markup.MarkupStyleDescriptor /** * Control panels are UI-elements that allow user to interact with blocks on a page. diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ext/BlockViewExt.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewExt.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ext/BlockViewExt.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewExt.kt index 7e3cf4cbe4..27ff6364ba 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/ext/BlockViewExt.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewExt.kt @@ -1,13 +1,13 @@ -package com.anytypeio.anytype.presentation.page.editor.ext +package com.anytypeio.anytype.presentation.editor.editor.ext import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.ext.replaceRangeWithWord +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_DESCRIPTION_KEY +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_TITLE_KEY +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_URL_KEY +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Searchable.Field.Companion.DEFAULT_SEARCH_FIELD_KEY import com.anytypeio.anytype.presentation.extension.shift -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_DESCRIPTION_KEY -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_TITLE_KEY -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Media.Bookmark.Companion.SEARCH_FIELD_URL_KEY -import com.anytypeio.anytype.presentation.page.editor.model.BlockView.Searchable.Field.Companion.DEFAULT_SEARCH_FIELD_KEY import timber.log.Timber fun List.singleStylingMode( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/listener/ListenerType.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/listener/ListenerType.kt similarity index 90% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/listener/ListenerType.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/listener/ListenerType.kt index ab78183294..69ea8364bc 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/listener/ListenerType.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/listener/ListenerType.kt @@ -1,8 +1,8 @@ -package com.anytypeio.anytype.presentation.page.editor.listener +package com.anytypeio.anytype.presentation.editor.editor.listener import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView sealed class ListenerType { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionEvent.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionEvent.kt similarity index 79% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionEvent.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionEvent.kt index fd403bb449..190c3e4c79 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionEvent.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionEvent.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.mention +package com.anytypeio.anytype.presentation.editor.editor.mention sealed class MentionEvent { data class MentionSuggestText(val text: CharSequence) : MentionEvent() diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionExt.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExt.kt similarity index 79% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionExt.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExt.kt index aa3cdd5d38..eb6d65e0ba 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionExt.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExt.kt @@ -1,7 +1,7 @@ -package com.anytypeio.anytype.presentation.page.editor.mention +package com.anytypeio.anytype.presentation.editor.editor.mention +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionConst.MENTION_PREFIX import com.anytypeio.anytype.presentation.navigation.DefaultObjectView -import com.anytypeio.anytype.presentation.page.editor.mention.MentionConst.MENTION_PREFIX fun String.getMentionName(untitled: String): String = if (this.isBlank()) untitled else this diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Alignment.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Alignment.kt new file mode 100644 index 0000000000..582b41158d --- /dev/null +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Alignment.kt @@ -0,0 +1,3 @@ +package com.anytypeio.anytype.presentation.editor.editor.model + +enum class Alignment { START, CENTER, END } \ No newline at end of file diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/BlockView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/BlockView.kt similarity index 88% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/BlockView.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/BlockView.kt index 84115774c8..1aadcb212d 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/BlockView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/BlockView.kt @@ -1,53 +1,53 @@ -package com.anytypeio.anytype.presentation.page.editor.model +package com.anytypeio.anytype.presentation.editor.editor.model import android.os.Parcelable import com.anytypeio.anytype.core_models.Url import com.anytypeio.anytype.core_utils.ui.ViewType -import com.anytypeio.anytype.presentation.page.cover.CoverColor -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_ARCHIVE_TITLE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_BOOKMARK -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_BOOKMARK_ERROR -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_BOOKMARK_PLACEHOLDER -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_BULLET -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_CHECKBOX -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_CODE_SNIPPET -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_DESCRIPTION -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_DIVIDER_DOTS -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_DIVIDER_LINE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_FEATURED_RELATION -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_FILE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_FILE_ERROR -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_FILE_PLACEHOLDER -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_FILE_UPLOAD -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_HEADER_ONE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_HEADER_THREE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_HEADER_TWO -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_HIGHLIGHT -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_NUMBERED -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_OBJECT_TYPE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PAGE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PAGE_ARCHIVE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PARAGRAPH -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PICTURE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PICTURE_ERROR -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PICTURE_PLACEHOLDER -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PICTURE_UPLOAD -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PROFILE_TITLE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_CHECKBOX -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_DEFAULT -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_FILE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_OBJECT -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_PLACEHOLDER -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_STATUS -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_RELATION_TAGS -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_TITLE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_TODO_TITLE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_TOGGLE -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_VIDEO -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_VIDEO_ERROR -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_VIDEO_PLACEHOLDER -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_VIDEO_UPLOAD +import com.anytypeio.anytype.presentation.editor.cover.CoverColor +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_ARCHIVE_TITLE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_BOOKMARK +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_BOOKMARK_ERROR +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_BOOKMARK_PLACEHOLDER +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_BULLET +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_CHECKBOX +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_CODE_SNIPPET +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_DESCRIPTION +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_DIVIDER_DOTS +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_DIVIDER_LINE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_FEATURED_RELATION +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_FILE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_FILE_ERROR +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_FILE_PLACEHOLDER +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_FILE_UPLOAD +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_HEADER_ONE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_HEADER_THREE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_HEADER_TWO +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_HIGHLIGHT +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_NUMBERED +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_OBJECT_TYPE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PAGE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PAGE_ARCHIVE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PARAGRAPH +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PICTURE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PICTURE_ERROR +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PICTURE_PLACEHOLDER +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PICTURE_UPLOAD +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PROFILE_TITLE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_CHECKBOX +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_DEFAULT +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_FILE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_OBJECT +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_PLACEHOLDER +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_STATUS +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_RELATION_TAGS +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_TITLE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_TODO_TITLE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_TOGGLE +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_VIDEO +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_VIDEO_ERROR +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_VIDEO_PLACEHOLDER +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_VIDEO_UPLOAD import com.anytypeio.anytype.presentation.relations.DocumentRelationView import kotlinx.android.parcel.Parcelize import kotlinx.android.parcel.RawValue diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Checkable.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Checkable.kt similarity index 60% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Checkable.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Checkable.kt index 081830cb42..6b1496828b 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Checkable.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Checkable.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.model +package com.anytypeio.anytype.presentation.editor.editor.model /** * Defines a view that can be checked diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Focusable.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Focusable.kt similarity index 60% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Focusable.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Focusable.kt index 36fc3639f7..36e9921313 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Focusable.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Focusable.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.model +package com.anytypeio.anytype.presentation.editor.editor.model /** * Defines a view that can be focused. diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Types.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Types.kt similarity index 96% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Types.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Types.kt index 95bc718d4d..b6b4c4d6f3 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Types.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/Types.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.model +package com.anytypeio.anytype.presentation.editor.editor.model object Types { const val HOLDER_PARAGRAPH = 0 diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/UiBlock.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/UiBlock.kt similarity index 96% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/UiBlock.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/UiBlock.kt index 30cbf9297b..4a0cd7ff1d 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/UiBlock.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/UiBlock.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.model +package com.anytypeio.anytype.presentation.editor.editor.model enum class UiBlock { TEXT { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/DefaultPatternMatcher.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/DefaultPatternMatcher.kt similarity index 96% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/DefaultPatternMatcher.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/DefaultPatternMatcher.kt index 5d7864f81d..52a78630b2 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/DefaultPatternMatcher.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/DefaultPatternMatcher.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.pattern +package com.anytypeio.anytype.presentation.editor.editor.pattern /** * Matcher used to find patterns (hot keys, regex, etc) in editor text. diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/Matcher.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/Matcher.kt similarity index 50% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/Matcher.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/Matcher.kt index 17cb05f36e..1a190d5bfc 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/Matcher.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/Matcher.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.pattern +package com.anytypeio.anytype.presentation.editor.editor.pattern interface Matcher { fun match(text: String): List diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/Pattern.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/Pattern.kt similarity index 58% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/Pattern.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/Pattern.kt index ec5543351c..cfd320cf1f 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/pattern/Pattern.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/pattern/Pattern.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.pattern +package com.anytypeio.anytype.presentation.editor.editor.pattern enum class Pattern { NUMBERED, DIVIDER, CHECKBOX, H1, H2, H3, QUOTE, TOGGLE, BULLET diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/sam/ScrollAndMoveTarget.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/sam/ScrollAndMoveTarget.kt similarity index 87% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/sam/ScrollAndMoveTarget.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/sam/ScrollAndMoveTarget.kt index e1042cd387..ef61fe5705 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/sam/ScrollAndMoveTarget.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/sam/ScrollAndMoveTarget.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.sam +package com.anytypeio.anytype.presentation.editor.editor.sam import androidx.annotation.FloatRange diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/sam/ScrollAndMoveTargetDescriptor.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/sam/ScrollAndMoveTargetDescriptor.kt similarity index 82% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/sam/ScrollAndMoveTargetDescriptor.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/sam/ScrollAndMoveTargetDescriptor.kt index 286b4b5325..43d6d6ac8c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/sam/ScrollAndMoveTargetDescriptor.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/sam/ScrollAndMoveTargetDescriptor.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.sam +package com.anytypeio.anytype.presentation.editor.editor.sam interface ScrollAndMoveTargetDescriptor { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/search/SearchInDocEvent.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/search/SearchInDocEvent.kt similarity index 81% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/search/SearchInDocEvent.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/search/SearchInDocEvent.kt index 62f43dfea7..379891be17 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/search/SearchInDocEvent.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/search/SearchInDocEvent.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.search +package com.anytypeio.anytype.presentation.editor.editor.search sealed class SearchInDocEvent { object Clear : SearchInDocEvent() diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashEvent.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashEvent.kt similarity index 90% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashEvent.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashEvent.kt index a883e73da2..0bc449f4fb 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashEvent.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashEvent.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.slash +package com.anytypeio.anytype.presentation.editor.editor.slash /** * Events coming from slash text watchers diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashExtensions.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashExtensions.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashExtensions.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashExtensions.kt index 95c381bf7b..db19d5a140 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashExtensions.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashExtensions.kt @@ -1,10 +1,10 @@ -package com.anytypeio.anytype.presentation.page.editor.slash +package com.anytypeio.anytype.presentation.editor.editor.slash import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ObjectType -import com.anytypeio.anytype.presentation.page.editor.ThemeColor -import com.anytypeio.anytype.presentation.page.editor.model.Types -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.model.Types +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock import com.anytypeio.anytype.presentation.relations.RelationListViewModel fun List.toView(): List = map { oType -> diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashItem.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashItem.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashItem.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashItem.kt index 81953359a7..05635dbdd8 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/slash/SlashItem.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/slash/SlashItem.kt @@ -1,8 +1,8 @@ -package com.anytypeio.anytype.presentation.page.editor.slash +package com.anytypeio.anytype.presentation.editor.editor.slash import com.anytypeio.anytype.core_models.Url -import com.anytypeio.anytype.core_models.ObjectType.Layout as ObjectTypeLayout import com.anytypeio.anytype.presentation.relations.RelationListViewModel +import com.anytypeio.anytype.core_models.ObjectType.Layout as ObjectTypeLayout sealed class SlashWidgetState { data class UpdateItems( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StyleConfig.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StyleConfig.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StyleConfig.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StyleConfig.kt index 64e7a10bdc..d7c43d04fc 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StyleConfig.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StyleConfig.kt @@ -1,8 +1,8 @@ -package com.anytypeio.anytype.presentation.page.editor.styling +package com.anytypeio.anytype.presentation.editor.editor.styling import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment data class StyleConfig( val visibleTypes: List, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingEvent.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingEvent.kt similarity index 84% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingEvent.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingEvent.kt index 3e02527c38..86c9857f19 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingEvent.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingEvent.kt @@ -1,6 +1,6 @@ -package com.anytypeio.anytype.presentation.page.editor.styling +package com.anytypeio.anytype.presentation.editor.editor.styling -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor sealed class StylingEvent { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingMode.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingMode.kt new file mode 100644 index 0000000000..1eb0bebf4a --- /dev/null +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingMode.kt @@ -0,0 +1,5 @@ +package com.anytypeio.anytype.presentation.editor.editor.styling + +enum class StylingMode { + MARKUP, BLOCK +} \ No newline at end of file diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingType.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingType.kt similarity index 82% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingType.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingType.kt index b8c6eb21c0..84d25199c5 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingType.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/styling/StylingType.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.styling +package com.anytypeio.anytype.presentation.editor.editor.styling import com.anytypeio.anytype.core_utils.ui.ViewType diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/layout/ObjectLayoutViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/layout/ObjectLayoutViewModel.kt similarity index 95% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/layout/ObjectLayoutViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/layout/ObjectLayoutViewModel.kt index 37a3012a10..d083c296dd 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/layout/ObjectLayoutViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/layout/ObjectLayoutViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.layout +package com.anytypeio.anytype.presentation.editor.layout import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -8,7 +8,7 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.layout.SetObjectLayout import com.anytypeio.anytype.presentation.common.BaseViewModel -import com.anytypeio.anytype.presentation.page.Editor +import com.anytypeio.anytype.presentation.editor.Editor import com.anytypeio.anytype.presentation.util.Dispatcher import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableStateFlow diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/markup/MarkupColorView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/markup/MarkupColorView.kt similarity index 86% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/markup/MarkupColorView.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/markup/MarkupColorView.kt index fffd3d804e..e13972223d 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/markup/MarkupColorView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/markup/MarkupColorView.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.markup +package com.anytypeio.anytype.presentation.editor.markup sealed class MarkupColorView { abstract val code: String diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/markup/MarkupStyleDescriptor.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/markup/MarkupStyleDescriptor.kt similarity index 94% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/markup/MarkupStyleDescriptor.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/markup/MarkupStyleDescriptor.kt index 4ccead0627..9a037a93ed 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/markup/MarkupStyleDescriptor.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/markup/MarkupStyleDescriptor.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.markup +package com.anytypeio.anytype.presentation.editor.markup interface MarkupStyleDescriptor { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/model/TextUpdate.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/model/TextUpdate.kt similarity index 95% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/model/TextUpdate.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/model/TextUpdate.kt index 593251cc16..087b5af0f8 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/model/TextUpdate.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/model/TextUpdate.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.model +package com.anytypeio.anytype.presentation.editor.model import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Id diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/AddBlockView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/AddBlockView.kt similarity index 96% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/AddBlockView.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/AddBlockView.kt index 35736b0914..227583d5f6 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/AddBlockView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/AddBlockView.kt @@ -1,8 +1,8 @@ -package com.anytypeio.anytype.presentation.page.picker +package com.anytypeio.anytype.presentation.editor.picker import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_utils.ui.ViewType -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock sealed class AddBlockView : ViewType { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentAddBlockViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentAddBlockViewModel.kt similarity index 89% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentAddBlockViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentAddBlockViewModel.kt index 90a84ccf1b..356b1275e9 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentAddBlockViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentAddBlockViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.picker +package com.anytypeio.anytype.presentation.editor.picker import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -6,9 +6,9 @@ import androidx.lifecycle.viewModelScope import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes import com.anytypeio.anytype.domain.config.GetFlavourConfig -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock -import com.anytypeio.anytype.presentation.page.picker.AddBlockView.Companion.itemsExperimental -import com.anytypeio.anytype.presentation.page.picker.AddBlockView.Companion.itemsStable +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView.Companion.itemsExperimental +import com.anytypeio.anytype.presentation.editor.picker.AddBlockView.Companion.itemsStable import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentIconActionMenuViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentIconActionMenuViewModel.kt similarity index 96% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentIconActionMenuViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentIconActionMenuViewModel.kt index 192da2528e..36b8ef83e8 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentIconActionMenuViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentIconActionMenuViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.picker +package com.anytypeio.anytype.presentation.editor.picker import androidx.lifecycle.viewModelScope import com.anytypeio.anytype.core_models.Payload @@ -7,9 +7,9 @@ import com.anytypeio.anytype.domain.icon.SetDocumentEmojiIcon import com.anytypeio.anytype.domain.icon.SetDocumentImageIcon import com.anytypeio.anytype.emojifier.data.Emoji import com.anytypeio.anytype.presentation.common.StateReducer -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModel.Contract.* -import com.anytypeio.anytype.presentation.page.picker.DocumentIconActionMenuViewModel.ViewState +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModel.Contract.* +import com.anytypeio.anytype.presentation.editor.picker.DocumentIconActionMenuViewModel.ViewState import com.anytypeio.anytype.presentation.util.Dispatcher import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.ConflatedBroadcastChannel diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentIconActionMenuViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentIconActionMenuViewModelFactory.kt similarity index 86% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentIconActionMenuViewModelFactory.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentIconActionMenuViewModelFactory.kt index 5f0591f8ef..11c04b898f 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/DocumentIconActionMenuViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/DocumentIconActionMenuViewModelFactory.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.presentation.page.picker +package com.anytypeio.anytype.presentation.editor.picker import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.icon.SetDocumentEmojiIcon import com.anytypeio.anytype.domain.icon.SetDocumentImageIcon -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager import com.anytypeio.anytype.presentation.util.Dispatcher class DocumentIconActionMenuViewModelFactory( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/EmojiPickerView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/EmojiPickerView.kt similarity index 93% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/EmojiPickerView.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/EmojiPickerView.kt index 4ecf17f3bb..f67c2a1324 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/EmojiPickerView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/EmojiPickerView.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.picker +package com.anytypeio.anytype.presentation.editor.picker import com.anytypeio.anytype.core_utils.ui.ViewType diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/ObjectIconPickerBaseViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/ObjectIconPickerBaseViewModel.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/ObjectIconPickerBaseViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/ObjectIconPickerBaseViewModel.kt index a9e124391f..37013903ba 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/ObjectIconPickerBaseViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/ObjectIconPickerBaseViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.picker +package com.anytypeio.anytype.presentation.editor.picker import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -11,7 +11,7 @@ import com.anytypeio.anytype.emojifier.data.Emoji import com.anytypeio.anytype.emojifier.data.EmojiProvider import com.anytypeio.anytype.emojifier.suggest.EmojiSuggester import com.anytypeio.anytype.emojifier.suggest.model.EmojiSuggest -import com.anytypeio.anytype.presentation.page.editor.Proxy +import com.anytypeio.anytype.presentation.editor.editor.Proxy import com.anytypeio.anytype.presentation.util.Dispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.* diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/ObjectIconPickerViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/ObjectIconPickerViewModelFactory.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/ObjectIconPickerViewModelFactory.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/ObjectIconPickerViewModelFactory.kt index 7a5241cc14..42f5ff84f9 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/picker/ObjectIconPickerViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/picker/ObjectIconPickerViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.picker +package com.anytypeio.anytype.presentation.editor.picker import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/render/BlockViewRenderer.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/BlockViewRenderer.kt similarity index 83% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/render/BlockViewRenderer.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/BlockViewRenderer.kt index 8103f6cd72..2e9498c28e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/render/BlockViewRenderer.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/BlockViewRenderer.kt @@ -1,12 +1,12 @@ -package com.anytypeio.anytype.presentation.page.render +package com.anytypeio.anytype.presentation.editor.render import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction import com.anytypeio.anytype.domain.editor.Editor -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.Editor.Mode as EditorMode +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.Editor.Mode as EditorMode /** * Converts business tree-like data structures to flattened view data structures. diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/render/DefaultBlockViewRenderer.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/DefaultBlockViewRenderer.kt similarity index 98% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/render/DefaultBlockViewRenderer.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/DefaultBlockViewRenderer.kt index 871e9fe326..70c922645d 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/render/DefaultBlockViewRenderer.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/DefaultBlockViewRenderer.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.render +package com.anytypeio.anytype.presentation.editor.render import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.core_models.Block.Content @@ -8,16 +8,16 @@ import com.anytypeio.anytype.domain.config.GetFlavourConfig import com.anytypeio.anytype.domain.editor.Editor.Cursor import com.anytypeio.anytype.domain.editor.Editor.Focus import com.anytypeio.anytype.domain.misc.UrlBuilder +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.cover.CoverColor +import com.anytypeio.anytype.presentation.editor.cover.CoverImageHashProvider +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.mapper.* -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.cover.CoverColor -import com.anytypeio.anytype.presentation.page.cover.CoverImageHashProvider -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.relations.view import timber.log.Timber -import com.anytypeio.anytype.presentation.page.Editor.Mode as EditorMode +import com.anytypeio.anytype.presentation.editor.Editor.Mode as EditorMode class DefaultBlockViewRenderer( private val counter: Counter, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/search/DocumentSearchEngine.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/search/DocumentSearchEngine.kt similarity index 82% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/search/DocumentSearchEngine.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/search/DocumentSearchEngine.kt index 068a091ef7..4c1624774b 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/search/DocumentSearchEngine.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/search/DocumentSearchEngine.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.search +package com.anytypeio.anytype.presentation.editor.search import java.util.regex.Pattern diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/selection/SelectionStateHolder.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/selection/SelectionStateHolder.kt similarity index 95% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/selection/SelectionStateHolder.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/selection/SelectionStateHolder.kt index fcbe73837c..7354df966b 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/selection/SelectionStateHolder.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/selection/SelectionStateHolder.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.selection +package com.anytypeio.anytype.presentation.editor.selection import com.anytypeio.anytype.core_models.Id diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/toggle/ToggleStateHolder.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/toggle/ToggleStateHolder.kt similarity index 90% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/page/toggle/ToggleStateHolder.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/editor/toggle/ToggleStateHolder.kt index de78a22a75..ca95b0d02e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/toggle/ToggleStateHolder.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/toggle/ToggleStateHolder.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.toggle +package com.anytypeio.anytype.presentation.editor.toggle import com.anytypeio.anytype.core_models.Id diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtension.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtension.kt index da26fef513..8714cc078e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtension.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtension.kt @@ -4,8 +4,8 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.ObjectWrapper import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.`object`.ObjectIcon -import com.anytypeio.anytype.presentation.desktop.DashboardView +import com.anytypeio.anytype.presentation.dashboard.DashboardView +import com.anytypeio.anytype.presentation.objects.ObjectIcon fun List.addAndSortByIds( ids: List, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/MarkupExtension.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/MarkupExtension.kt index 96fab675ae..ab4265fdb8 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/MarkupExtension.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/MarkupExtension.kt @@ -3,8 +3,8 @@ package com.anytypeio.anytype.presentation.extension import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.overlap import com.anytypeio.anytype.core_models.misc.Overlap -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.markup.MarkupStyleDescriptor +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.markup.MarkupStyleDescriptor /** * Check if list of marks contains [Markup.Type] in selection range diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/mapper/MapperExtension.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/mapper/MapperExtension.kt index 693cfde1bd..8382b3784e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/mapper/MapperExtension.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/mapper/MapperExtension.kt @@ -3,14 +3,14 @@ package com.anytypeio.anytype.presentation.mapper import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.domain.config.DebugSettings import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.`object`.ObjectIcon -import com.anytypeio.anytype.presentation.desktop.DashboardView +import com.anytypeio.anytype.presentation.dashboard.DashboardView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock import com.anytypeio.anytype.presentation.navigation.DefaultObjectView import com.anytypeio.anytype.presentation.navigation.ObjectView -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.relations.getTypePrettyName import com.anytypeio.anytype.presentation.relations.type import com.anytypeio.anytype.presentation.sets.buildGridRow diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/navigation/ObjectView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/navigation/ObjectView.kt index 643480acbe..38d42edd7e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/navigation/ObjectView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/navigation/ObjectView.kt @@ -2,7 +2,7 @@ package com.anytypeio.anytype.presentation.navigation import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.ObjectType -import com.anytypeio.anytype.presentation.`object`.ObjectIcon +import com.anytypeio.anytype.presentation.objects.ObjectIcon data class DefaultObjectView( val id: Id, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectAction.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectAction.kt similarity index 71% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectAction.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectAction.kt index f1a22343da..fd33476c2c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectAction.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectAction.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.`object` +package com.anytypeio.anytype.presentation.objects enum class ObjectAction { DELETE, RESTORE, ADD_TO_FAVOURITE, REMOVE_FROM_FAVOURITE, MOVE_TO, SEARCH_ON_PAGE, USE_AS_TEMPLATE diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectCoverPickerViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectCoverPickerViewModel.kt similarity index 93% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectCoverPickerViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectCoverPickerViewModel.kt index 134ad28f0e..8952c3e26e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectCoverPickerViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectCoverPickerViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.`object` +package com.anytypeio.anytype.presentation.objects import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -8,7 +8,7 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.cover.RemoveDocCover import com.anytypeio.anytype.domain.cover.SetDocCoverImage import com.anytypeio.anytype.presentation.common.BaseViewModel -import com.anytypeio.anytype.presentation.page.PageViewModel +import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.util.Dispatcher import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch @@ -23,7 +23,7 @@ class ObjectCoverPickerViewModel( val isDismissed = MutableStateFlow(false) fun onImagePicked(ctx: Id, path: String) { - if (path.endsWith(PageViewModel.FORMAT_WEBP, true)) { + if (path.endsWith(EditorViewModel.FORMAT_WEBP, true)) { Timber.d("onDocCoverImagePicked, not allowed to add WEBP1 format") return } diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectIcon.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectIcon.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectIcon.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectIcon.kt index bc9de4ecc1..099fee7105 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectIcon.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectIcon.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.`object` +package com.anytypeio.anytype.presentation.objects import com.anytypeio.anytype.core_models.Hash import com.anytypeio.anytype.core_models.ObjectType diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectMenuViewModelBase.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectMenuViewModelBase.kt similarity index 99% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectMenuViewModelBase.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectMenuViewModelBase.kt index 13d08933cf..1d3f6b611d 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectMenuViewModelBase.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectMenuViewModelBase.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.`object` +package com.anytypeio.anytype.presentation.objects import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -14,7 +14,7 @@ import com.anytypeio.anytype.domain.dashboard.interactor.CheckIsFavorite import com.anytypeio.anytype.domain.dashboard.interactor.RemoveFromFavorite import com.anytypeio.anytype.domain.page.ArchiveDocument import com.anytypeio.anytype.presentation.common.BaseViewModel -import com.anytypeio.anytype.presentation.page.Editor +import com.anytypeio.anytype.presentation.editor.Editor import com.anytypeio.anytype.presentation.sets.ObjectSet import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeChangeViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeChangeViewModel.kt similarity index 97% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeChangeViewModel.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeChangeViewModel.kt index 919197ef60..a9d1399ce7 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeChangeViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeChangeViewModel.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.`object` +package com.anytypeio.anytype.presentation.objects import androidx.lifecycle.viewModelScope import com.anytypeio.anytype.core_models.ObjectType diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeChangeViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeChangeViewModelFactory.kt similarity index 66% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeChangeViewModelFactory.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeChangeViewModelFactory.kt index d210d3af71..4ff6b086ed 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeChangeViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeChangeViewModelFactory.kt @@ -1,12 +1,8 @@ -package com.anytypeio.anytype.presentation.`object` +package com.anytypeio.anytype.presentation.objects import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes -import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.util.Dispatcher class ObjectTypeChangeViewModelFactory( private val getCompatibleObjectTypes: GetCompatibleObjectTypes diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeView.kt similarity index 78% rename from presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeView.kt rename to presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeView.kt index cbc975f732..d06e60a2eb 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/object/ObjectTypeView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectTypeView.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.`object` +package com.anytypeio.anytype.presentation.objects sealed class ObjectTypeView { data class Item( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Alignment.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Alignment.kt deleted file mode 100644 index f8d6b740ab..0000000000 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/model/Alignment.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.anytypeio.anytype.presentation.page.editor.model - -enum class Alignment { START, CENTER, END } \ No newline at end of file diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingMode.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingMode.kt deleted file mode 100644 index 57b1d2cb0b..0000000000 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/page/editor/styling/StylingMode.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.anytypeio.anytype.presentation.page.editor.styling - -enum class StylingMode { - MARKUP, BLOCK -} \ No newline at end of file diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/AddObjectRelationValueViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/AddObjectRelationValueViewModel.kt index e57d3bbb42..2f6a2ff2ec 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/AddObjectRelationValueViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/AddObjectRelationValueViewModel.kt @@ -15,9 +15,9 @@ import com.anytypeio.anytype.domain.dataview.interactor.AddStatusToDataViewRecor import com.anytypeio.anytype.domain.dataview.interactor.AddTagToDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddObjectRelationOption -import com.anytypeio.anytype.presentation.`object`.ObjectIcon import com.anytypeio.anytype.presentation.common.BaseViewModel -import com.anytypeio.anytype.presentation.page.editor.ThemeColor +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.relations.providers.ObjectDetailProvider import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.ObjectValueProvider diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt index a1d42c30a3..653b4fce9b 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt @@ -8,8 +8,8 @@ import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.RemoveFromFeaturedRelations -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager import com.anytypeio.anytype.presentation.util.Dispatcher class ObjectRelationListViewModelFactory( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapper.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapper.kt index 1407a57ece..159900b37f 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapper.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapper.kt @@ -5,10 +5,10 @@ import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.core_models.ext.title import com.anytypeio.anytype.core_utils.ext.* import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.`object`.ObjectIcon +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.extension.isValueRequired import com.anytypeio.anytype.presentation.mapper.* -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.sets.ObjectSet import com.anytypeio.anytype.presentation.sets.ObjectSetViewState import com.anytypeio.anytype.presentation.sets.filter.CreateFilterView diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt index 87f7fdb195..adc1997f43 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt @@ -11,8 +11,8 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.RemoveFromFeaturedRelations import com.anytypeio.anytype.presentation.common.BaseViewModel -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.editor.DetailModificationManager +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.editor.DetailModificationManager import com.anytypeio.anytype.presentation.util.Dispatcher import kotlinx.coroutines.Job import kotlinx.coroutines.flow.* diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationObjectValueAddViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationObjectValueAddViewModel.kt index a60e5ed7b8..76b52cbc06 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationObjectValueAddViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationObjectValueAddViewModel.kt @@ -8,7 +8,7 @@ import com.anytypeio.anytype.core_utils.ext.typeOf import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.`object`.ObjectIcon +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.ObjectValueProvider import com.anytypeio.anytype.presentation.sets.RelationValueBaseViewModel.RelationValueView diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/providers/DefaultObjectRelationProvider.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/providers/DefaultObjectRelationProvider.kt index 3518fb130d..b7b41072ea 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/providers/DefaultObjectRelationProvider.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/providers/DefaultObjectRelationProvider.kt @@ -2,7 +2,7 @@ package com.anytypeio.anytype.presentation.relations.providers import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.Relation -import com.anytypeio.anytype.presentation.page.editor.Store +import com.anytypeio.anytype.presentation.editor.editor.Store import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/providers/DefaultObjectValueProvider.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/providers/DefaultObjectValueProvider.kt index d22436dbe0..bdd2171a98 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/providers/DefaultObjectValueProvider.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/providers/DefaultObjectValueProvider.kt @@ -2,7 +2,7 @@ package com.anytypeio.anytype.presentation.relations.providers import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.presentation.page.editor.Store +import com.anytypeio.anytype.presentation.editor.editor.Store import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt index 0026a72ae1..8f4401d7c7 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt @@ -10,10 +10,10 @@ import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes import com.anytypeio.anytype.domain.config.GetFlavourConfig import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.`object`.ObjectIcon import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.navigation.DefaultObjectView import com.anytypeio.anytype.presentation.navigation.SupportNavigation +import com.anytypeio.anytype.presentation.objects.ObjectIcon import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import timber.log.Timber diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetExtension.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetExtension.kt index 7278314b0f..f6ab14716e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetExtension.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetExtension.kt @@ -2,7 +2,7 @@ package com.anytypeio.anytype.presentation.sets import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.relations.ObjectSetConfig.ID_KEY import com.anytypeio.anytype.presentation.relations.view diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt index c5701ae067..c0e28bbf96 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt @@ -24,12 +24,12 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.page.CloseBlock import com.anytypeio.anytype.domain.sets.OpenObjectSet import com.anytypeio.anytype.domain.status.InterceptThreadStatus +import com.anytypeio.anytype.presentation.editor.editor.Proxy +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.model.TextUpdate import com.anytypeio.anytype.presentation.mapper.toDomain import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.navigation.SupportNavigation -import com.anytypeio.anytype.presentation.page.editor.Proxy -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.model.TextUpdate import com.anytypeio.anytype.presentation.relations.* import com.anytypeio.anytype.presentation.sets.model.* import com.anytypeio.anytype.presentation.util.Dispatcher diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewState.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewState.kt index 86cf791077..53bc3fa63a 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewState.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewState.kt @@ -1,6 +1,6 @@ package com.anytypeio.anytype.presentation.sets -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.sets.model.Viewer data class ObjectSetViewState( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt index 9b137b9a8a..6359a76b4b 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt @@ -14,9 +14,9 @@ import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToObject import com.anytypeio.anytype.domain.relations.AddFileToRecord -import com.anytypeio.anytype.presentation.`object`.ObjectIcon import com.anytypeio.anytype.presentation.common.BaseViewModel import com.anytypeio.anytype.presentation.navigation.AppNavigation +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.relations.providers.ObjectDetailProvider import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.ObjectValueProvider diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ViewerSortByViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ViewerSortByViewModel.kt index 62500a5def..8174e484f2 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ViewerSortByViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ViewerSortByViewModel.kt @@ -4,10 +4,13 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.presentation.page.editor.Proxy +import com.anytypeio.anytype.presentation.editor.editor.Proxy import com.anytypeio.anytype.presentation.relations.simpleRelations import com.anytypeio.anytype.presentation.relations.sortingExpression -import com.anytypeio.anytype.presentation.sets.model.* +import com.anytypeio.anytype.presentation.sets.model.SimpleRelationView +import com.anytypeio.anytype.presentation.sets.model.SortingExpression +import com.anytypeio.anytype.presentation.sets.model.SortingView +import com.anytypeio.anytype.presentation.sets.model.Viewer import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.collect diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/filter/CreateFilterView.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/filter/CreateFilterView.kt index 9d07e47865..8ee18cf079 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/filter/CreateFilterView.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/filter/CreateFilterView.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.presentation.sets.filter import com.anytypeio.anytype.core_models.Id -import com.anytypeio.anytype.presentation.`object`.ObjectIcon +import com.anytypeio.anytype.presentation.objects.ObjectIcon import com.anytypeio.anytype.presentation.relations.DateDescription sealed class CreateFilterView { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardDragAndDropTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardDragAndDropTest.kt similarity index 99% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardDragAndDropTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardDragAndDropTest.kt index f59e293b23..69440a0db1 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardDragAndDropTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardDragAndDropTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.home +package com.anytypeio.anytype.presentation.dashboard import MockDataFactory import com.anytypeio.anytype.core_models.* @@ -6,7 +6,6 @@ import com.anytypeio.anytype.core_utils.ext.shift import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.Move import com.anytypeio.anytype.domain.event.interactor.InterceptEvents -import com.anytypeio.anytype.presentation.desktop.HomeDashboardStateMachine import com.anytypeio.anytype.presentation.mapper.toDashboardViews import com.jraska.livedata.test import kotlinx.coroutines.delay diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt similarity index 96% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardTestSetup.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt index 8a5719a6cc..a62be70dc9 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/DashboardTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.home +package com.anytypeio.anytype.presentation.dashboard import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -16,8 +16,6 @@ import com.anytypeio.anytype.domain.dashboard.interactor.* import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.page.CreatePage -import com.anytypeio.anytype.presentation.desktop.HomeDashboardEventConverter -import com.anytypeio.anytype.presentation.desktop.HomeDashboardViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/HomeDashboardViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt similarity index 96% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/home/HomeDashboardViewModelTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt index a2d770250e..ac6942991e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/home/HomeDashboardViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.home +package com.anytypeio.anytype.presentation.dashboard import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -14,10 +14,6 @@ import com.anytypeio.anytype.domain.dashboard.interactor.* import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.page.CreatePage -import com.anytypeio.anytype.presentation.desktop.DashboardView -import com.anytypeio.anytype.presentation.desktop.HomeDashboardEventConverter -import com.anytypeio.anytype.presentation.desktop.HomeDashboardStateMachine -import com.anytypeio.anytype.presentation.desktop.HomeDashboardViewModel import com.anytypeio.anytype.presentation.navigation.AppNavigation import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/BlockReadModeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/BlockReadModeTest.kt similarity index 94% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/BlockReadModeTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/BlockReadModeTest.kt index d5eeb7bb57..b299174c6e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/BlockReadModeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/BlockReadModeTest.kt @@ -1,14 +1,14 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_models.ext.content -import com.anytypeio.anytype.presentation.page.editor.BlockDimensions -import com.anytypeio.anytype.presentation.page.editor.ViewState -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions +import com.anytypeio.anytype.presentation.editor.editor.ViewState +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test import kotlinx.coroutines.delay @@ -17,7 +17,7 @@ import kotlinx.coroutines.flow.flow import kotlinx.coroutines.test.runBlockingTest import org.junit.Test -class BlockReadModeTest : PageViewModelTest() { +class BlockReadModeTest : EditorViewModelTest() { val blocks = listOf( Block( @@ -361,7 +361,7 @@ class BlockReadModeTest : PageViewModelTest() { val initial = blockViewsEditMode - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) runBlockingTest { testObserver.assertValue( diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/ControlPanelStateReducerTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/ControlPanelStateReducerTest.kt similarity index 99% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/ControlPanelStateReducerTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/ControlPanelStateReducerTest.kt index 3d866480b2..58af66c789 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/ControlPanelStateReducerTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/ControlPanelStateReducerTest.kt @@ -1,13 +1,13 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import MockDataFactory import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.styling.StyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.StylingMode -import com.anytypeio.anytype.presentation.page.editor.styling.StylingType +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingMode +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingType import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import kotlinx.coroutines.runBlocking import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/DefaultBlockViewRendererTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DefaultBlockViewRendererTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/DefaultBlockViewRendererTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DefaultBlockViewRendererTest.kt index 01a2d34cd9..097e88a18e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/DefaultBlockViewRendererTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DefaultBlockViewRendererTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import MockDataFactory import com.anytypeio.anytype.core_models.Block @@ -12,12 +12,12 @@ import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.config.GetFlavourConfig import com.anytypeio.anytype.domain.editor.Editor import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.page.cover.CoverImageHashProvider -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.render.BlockViewRenderer -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder +import com.anytypeio.anytype.presentation.editor.cover.CoverImageHashProvider +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.render.BlockViewRenderer +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/DocumentExternalEventReducerTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducerTest.kt similarity index 99% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/DocumentExternalEventReducerTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducerTest.kt index 8c3a52c624..00e260a7af 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/DocumentExternalEventReducerTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/DocumentExternalEventReducerTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import MockDataFactory import com.anytypeio.anytype.core_models.Block diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/PageViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/PageViewModelTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt index 359e2c956c..e69bffeec1 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/PageViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page +package com.anytypeio.anytype.presentation.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -29,23 +29,23 @@ import com.anytypeio.anytype.domain.page.bookmark.SetupBookmark import com.anytypeio.anytype.domain.page.navigation.GetListPages import com.anytypeio.anytype.domain.status.InterceptThreadStatus import com.anytypeio.anytype.presentation.MockBlockFactory +import com.anytypeio.anytype.presentation.editor.cover.CoverImageHashProvider +import com.anytypeio.anytype.presentation.editor.editor.* +import com.anytypeio.anytype.presentation.editor.editor.Command +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.editor.pattern.DefaultPatternMatcher +import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingEvent +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingMode +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingType +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.navigation.AppNavigation -import com.anytypeio.anytype.presentation.page.cover.CoverImageHashProvider -import com.anytypeio.anytype.presentation.page.editor.* -import com.anytypeio.anytype.presentation.page.editor.Command -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock -import com.anytypeio.anytype.presentation.page.editor.pattern.DefaultPatternMatcher -import com.anytypeio.anytype.presentation.page.editor.styling.StyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.StylingEvent -import com.anytypeio.anytype.presentation.page.editor.styling.StylingMode -import com.anytypeio.anytype.presentation.page.editor.styling.StylingType -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder -import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.Dispatcher import com.anytypeio.anytype.presentation.util.TXT @@ -69,7 +69,7 @@ import kotlin.test.assertNotNull import kotlin.test.assertTrue @ExperimentalCoroutinesApi -open class PageViewModelTest { +open class EditorViewModelTest { @get:Rule val rule = InstantTaskExecutorRule() @@ -226,7 +226,7 @@ open class PageViewModelTest { private lateinit var updateDetail: UpdateDetail - lateinit var vm: PageViewModel + lateinit var vm: EditorViewModel private lateinit var builder: UrlBuilder @@ -421,7 +421,7 @@ open class PageViewModelTest { vm.onStart(pageId) vm.onTextChanged(id = blockId, text = text, marks = emptyList()) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) runBlockingTest { verify(updateText, times(1)).invoke( @@ -448,11 +448,11 @@ open class PageViewModelTest { vm.onTextChanged(id = blockId, text = text, marks = emptyList()) vm.onTextChanged(id = blockId, text = text, marks = emptyList()) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) vm.onTextChanged(id = blockId, text = text, marks = emptyList()) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) runBlockingTest { verify(updateText, times(2)).invoke( @@ -1215,7 +1215,7 @@ open class PageViewModelTest { text = userInput ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) testObserver.assertValue(state).assertHistorySize(2) } @@ -1293,7 +1293,7 @@ open class PageViewModelTest { paragraphAfterChange ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) assertEquals( expected = expected, @@ -1368,7 +1368,7 @@ open class PageViewModelTest { vm.onTextChanged(id = paragraph.id, text = userInput, marks = marks) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) runBlockingTest { verify(updateText, times(1)).invoke( @@ -2294,7 +2294,7 @@ open class PageViewModelTest { range = 0..0 ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) runBlockingTest { verify(updateText, times(1)).invoke( @@ -2412,7 +2412,7 @@ open class PageViewModelTest { ) } - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -3289,7 +3289,7 @@ open class PageViewModelTest { ) } - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) runBlockingTest { verify(replaceBlock, never()).invoke( @@ -3364,7 +3364,7 @@ open class PageViewModelTest { ) ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verify(updateText, never()).invoke( scope = any(), @@ -3907,7 +3907,7 @@ open class PageViewModelTest { ) updateDetail = UpdateDetail(repo) - vm = PageViewModel( + vm = EditorViewModel( getListPages = getListPages, openPage = openPage, closePage = closePage, diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorAddBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorAddBlockTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorAddBlockTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorAddBlockTest.kt index 9a43a9c83f..f2509a0f22 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorAddBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorAddBlockTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackButtonTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackButtonTest.kt similarity index 96% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackButtonTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackButtonTest.kt index e64141d7c3..aaecd1da72 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackButtonTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackButtonTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.domain.page.CloseBlock diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackspaceNestedDeleteTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackspaceNestedDeleteTest.kt similarity index 99% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackspaceNestedDeleteTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackspaceNestedDeleteTest.kt index 81eadc0ac6..55fa69a6c4 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorBackspaceNestedDeleteTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorBackspaceNestedDeleteTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -7,7 +7,7 @@ import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.UnlinkBlocks import com.anytypeio.anytype.domain.event.interactor.InterceptEvents -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorCheckboxTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorCheckboxTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorCheckboxTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorCheckboxTest.kt index dc289f1b6c..c2ffaa2fe6 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorCheckboxTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorCheckboxTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -7,7 +7,7 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.interactor.UpdateCheckbox -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEmptySpaceInteractionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEmptySpaceInteractionTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEmptySpaceInteractionTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEmptySpaceInteractionTest.kt index 516c80256c..4b937c67d0 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEmptySpaceInteractionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEmptySpaceInteractionTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -7,7 +7,7 @@ import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.presentation.MockBlockFactory -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorErrorMessageTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorErrorMessageTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorErrorMessageTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorErrorMessageTest.kt index e20bd13211..3d396a71fd 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorErrorMessageTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorErrorMessageTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEventSubscriptionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEventSubscriptionTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEventSubscriptionTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEventSubscriptionTest.kt index 0fd1455390..a7a0654718 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorEventSubscriptionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorEventSubscriptionTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFeaturedRelationsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFeaturedRelationsTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFeaturedRelationsTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFeaturedRelationsTest.kt index ab5eca3869..a23304cc29 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFeaturedRelationsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFeaturedRelationsTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import android.util.Log @@ -9,9 +9,9 @@ import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.mapper.toView -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test @@ -45,7 +45,7 @@ class EditorFeaturedRelationsTest : EditorPresentationTestSetup() { @After fun after() { - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFocusTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFocusTest.kt similarity index 95% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFocusTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFocusTest.kt index c5c2d17af0..1e7b2d7b48 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorFocusTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorFocusTest.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.model.Focusable +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.model.Focusable import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test import org.junit.Before @@ -105,7 +105,7 @@ class EditorFocusTest : EditorPresentationTestSetup() { vm.onHideKeyboardClicked() - testFocusObserver.assertValue(PageViewModel.EMPTY_FOCUS_ID) + testFocusObserver.assertValue(EditorViewModel.EMPTY_FOCUS_ID) } @Test @@ -187,7 +187,7 @@ class EditorFocusTest : EditorPresentationTestSetup() { !last.isFocused } - testFocusObserver.assertValue(PageViewModel.EMPTY_FOCUS_ID) + testFocusObserver.assertValue(EditorViewModel.EMPTY_FOCUS_ID) } //@Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorGranularChangeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorGranularChangeTest.kt similarity index 96% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorGranularChangeTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorGranularChangeTest.kt index 53d2bc48aa..44535a4982 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorGranularChangeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorGranularChangeTest.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Event import com.anytypeio.anytype.core_models.ext.content -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test import kotlinx.coroutines.delay diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorListBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorListBlockTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorListBlockTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorListBlockTest.kt index 6bc034f691..cab2948180 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorListBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorListBlockTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -8,8 +8,8 @@ import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.SplitBlock import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle import com.anytypeio.anytype.presentation.MockBlockFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test @@ -795,6 +795,6 @@ class EditorListBlockTest : EditorPresentationTestSetup() { } private fun clearPendingTextUpdate() { - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } } \ No newline at end of file diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMentionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMentionTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMentionTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMentionTest.kt index 6c968e52bf..26285e2efe 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMentionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMentionTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -8,12 +8,11 @@ import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.icon.DocumentEmojiIconProvider import com.anytypeio.anytype.domain.page.CreateNewDocument import com.anytypeio.anytype.domain.page.navigation.GetListPages -import com.anytypeio.anytype.presentation.navigation.DefaultObjectView -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.mention.MentionConst.MENTION_TITLE_EMPTY -import com.anytypeio.anytype.presentation.page.editor.mention.MentionEvent -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionConst.MENTION_TITLE_EMPTY +import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test @@ -647,6 +646,6 @@ class EditorMentionTest : EditorPresentationTestSetup() { } private fun clearPendingCoroutines() { - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } } \ No newline at end of file diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMenuTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMenuTest.kt similarity index 92% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMenuTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMenuTest.kt index 88ae9785c2..ba6a072ed0 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMenuTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMenuTest.kt @@ -1,14 +1,10 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import com.anytypeio.anytype.core_models.SyncStatus -import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction -import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory.page import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory.profile import com.anytypeio.anytype.presentation.util.CoroutinesTestRule -import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMergeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMergeTest.kt similarity index 95% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMergeTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMergeTest.kt index eaf3e3539e..e7325a281a 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMergeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMergeTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -6,7 +6,7 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.MergeBlocks import com.anytypeio.anytype.domain.block.interactor.UpdateText -import com.anytypeio.anytype.presentation.page.PageViewModel +import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import org.junit.Before import org.junit.Rule @@ -112,7 +112,7 @@ class EditorMergeTest : EditorPresentationTestSetup() { text = text ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verifyBlocking(updateText, times(1)) { invoke( @@ -212,7 +212,7 @@ class EditorMergeTest : EditorPresentationTestSetup() { marks = b.content().marks ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verifyBlocking(mergeBlocks, times(1)) { invoke( @@ -321,7 +321,7 @@ class EditorMergeTest : EditorPresentationTestSetup() { marks = d.content().marks ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verifyBlocking(mergeBlocks, times(1)) { invoke( @@ -386,7 +386,7 @@ class EditorMergeTest : EditorPresentationTestSetup() { marks = b.content().marks ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verifyZeroInteractions(mergeBlocks) } diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMoveToTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMoveToTest.kt similarity index 95% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMoveToTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMoveToTest.kt index 5cea8a78bf..cccd8cad1b 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMoveToTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMoveToTest.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType import com.anytypeio.anytype.presentation.navigation.AppNavigation -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMultiSelectModeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMultiSelectModeTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMultiSelectModeTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMultiSelectModeTest.kt index e02342510c..08f27a435d 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorMultiSelectModeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorMultiSelectModeTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -8,12 +8,12 @@ import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.TurnIntoStyle import com.anytypeio.anytype.domain.block.interactor.UnlinkBlocks import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test @@ -1108,7 +1108,7 @@ class EditorMultiSelectModeTest : EditorPresentationTestSetup() { && state.multiSelect.count == 0 } - coroutineTestRule.advanceTime(PageViewModel.DELAY_REFRESH_DOCUMENT_ON_EXIT_MULTI_SELECT_MODE + 100) + coroutineTestRule.advanceTime(EditorViewModel.DELAY_REFRESH_DOCUMENT_ON_EXIT_MULTI_SELECT_MODE + 100) vm.state.test().assertValue( ViewState.Success( diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorPresentationTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt similarity index 94% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorPresentationTestSetup.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt index 6c80e017c7..e81f2d1fc0 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorPresentationTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import com.anytypeio.anytype.analytics.base.Analytics @@ -27,14 +27,14 @@ import com.anytypeio.anytype.domain.page.* import com.anytypeio.anytype.domain.page.bookmark.SetupBookmark import com.anytypeio.anytype.domain.page.navigation.GetListPages import com.anytypeio.anytype.domain.status.InterceptThreadStatus -import com.anytypeio.anytype.presentation.page.DocumentExternalEventReducer -import com.anytypeio.anytype.presentation.page.Editor -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.cover.CoverImageHashProvider -import com.anytypeio.anytype.presentation.page.editor.pattern.DefaultPatternMatcher -import com.anytypeio.anytype.presentation.page.render.DefaultBlockViewRenderer -import com.anytypeio.anytype.presentation.page.selection.SelectionStateHolder -import com.anytypeio.anytype.presentation.page.toggle.ToggleStateHolder +import com.anytypeio.anytype.presentation.editor.DocumentExternalEventReducer +import com.anytypeio.anytype.presentation.editor.Editor +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.cover.CoverImageHashProvider +import com.anytypeio.anytype.presentation.editor.editor.pattern.DefaultPatternMatcher +import com.anytypeio.anytype.presentation.editor.render.DefaultBlockViewRenderer +import com.anytypeio.anytype.presentation.editor.selection.SelectionStateHolder +import com.anytypeio.anytype.presentation.editor.toggle.ToggleStateHolder import com.anytypeio.anytype.presentation.util.Dispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow @@ -201,7 +201,7 @@ open class EditorPresentationTestSetup { open lateinit var orchestrator: Orchestrator - open fun buildViewModel(urlBuilder: UrlBuilder = builder): PageViewModel { + open fun buildViewModel(urlBuilder: UrlBuilder = builder): EditorViewModel { val storage = Editor.Storage() val proxies = Editor.Proxer() @@ -250,7 +250,7 @@ open class EditorPresentationTestSetup { setObjectType = setObjectType ) - return PageViewModel( + return EditorViewModel( getListPages = getListPages, openPage = openPage, closePage = closePage, diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorQuickStartingScrollAndMoveTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorQuickStartingScrollAndMoveTest.kt similarity index 95% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorQuickStartingScrollAndMoveTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorQuickStartingScrollAndMoveTest.kt index ab83933872..df7d73c998 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorQuickStartingScrollAndMoveTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorQuickStartingScrollAndMoveTest.kt @@ -1,14 +1,14 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState.Toolbar -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState.Toolbar +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test @@ -335,7 +335,7 @@ class EditorQuickStartingScrollAndMoveTest : EditorPresentationTestSetup() { ) ) - coroutineTestRule.advanceTime(PageViewModel.DELAY_REFRESH_DOCUMENT_ON_EXIT_MULTI_SELECT_MODE + 100) + coroutineTestRule.advanceTime(EditorViewModel.DELAY_REFRESH_DOCUMENT_ON_EXIT_MULTI_SELECT_MODE + 100) viewStateTestObserver.assertValue( ViewState.Success( diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorRelationBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorRelationBlockTest.kt similarity index 99% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorRelationBlockTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorRelationBlockTest.kt index d9cfba6f3c..0a3b5e3fb1 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorRelationBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorRelationBlockTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -7,8 +7,8 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.mapper.toView -import com.anytypeio.anytype.presentation.page.editor.model.BlockView import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorScrollAndMoveTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorScrollAndMoveTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt index 2ee4e29050..d73d283984 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorScrollAndMoveTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorScrollAndMoveTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -6,9 +6,9 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.Move -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import com.jraska.livedata.test @@ -268,7 +268,7 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { onSystemBackPressed(false) } - coroutineTestRule.advanceTime(PageViewModel.DELAY_REFRESH_DOCUMENT_ON_EXIT_MULTI_SELECT_MODE + 100) + coroutineTestRule.advanceTime(EditorViewModel.DELAY_REFRESH_DOCUMENT_ON_EXIT_MULTI_SELECT_MODE + 100) vm.controlPanelViewState.test().apply { assertValue( @@ -300,7 +300,7 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { ) } - coroutineTestRule.advanceTime(PageViewModel.DELAY_REFRESH_DOCUMENT_ON_EXIT_MULTI_SELECT_MODE + 100) + coroutineTestRule.advanceTime(EditorViewModel.DELAY_REFRESH_DOCUMENT_ON_EXIT_MULTI_SELECT_MODE + 100) vm.state.test().assertValue( ViewState.Success( @@ -704,7 +704,7 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { ) assertEquals( - expected = PageViewModel.CANNOT_BE_DROPPED_INSIDE_ITSELF_ERROR, + expected = EditorViewModel.CANNOT_BE_DROPPED_INSIDE_ITSELF_ERROR, actual = toasts.first() ) @@ -800,7 +800,7 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { ) assertEquals( - expected = PageViewModel.CANNOT_BE_DROPPED_INSIDE_ITSELF_ERROR, + expected = EditorViewModel.CANNOT_BE_DROPPED_INSIDE_ITSELF_ERROR, actual = toasts.first() ) @@ -940,6 +940,6 @@ class EditorScrollAndMoveTest : EditorPresentationTestSetup() { } private fun clearPendingCoroutines() { - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } } \ No newline at end of file diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetActionsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetActionsTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetActionsTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetActionsTest.kt index a940d7569f..fd2c05c709 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetActionsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetActionsTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -9,11 +9,11 @@ import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.domain.clipboard.Copy import com.anytypeio.anytype.domain.clipboard.Paste import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.navigation.AppNavigation -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetClicksTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetClicksTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetClicksTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetClicksTest.kt index 8cefe85482..4511ee2001 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetClicksTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetClicksTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -7,10 +7,10 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.editor.model.Types -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem -import com.anytypeio.anytype.presentation.page.editor.slash.SlashWidgetState +import com.anytypeio.anytype.presentation.editor.editor.model.Types +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.relations.NumberParser import com.anytypeio.anytype.presentation.relations.RelationListViewModel diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetColorTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetColorTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetColorTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetColorTest.kt index 2694aed53f..015d75a6fe 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetColorTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetColorTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import android.os.Build @@ -8,11 +8,11 @@ import com.anytypeio.anytype.domain.block.interactor.UpdateBackgroundColor import com.anytypeio.anytype.domain.block.interactor.UpdateTextColor import com.anytypeio.anytype.domain.editor.Editor import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem -import com.anytypeio.anytype.presentation.page.editor.slash.SlashWidgetState +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import org.junit.After import org.junit.Before @@ -814,7 +814,7 @@ class EditorSlashWidgetColorTest : EditorPresentationTestSetup() { color = code ) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verifyBlocking(updateBackgroundColor, times(1)) { invoke(params) } } //endregion diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetCutFilterTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetCutFilterTest.kt similarity index 96% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetCutFilterTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetCutFilterTest.kt index 2592f9327f..80a23c4d89 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetCutFilterTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetCutFilterTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import android.os.Build @@ -6,10 +6,10 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetFilterTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetFilterTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetFilterTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetFilterTest.kt index 84ab175d24..c741cd770c 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetFilterTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetFilterTest.kt @@ -1,18 +1,16 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import android.os.Build import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.presentation.BuildConfig import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.FLAVOUR_EXPERIMENTAL -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_HEADER_TWO -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_NUMBERED -import com.anytypeio.anytype.presentation.page.editor.model.Types.HOLDER_PARAGRAPH -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem -import com.anytypeio.anytype.presentation.page.editor.slash.SlashWidgetState +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_HEADER_TWO +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_NUMBERED +import com.anytypeio.anytype.presentation.editor.editor.model.Types.HOLDER_PARAGRAPH +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashWidgetState import com.anytypeio.anytype.presentation.relations.RelationListViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetMarksTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetMarksTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetMarksTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetMarksTest.kt index cad1a6a532..75ec3c81a7 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetMarksTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetMarksTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import android.util.Log @@ -7,11 +7,11 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.block.interactor.UpdateBlocksMark import com.anytypeio.anytype.domain.editor.Editor import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.model.Types -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.Types +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetObjectTypeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetObjectTypeTest.kt similarity index 86% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetObjectTypeTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetObjectTypeTest.kt index 81f27d27fc..e88200a181 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetObjectTypeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetObjectTypeTest.kt @@ -1,13 +1,13 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.domain.page.CreateObject import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION -import com.anytypeio.anytype.presentation.page.editor.model.Types -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.presentation.editor.editor.model.Types +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import org.junit.After import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetRelationsTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetRelationsTest.kt similarity index 96% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetRelationsTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetRelationsTest.kt index 9b95a0dfae..0e81ac3064 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetRelationsTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetRelationsTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -7,10 +7,10 @@ import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.ReplaceBlock import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.model.BlockView -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.relations.DocumentRelationView import com.anytypeio.anytype.presentation.relations.RelationListViewModel import com.anytypeio.anytype.presentation.util.CoroutinesTestRule @@ -38,7 +38,7 @@ class EditorSlashWidgetRelationsTest: EditorPresentationTestSetup() { @After fun after() { - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetShowHideTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetShowHideTest.kt similarity index 95% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetShowHideTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetShowHideTest.kt index 411bb33008..5737e85897 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetShowHideTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetShowHideTest.kt @@ -1,9 +1,9 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import android.util.Log import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.Before diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetStyleTypeTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetStyleTypeTest.kt similarity index 96% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetStyleTypeTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetStyleTypeTest.kt index 311ac64ed4..6979c2fe27 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorSlashWidgetStyleTypeTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorSlashWidgetStyleTypeTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import android.util.Log @@ -7,9 +7,9 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.block.interactor.TurnIntoStyle import com.anytypeio.anytype.domain.editor.Editor import com.anytypeio.anytype.presentation.MockTypicalDocumentFactory -import com.anytypeio.anytype.presentation.page.PageViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION -import com.anytypeio.anytype.presentation.page.editor.slash.SlashEvent -import com.anytypeio.anytype.presentation.page.editor.slash.SlashItem +import com.anytypeio.anytype.presentation.editor.EditorViewModel.Companion.TEXT_CHANGES_DEBOUNCE_DURATION +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent +import com.anytypeio.anytype.presentation.editor.editor.slash.SlashItem import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import net.lachlanmckee.timberjunit.TimberTestRule import org.junit.After diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorStartupTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorStartupTest.kt similarity index 95% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorStartupTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorStartupTest.kt index 68b3bd6622..6273ce44e9 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorStartupTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorStartupTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTextUpdateTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTextUpdateTest.kt similarity index 94% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTextUpdateTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTextUpdateTest.kt index d1563ec4c4..3cfc119fd7 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTextUpdateTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTextUpdateTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -6,8 +6,8 @@ import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.ext.content import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.domain.page.CloseBlock -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.anytypeio.anytype.presentation.util.TXT import kotlinx.coroutines.test.runBlockingTest @@ -124,7 +124,7 @@ class EditorTextUpdateTest : EditorPresentationTestSetup() { // RELEASING PENDING COROUTINES - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -178,7 +178,7 @@ class EditorTextUpdateTest : EditorPresentationTestSetup() { vm.onTextBlockTextChanged(updated) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verifyBlocking(updateText, times(1)) { invoke( @@ -271,7 +271,7 @@ class EditorTextUpdateTest : EditorPresentationTestSetup() { // RELEASING PENDING COROUTINES - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) } @Test @@ -325,7 +325,7 @@ class EditorTextUpdateTest : EditorPresentationTestSetup() { vm.onTextBlockTextChanged(updated) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verifyBlocking(updateText, times(1)) { invoke( diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleAddBlockTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleAddBlockTest.kt similarity index 99% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleAddBlockTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleAddBlockTest.kt index baa060962c..7f929c5dcd 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleAddBlockTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleAddBlockTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleTest.kt similarity index 93% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleTest.kt index b4b2fb9447..d6f8111691 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTitleTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTitleTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule @@ -7,9 +7,9 @@ import com.anytypeio.anytype.core_models.Position import com.anytypeio.anytype.domain.block.interactor.CreateBlock import com.anytypeio.anytype.domain.block.interactor.UpdateText import com.anytypeio.anytype.domain.event.interactor.InterceptEvents -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test import kotlinx.coroutines.flow.collect @@ -98,7 +98,7 @@ class EditorTitleTest : EditorPresentationTestSetup() { actual = toasts.size ) assertEquals( - expected = PageViewModel.CANNOT_OPEN_ACTION_MENU_FOR_TITLE_ERROR, + expected = EditorViewModel.CANNOT_OPEN_ACTION_MENU_FOR_TITLE_ERROR, actual = toasts.first() ) @@ -164,7 +164,7 @@ class EditorTitleTest : EditorPresentationTestSetup() { actual = toasts.size ) assertEquals( - expected = PageViewModel.CANNOT_OPEN_STYLE_PANEL_FOR_TITLE_ERROR, + expected = EditorViewModel.CANNOT_OPEN_STYLE_PANEL_FOR_TITLE_ERROR, actual = toasts.first() ) @@ -210,7 +210,7 @@ class EditorTitleTest : EditorPresentationTestSetup() { verifyZeroInteractions(updateTitle) verifyZeroInteractions(updateText) - coroutineTestRule.advanceTime(PageViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) + coroutineTestRule.advanceTime(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION) verifyZeroInteractions(updateTitle) diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTurnIntoTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTurnIntoTest.kt similarity index 94% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTurnIntoTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTurnIntoTest.kt index 57c4f3568b..59aadee375 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/EditorTurnIntoTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorTurnIntoTest.kt @@ -1,14 +1,14 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.block.interactor.TurnIntoDocument import com.anytypeio.anytype.domain.event.interactor.InterceptEvents -import com.anytypeio.anytype.presentation.page.PageViewModel -import com.anytypeio.anytype.presentation.page.editor.actions.ActionItemType -import com.anytypeio.anytype.presentation.page.editor.listener.ListenerType -import com.anytypeio.anytype.presentation.page.editor.model.UiBlock +import com.anytypeio.anytype.presentation.editor.EditorViewModel +import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType +import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType +import com.anytypeio.anytype.presentation.editor.editor.model.UiBlock import com.anytypeio.anytype.presentation.util.CoroutinesTestRule import com.jraska.livedata.test import org.junit.Before @@ -147,7 +147,7 @@ class EditorTurnIntoTest : EditorPresentationTestSetup() { onStart(root) onBlockFocusChanged(id = child.id, hasFocus = true) onEnterMultiSelectModeClicked() - coroutineTestRule.advanceTime(PageViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) + coroutineTestRule.advanceTime(EditorViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) onTextInputClicked(child.id) onTurnIntoMultiSelectBlockClicked(UiBlock.PAGE) } @@ -320,7 +320,7 @@ class EditorTurnIntoTest : EditorPresentationTestSetup() { onStart(root) onBlockFocusChanged(id = child1.id, hasFocus = true) onEnterMultiSelectModeClicked() - coroutineTestRule.advanceTime(PageViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) + coroutineTestRule.advanceTime(EditorViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) onTextInputClicked(child1.id) onClickListener( ListenerType.File.View(child2.id) @@ -396,7 +396,7 @@ class EditorTurnIntoTest : EditorPresentationTestSetup() { onStart(root) onBlockFocusChanged(id = child1.id, hasFocus = true) onEnterMultiSelectModeClicked() - coroutineTestRule.advanceTime(PageViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) + coroutineTestRule.advanceTime(EditorViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE) onClickListener(ListenerType.Picture.View(child2.id)) onMultiSelectTurnIntoButtonClicked() } diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/StyleConfigKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/StyleConfigKtTest.kt similarity index 98% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/StyleConfigKtTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/StyleConfigKtTest.kt index 36abb5aa8e..9aa72ea175 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/StyleConfigKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/StyleConfigKtTest.kt @@ -1,11 +1,11 @@ -package com.anytypeio.anytype.presentation.page.editor +package com.anytypeio.anytype.presentation.editor.editor import MockDataFactory import com.anytypeio.anytype.core_models.Block -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.styling.StyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.StylingType -import com.anytypeio.anytype.presentation.page.editor.styling.getStyleConfig +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingType +import com.anytypeio.anytype.presentation.editor.editor.styling.getStyleConfig import org.junit.Assert.assertEquals import org.junit.Test diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/ext/BlockViewCutTextTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewCutTextTest.kt similarity index 95% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/ext/BlockViewCutTextTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewCutTextTest.kt index cfdc65e9bd..8a97820083 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/ext/BlockViewCutTextTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/ext/BlockViewCutTextTest.kt @@ -1,9 +1,9 @@ -package com.anytypeio.anytype.presentation.page.editor.ext +package com.anytypeio.anytype.presentation.editor.editor.ext import MockDataFactory -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import kotlin.test.Test import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionExtKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionExtKtTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt index 249308caf5..61f3cac656 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/editor/mention/MentionExtKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.editor.mention +package com.anytypeio.anytype.presentation.editor.editor.mention import MockDataFactory import com.anytypeio.anytype.presentation.navigation.DefaultObjectView diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/search/DocumentSearchEngineTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/search/DocumentSearchEngineTest.kt similarity index 97% rename from presentation/src/test/java/com/anytypeio/anytype/presentation/page/search/DocumentSearchEngineTest.kt rename to presentation/src/test/java/com/anytypeio/anytype/presentation/editor/search/DocumentSearchEngineTest.kt index fef997bb43..4c464bc85e 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/page/search/DocumentSearchEngineTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/search/DocumentSearchEngineTest.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.presentation.page.search +package com.anytypeio.anytype.presentation.editor.search import org.junit.Test import java.util.regex.Pattern diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtensionKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtensionKtTest.kt index 2fe69ffa04..069d80aacd 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtensionKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/DashboardViewExtensionKtTest.kt @@ -4,7 +4,7 @@ import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.desktop.DashboardView +import com.anytypeio.anytype.presentation.dashboard.DashboardView import org.junit.Test import kotlin.test.assertEquals diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionKtTest.kt index 1ee0377398..9bef1d0c4a 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionKtTest.kt @@ -1,6 +1,6 @@ package com.anytypeio.anytype.presentation.extension -import com.anytypeio.anytype.presentation.page.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.Markup import org.junit.Test import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionTest.kt index 468d958e80..93b9924026 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/extension/MarkupExtensionTest.kt @@ -1,6 +1,6 @@ package com.anytypeio.anytype.presentation.extension -import com.anytypeio.anytype.presentation.page.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.Markup import org.junit.Test class MarkupExtensionTest { diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/mapper/MapperExtensionKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/mapper/MapperExtensionKtTest.kt index f94e82bc6c..e3627d5a27 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/mapper/MapperExtensionKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/mapper/MapperExtensionKtTest.kt @@ -4,7 +4,7 @@ import MockDataFactory import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.presentation.page.editor.model.BlockView +import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import org.junit.Before import org.junit.Test import org.mockito.Mock diff --git a/sample/src/main/java/com/anytypeio/anytype/sample/StyleActivity.kt b/sample/src/main/java/com/anytypeio/anytype/sample/StyleActivity.kt index 99f141bfa7..12a0cd3d2a 100644 --- a/sample/src/main/java/com/anytypeio/anytype/sample/StyleActivity.kt +++ b/sample/src/main/java/com/anytypeio/anytype/sample/StyleActivity.kt @@ -3,10 +3,10 @@ package com.anytypeio.anytype.sample import android.os.Bundle import android.widget.ImageView import androidx.appcompat.app.AppCompatActivity -import com.anytypeio.anytype.presentation.page.editor.Markup -import com.anytypeio.anytype.presentation.page.editor.model.Alignment -import com.anytypeio.anytype.presentation.page.editor.styling.StyleConfig -import com.anytypeio.anytype.presentation.page.editor.styling.StylingType +import com.anytypeio.anytype.presentation.editor.editor.Markup +import com.anytypeio.anytype.presentation.editor.editor.model.Alignment +import com.anytypeio.anytype.presentation.editor.editor.styling.StyleConfig +import com.anytypeio.anytype.presentation.editor.editor.styling.StylingType import kotlinx.android.synthetic.main.activity_style.* class StyleActivity: AppCompatActivity() { @@ -39,7 +39,7 @@ class StyleActivity: AppCompatActivity() { Alignment.END ) ), - props = com.anytypeio.anytype.presentation.page.editor.control.ControlPanelState.Toolbar.Styling.Props( + props = com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState.Toolbar.Styling.Props( isBold = false, isItalic = false, isStrikethrough = true,