anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

Refact | Renamings (#1726)

Browse source
This commit is contained in:
Evgenii Kozlov 2021-08-10 17:37:09 +03:00 • committed by GitHub
parent ff90ea641a
commit a8eb513091
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
402 changed files with 1492 additions and 1529 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/androidTest/java/com/anytypeio/anytype/features/editor/ClipboardTesting.kt
View file

@ -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<TestPageFragment> {
return launchFragmentInContainer<TestPageFragment>(
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer<TestEditorFragment>(
fragmentArgs = args,
themeResId = R.style.AppTheme
)

16
app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateBlockTesting.kt
View file

@ -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<TestPageFragment> {
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer(
fragmentArgs = args,
themeResId = R.style.AppTheme

12
app/src/androidTest/java/com/anytypeio/anytype/features/editor/CreateRelationBlockTesting.kt
View file

@ -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<TestPageFragment> {
return launchFragmentInContainer<TestPageFragment>(
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer<TestEditorFragment>(
fragmentArgs = args,
themeResId = R.style.AppTheme
)

18
app/src/androidTest/java/com/anytypeio/anytype/features/editor/DeleteBlockTesting.kt
View file

@ -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<TestPageFragment> {
return launchFragmentInContainer<TestPageFragment>(
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer<TestEditorFragment>(
fragmentArgs = args,
themeResId = R.style.AppTheme
)

10
app/src/androidTest/java/com/anytypeio/anytype/features/editor/DescriptionTesting.kt
View file

@ -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<TestPageFragment> {
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer(
fragmentArgs = args,
themeResId = R.style.AppTheme

24
app/src/androidTest/java/com/anytypeio/anytype/features/editor/EditorIntegrationTesting.kt
View file

@ -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<TestPageFragment> {
return launchFragmentInContainer<TestPageFragment>(
private fun launchFragment(args: Bundle) : FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer<TestEditorFragment>(
fragmentArgs = args,
themeResId = R.style.AppTheme
)

8
app/src/androidTest/java/com/anytypeio/anytype/features/editor/FeaturedRelationTesting.kt
View file

@ -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<TestPageFragment> {
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer(
fragmentArgs = args,
themeResId = R.style.AppTheme

8
app/src/androidTest/java/com/anytypeio/anytype/features/editor/LayoutTesting.kt
View file

@ -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(),

18
app/src/androidTest/java/com/anytypeio/anytype/features/editor/ListBlockTesting.kt
View file

@ -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<TestPageFragment> {
return launchFragmentInContainer<TestPageFragment>(
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer<TestEditorFragment>(
fragmentArgs = args,
themeResId = R.style.AppTheme
)

32
app/src/androidTest/java/com/anytypeio/anytype/features/editor/MergeBlockTesting.kt
View file

@ -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<TestPageFragment> {
return launchFragmentInContainer<TestPageFragment>(
private fun launchFragment(args: Bundle) : FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer<TestEditorFragment>(
fragmentArgs = args,
themeResId = R.style.AppTheme
)

22
app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt
View file

@ -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<TestPageFragment> {
return launchFragmentInContainer<TestPageFragment>(
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer<TestEditorFragment>(
fragmentArgs = args,
themeResId = R.style.AppTheme
)

10
app/src/androidTest/java/com/anytypeio/anytype/features/editor/ScrollAndMoveTesting.kt
View file

@ -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<TestPageFragment> {
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer(
fragmentArgs = args,
themeResId = R.style.AppTheme

28
app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashTextWatcherTesting.kt
View file

@ -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<TestPageFragment> {
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer(
fragmentArgs = args,
themeResId = R.style.AppTheme

44
app/src/androidTest/java/com/anytypeio/anytype/features/editor/SlashWidgetTesting.kt
View file

@ -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<TestPageFragment> {
private fun launchFragment(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer(
fragmentArgs = args,
themeResId = R.style.AppTheme

48
app/src/androidTest/java/com/anytypeio/anytype/features/editor/SplitBlockTesting.kt
View file

@ -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<TestPageFragment> {
return launchFragmentInContainer<TestPageFragment>(
private fun launchFragment(args: Bundle) : FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer<TestEditorFragment>(
fragmentArgs = args,
themeResId = R.style.AppTheme
)

30
app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt
View file

@ -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<TestPageFragment> {
fun launch(args: Bundle): FragmentScenario<TestEditorFragment> {
return launchFragmentInContainer(
fragmentArgs = args,
themeResId = R.style.AppTheme

16
app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestEditorFragment.kt Normal file
View file

@ -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
}
}

16
app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/TestPageFragment.kt
View file

@ -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
}
}

4
app/src/androidTest/java/com/anytypeio/anytype/features/emoji/DocumentEmojiPickerFragmentTest.kt
View file

@ -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.*

4
app/src/androidTest/java/com/anytypeio/anytype/features/emoji/TestDocumentEmojiPickerFragment.kt
View file

@ -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 {

2
app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationStatusValueTest.kt
View file

@ -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

2
app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt
View file

@ -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

2
app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt
View file

@ -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

2
app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt
View file

@ -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

2
app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt
View file

@ -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

6
app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt
View file

@ -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

2
app/src/androidTest/java/com/anytypeio/anytype/utils/EspressoExt.kt
View file

@ -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

2
app/src/main/java/com/anytypeio/anytype/device/DefaultGradientCollectionProvider.kt
View file

@ -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<Id> = listOf(

36
app/src/main/java/com/anytypeio/anytype/di/common/ComponentManager.kt
View file

@ -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)

10
app/src/main/java/com/anytypeio/anytype/di/feature/ArchiveDI.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/di/feature/CreateBookmarkDI.kt
View file

@ -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

8
app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/di/feature/DocumentAddNewBlockDi.kt
View file

@ -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

6
app/src/main/java/com/anytypeio/anytype/di/feature/DocumentEmojiIconPickerDI.kt
View file

@ -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

8
app/src/main/java/com/anytypeio/anytype/di/feature/DocumentIconActionMenuDI.kt
View file

@ -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

36
app/src/main/java/com/anytypeio/anytype/di/feature/PageDI.kt → app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt
View file

@ -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,

4
app/src/main/java/com/anytypeio/anytype/di/feature/LinkAddDI.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/di/feature/ObjectCoverDI.kt
View file

@ -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

6
app/src/main/java/com/anytypeio/anytype/di/feature/ObjectLayoutDI.kt
View file

@ -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

9
app/src/main/java/com/anytypeio/anytype/di/feature/ObjectMenuDI.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/di/feature/ObjectTypeDI.kt
View file

@ -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

6
app/src/main/java/com/anytypeio/anytype/di/feature/SelectDocCoverDI.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/di/feature/UploadDocCoverImageDI.kt
View file

@ -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

2
app/src/main/java/com/anytypeio/anytype/di/main/MainComponent.kt
View file

@ -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

6
app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt
View file

@ -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<Mark> = getSpans(0, length, Span::class.java).mapNotNull { span ->
when (span) {

10
app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt
View file

@ -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

2
app/src/main/java/com/anytypeio/anytype/providers/DefaultCoverImageHashProvider.kt
View file

@ -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 {

2
app/src/main/java/com/anytypeio/anytype/ui/alert/AlertUpdateAppFragment.kt
View file

@ -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() {

6
app/src/main/java/com/anytypeio/anytype/ui/archive/ArchiveFragment.kt
View file

@ -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.*

6
app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardAdapter.kt → app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardAdapter.kt
View file

@ -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.*

2
app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardDragAndDropBehavior.kt → app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardDragAndDropBehavior.kt
View file

@ -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

28
app/src/main/java/com/anytypeio/anytype/ui/desktop/HomeDashboardFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardFragment.kt
View file

@ -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<State>(R.layout.fragment_desktop) {
class DashboardFragment : ViewStateFragment<State>(R.layout.fragment_dashboard) {
private val vm by viewModels<HomeDashboardViewModel> { factory }
@ -131,7 +131,7 @@ class HomeDashboardFragment : ViewStateFragment<State>(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<State>(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<State>(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 {

2
app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardPager.kt → app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardPager.kt
View file

@ -1,4 +1,4 @@
package com.anytypeio.anytype.ui.desktop
package com.anytypeio.anytype.ui.dashboard
import android.view.LayoutInflater
import android.view.View

4
app/src/main/java/com/anytypeio/anytype/ui/desktop/DashboardProfileAdapter.kt → app/src/main/java/com/anytypeio/anytype/ui/dashboard/DashboardProfileAdapter.kt
View file

@ -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(

4
app/src/main/java/com/anytypeio/anytype/ui/desktop/DesktopDiffUtil.kt → app/src/main/java/com/anytypeio/anytype/ui/dashboard/DesktopDiffUtil.kt
View file

@ -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(

2
app/src/main/java/com/anytypeio/anytype/ui/desktop/ProfileContainerAdapter.kt → app/src/main/java/com/anytypeio/anytype/ui/dashboard/ProfileContainerAdapter.kt
View file

@ -1,4 +1,4 @@
package com.anytypeio.anytype.ui.desktop
package com.anytypeio.anytype.ui.dashboard
import android.view.LayoutInflater
import android.view.View

66
app/src/main/java/com/anytypeio/anytype/ui/page/PageFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt
View file

@ -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<PageViewModel> { factory }
private val vm by viewModels<EditorViewModel> { 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() {

6
app/src/main/java/com/anytypeio/anytype/ui/page/cover/DocCoverGalleryFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/cover/DocCoverGalleryFragment.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/ui/page/cover/DocCoverSliderFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/cover/DocCoverSliderFragment.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/ui/page/cover/UploadCoverImageFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/cover/UploadCoverImageFragment.kt
View file

@ -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

2
app/src/main/java/com/anytypeio/anytype/ui/page/gallery/FullScreenPictureFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/gallery/FullScreenPictureFragment.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/ui/page/layout/ObjectLayoutFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/layout/ObjectLayoutFragment.kt
View file

@ -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

12
app/src/main/java/com/anytypeio/anytype/ui/page/modals/AddBlockFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/AddBlockFragment.kt
View file

@ -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.*

8
app/src/main/java/com/anytypeio/anytype/ui/page/modals/CreateBookmarkFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/CreateBookmarkFragment.kt
View file

@ -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

14
app/src/main/java/com/anytypeio/anytype/ui/page/modals/ObjectIconPickerBaseFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/ObjectIconPickerBaseFragment.kt
View file

@ -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

8
app/src/main/java/com/anytypeio/anytype/ui/page/modals/SelectProgrammingLanguageFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/SelectProgrammingLanguageFragment.kt
View file

@ -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.*

10
app/src/main/java/com/anytypeio/anytype/ui/page/modals/SetLinkFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/SetLinkFragment.kt
View file

@ -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.*

8
app/src/main/java/com/anytypeio/anytype/ui/page/modals/TurnIntoFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/TurnIntoFragment.kt
View file

@ -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.*

14
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbar.kt
View file

@ -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

8
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbarFactory.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbarFactory.kt
View file

@ -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 {

2
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BlockActionToolbarHelper.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BlockActionToolbarHelper.kt
View file

@ -1,4 +1,4 @@
package com.anytypeio.anytype.ui.page.modals.actions
package com.anytypeio.anytype.ui.editor.modals.actions
object BlockActionToolbarHelper {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BookmarkBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BookmarkBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/BulletedBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/BulletedBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/CheckBoxBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/CheckBoxBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/CodeBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/CodeBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/DividerLineBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/DividerLineBlockActionToolbar.kt
View file

@ -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() {

12
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/DocumentIconActionMenuFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/DocumentIconActionMenuFragment.kt
View file

@ -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.*

6
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ErrorActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ErrorActionToolbar.kt
View file

@ -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() {

6
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/FileBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/FileBlockActionToolbar.kt
View file

@ -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() {

5
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderOneBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderOneBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderThreeBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderThreeBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HeaderTwoBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HeaderTwoBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/HighlightBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/HighlightBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/NumberedBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/NumberedBlockActionToolbar.kt
View file

@ -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() {

6
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PageArchiveBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PageArchiveBlockActionToolbar.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PageBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PageBlockActionToolbar.kt
View file

@ -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

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ParagraphBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ParagraphBlockActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PictureBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PictureBlockActionToolbar.kt
View file

@ -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() {

12
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/PlaceholderActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/PlaceholderActionToolbar.kt
View file

@ -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() {

8
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ProfileIconActionMenuFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ProfileIconActionMenuFragment.kt
View file

@ -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

6
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/RelationDefaultActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/RelationDefaultActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/RelationPlaceholderActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/RelationPlaceholderActionToolbar.kt
View file

@ -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() {

4
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/ToggleBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/ToggleBlockActionToolbar.kt
View file

@ -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() {

6
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/UploadActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/UploadActionToolbar.kt
View file

@ -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() {

6
app/src/main/java/com/anytypeio/anytype/ui/page/modals/actions/VideoBlockActionToolbar.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/modals/actions/VideoBlockActionToolbar.kt
View file

@ -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

14
app/src/main/java/com/anytypeio/anytype/ui/page/sheets/ObjectMenuBaseFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/editor/sheets/ObjectMenuBaseFragment.kt
View file

@ -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

2
app/src/main/java/com/anytypeio/anytype/ui/menu/AnytypeContextMenu.kt
View file

@ -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(

12
app/src/main/java/com/anytypeio/anytype/ui/object/ObjectTypeChangeFragment.kt → app/src/main/java/com/anytypeio/anytype/ui/objects/ObjectTypeChangeFragment.kt
View file

@ -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

2
app/src/main/java/com/anytypeio/anytype/ui/relations/RelationListFragment.kt
View file

@ -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

Some files were not shown because too many files have changed in this diff Show more