mirror of
https://github.com/anyproto/anytype-kotlin.git
synced 2025-06-11 02:13:30 +09:00
611 Action bar fixes (#721)
* #611: fix menu constraints * #611: remove actions * #611: fix uploads * #611: tests * #611: tests off * #611: changelog * #611: fix
This commit is contained in:
parent
d544ae6a9f
commit
65ed8b51cb
8 changed files with 25 additions and 63 deletions
|
@ -22,6 +22,9 @@
|
|||
* Image size issues (#648)
|
||||
* Toggle's button stops working when switching from multi-select to edit mode (#643)
|
||||
* Removed task-block-related legacy (#679)
|
||||
* Remove "Color", "Background" actions for media blocks (#611)
|
||||
* Remove "Add Caption", "Replace", "Rename" actions (#611)
|
||||
* Fix action toolbar constraints (#611)
|
||||
|
||||
## Version 0.0.43
|
||||
|
||||
|
|
|
@ -384,8 +384,6 @@ abstract class BlockActionToolbar : Fragment() {
|
|||
ActionItemType.Divider,
|
||||
ActionItemType.Duplicate,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.Rename,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.MoveTo,
|
||||
ActionItemType.DividerExtended,
|
||||
ActionItemType.Color,
|
||||
|
@ -430,11 +428,7 @@ abstract class BlockActionToolbar : Fragment() {
|
|||
ActionItemType.Divider,
|
||||
ActionItemType.Download,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.Replace,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.MoveTo,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.AddCaption
|
||||
ActionItemType.MoveTo
|
||||
)
|
||||
|
||||
val FILE = listOf(
|
||||
|
@ -444,15 +438,7 @@ abstract class BlockActionToolbar : Fragment() {
|
|||
ActionItemType.Divider,
|
||||
ActionItemType.Download,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.Replace,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.Rename,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.MoveTo,
|
||||
ActionItemType.DividerExtended,
|
||||
ActionItemType.Color,
|
||||
ActionItemType.Divider,
|
||||
ActionItemType.Background
|
||||
ActionItemType.MoveTo
|
||||
)
|
||||
|
||||
val BOOKMARK = listOf(
|
||||
|
|
|
@ -8,7 +8,6 @@ import android.widget.TextView
|
|||
import androidx.core.view.updateLayoutParams
|
||||
import com.agileburo.anytype.R
|
||||
import com.agileburo.anytype.core_ui.features.page.BlockView
|
||||
import com.agileburo.anytype.core_ui.features.page.BlockViewHolder.Companion.HOLDER_BOOKMARK
|
||||
import com.bumptech.glide.Glide
|
||||
|
||||
class BookmarkBlockActionToolbar : BlockActionToolbar() {
|
||||
|
@ -20,18 +19,13 @@ class BookmarkBlockActionToolbar : BlockActionToolbar() {
|
|||
block = arguments?.getParcelable(ARG_BLOCK)!!
|
||||
}
|
||||
|
||||
override fun blockLayout(): Int = when (block.getViewType()) {
|
||||
HOLDER_BOOKMARK -> R.layout.item_block_bookmark
|
||||
else -> throw RuntimeException("No layout for bookmark block with type ${block.getViewType()}")
|
||||
}
|
||||
|
||||
override fun blockLayout(): Int = R.layout.item_block_bookmark
|
||||
override fun getBlock(): BlockView = block
|
||||
|
||||
override fun initUi(view: View, colorView: ImageView?, backgroundView: ImageView?) =
|
||||
when (block.getViewType()) {
|
||||
HOLDER_BOOKMARK -> initBookmark(view)
|
||||
else -> throw RuntimeException("No layout for bookmark block with type ${block.getViewType()}")
|
||||
}
|
||||
override fun initUi(view: View, colorView: ImageView?, backgroundView: ImageView?) {
|
||||
initBookmark(view)
|
||||
setConstraints()
|
||||
}
|
||||
|
||||
private fun initBookmark(view: View) {
|
||||
val item = block
|
||||
|
|
|
@ -20,13 +20,13 @@ class ErrorActionToolbar : BlockActionToolbar() {
|
|||
}
|
||||
|
||||
override fun initUi(view: View, colorView: ImageView?, backgroundView: ImageView?) {
|
||||
when (block.getViewType()) {
|
||||
BlockViewHolder.HOLDER_BOOKMARK_ERROR -> initError(view)
|
||||
else -> Unit
|
||||
if (block.getViewType() == BlockViewHolder.HOLDER_BOOKMARK_ERROR) {
|
||||
initBookmarkError(view)
|
||||
}
|
||||
setConstraints()
|
||||
}
|
||||
|
||||
private fun initError(view: View) {
|
||||
private fun initBookmarkError(view: View) {
|
||||
val item = block as BlockView.Error.Bookmark
|
||||
view.findViewById<TextView>(R.id.errorBookmarkUrl).apply {
|
||||
text = item.url
|
||||
|
|
|
@ -7,7 +7,6 @@ import android.widget.ImageView
|
|||
import android.widget.TextView
|
||||
import com.agileburo.anytype.R
|
||||
import com.agileburo.anytype.core_ui.features.page.BlockView
|
||||
import com.agileburo.anytype.core_ui.features.page.BlockViewHolder
|
||||
import com.agileburo.anytype.core_utils.const.MimeTypes
|
||||
|
||||
class FileBlockActionToolbar : BlockActionToolbar() {
|
||||
|
@ -19,18 +18,12 @@ class FileBlockActionToolbar : BlockActionToolbar() {
|
|||
block = arguments?.getParcelable(ARG_BLOCK)!!
|
||||
}
|
||||
|
||||
override fun blockLayout() = when (block.getViewType()) {
|
||||
BlockViewHolder.HOLDER_FILE -> R.layout.item_block_file_preview
|
||||
else -> R.layout.item_block_file_uploading_preview
|
||||
}
|
||||
|
||||
override fun blockLayout() = R.layout.item_block_file_preview
|
||||
override fun getBlock(): BlockView = block
|
||||
|
||||
override fun initUi(view: View, colorView: ImageView?, backgroundView: ImageView?) =
|
||||
when (block.getViewType()) {
|
||||
BlockViewHolder.HOLDER_FILE -> initFile(view)
|
||||
else -> Unit
|
||||
}
|
||||
override fun initUi(view: View, colorView: ImageView?, backgroundView: ImageView?) {
|
||||
initFile(view)
|
||||
}
|
||||
|
||||
private fun initFile(view: View) {
|
||||
val item = block
|
||||
|
|
|
@ -5,7 +5,6 @@ import android.view.View
|
|||
import android.widget.ImageView
|
||||
import com.agileburo.anytype.R
|
||||
import com.agileburo.anytype.core_ui.features.page.BlockView
|
||||
import com.agileburo.anytype.core_ui.features.page.BlockViewHolder
|
||||
import com.bumptech.glide.Glide
|
||||
|
||||
class PictureBlockActionToolbar : BlockActionToolbar() {
|
||||
|
@ -17,24 +16,10 @@ class PictureBlockActionToolbar : BlockActionToolbar() {
|
|||
block = arguments?.getParcelable(ARG_BLOCK)!!
|
||||
}
|
||||
|
||||
override fun blockLayout() =
|
||||
when (block.getViewType()) {
|
||||
BlockViewHolder.HOLDER_PICTURE -> R.layout.item_block_picture_preview
|
||||
BlockViewHolder.HOLDER_PICTURE_PLACEHOLDER -> R.layout.item_block_picture_placeholder_preview
|
||||
BlockViewHolder.HOLDER_PICTURE_ERROR -> R.layout.item_block_picture_error_preview
|
||||
else -> R.layout.item_block_picture_uploading_preview
|
||||
}
|
||||
|
||||
override fun blockLayout() = R.layout.item_block_picture_preview
|
||||
override fun getBlock(): BlockView = block
|
||||
|
||||
override fun initUi(view: View, colorView: ImageView?, backgroundView: ImageView?) {
|
||||
when (block.getViewType()) {
|
||||
BlockViewHolder.HOLDER_PICTURE -> initPicture(view)
|
||||
else -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
private fun initPicture(view: View) {
|
||||
val item = block
|
||||
view.findViewById<ImageView>(R.id.image).apply {
|
||||
Glide.with(this).load(item.url).into(this)
|
||||
|
|
|
@ -28,19 +28,19 @@ class PlaceholderActionToolbar : BlockActionToolbar() {
|
|||
HOLDER_VIDEO_PLACEHOLDER -> R.layout.item_block_video_empty_preview
|
||||
HOLDER_FILE_PLACEHOLDER -> R.layout.item_block_file_placeholder_preview
|
||||
HOLDER_BOOKMARK_PLACEHOLDER -> R.layout.item_block_bookmark_placeholder
|
||||
else -> R.layout.item_block_picture_uploading_preview
|
||||
else -> R.layout.item_block_picture_placeholder_preview
|
||||
}
|
||||
|
||||
override fun getBlock(): BlockView = block
|
||||
|
||||
override fun initUi(view: View, colorView: ImageView?, backgroundView: ImageView?) {
|
||||
when (block.getViewType()) {
|
||||
HOLDER_BOOKMARK_PLACEHOLDER -> initPlaceholder(view)
|
||||
else -> Unit
|
||||
if (block.getViewType() == HOLDER_BOOKMARK_PLACEHOLDER) {
|
||||
initBookmarkPlaceholder(view)
|
||||
}
|
||||
setConstraints()
|
||||
}
|
||||
|
||||
private fun initPlaceholder(view: View) {
|
||||
private fun initBookmarkPlaceholder(view: View) {
|
||||
view.findViewById<ConstraintLayout>(R.id.bookmarkPlaceholderRoot)
|
||||
.updateLayoutParams<LayoutParams> {
|
||||
this.apply {
|
||||
|
|
|
@ -27,5 +27,6 @@ class UploadActionToolbar : BlockActionToolbar() {
|
|||
override fun getBlock(): BlockView = block
|
||||
|
||||
override fun initUi(view: View, colorView: ImageView?, backgroundView: ImageView?) {
|
||||
setConstraints()
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue