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

DROID-2775 Protocol | Enhancement | MW 0.36.0-rc2 (#1509)

Browse source 
Co-authored-by: konstantiniiv <ki@anytype.io>
This commit is contained in:
Evgenii Kozlov 2024-08-28 10:27:43 +02:00 • committed by GitHub
parent e8075026d6
commit f2122670b4
Signed by: github
GPG key ID: B5690EEEBB952194
12 changed files with 63 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core-models/src/main/java/com/anytypeio/anytype/core_models/Block.kt
View file

@ -356,7 +356,7 @@ data class Block(
val quickOption: QuickOption = QuickOption.EXACT_DATE,
val value: Any? = null
) {
enum class Operator { AND, OR }
enum class Operator { AND, OR, NO }
enum class Condition {
EQUAL, NOT_EQUAL, GREATER, LESS, GREATER_OR_EQUAL, LESS_OR_EQUAL,
LIKE, NOT_LIKE, IN, NOT_IN, EMPTY, NOT_EMPTY, ALL_IN, NOT_ALL_IN, NONE,

3
core-models/src/main/java/com/anytypeio/anytype/core_models/multiplayer/Multiplayer.kt
View file

@ -84,7 +84,8 @@ enum class SpaceSyncStatus {
SYNCED,
SYNCING,
ERROR,
OFFLINE
OFFLINE,
NETWORK_UPDATE_NEEDED
}
enum class SpaceSyncNetwork {

8
core-ui/src/main/java/com/anytypeio/anytype/core_ui/syncstatus/SpaceSyncStatusScreen.kt
View file

@ -289,7 +289,6 @@ private fun getNetworkCardSettings(
secondaryText = stringResource(id = R.string.sync_status_anytype_end_to_end)
)
}
SpaceSyncStatus.SYNCING -> {
CardSettings(
icon = painterResource(R.drawable.ic_sync_net_connected),
@ -303,7 +302,6 @@ private fun getNetworkCardSettings(
)
)
}
SpaceSyncStatus.ERROR -> {
val errorText = getErrorText(error)
CardSettings(
@ -312,7 +310,6 @@ private fun getNetworkCardSettings(
secondaryText = stringResource(id = errorText)
)
}
SpaceSyncStatus.OFFLINE -> {
CardSettings(
icon = painterResource(R.drawable.ic_sync_net_default),
@ -320,6 +317,9 @@ private fun getNetworkCardSettings(
secondaryText = stringResource(id = R.string.sync_status_anytype_network_no_connecting)
)
}
SpaceSyncStatus.NETWORK_UPDATE_NEEDED -> {
TODO()
}
}
SpaceSyncNetwork.SELF_HOST -> {
@ -362,9 +362,9 @@ private fun getNetworkCardSettings(
secondaryText = stringResource(id = R.string.sync_status_anytype_network_no_connecting)
)
}
SpaceSyncStatus.NETWORK_UPDATE_NEEDED -> TODO()
}
}
SpaceSyncNetwork.LOCAL_ONLY -> {
CardSettings(
icon = painterResource(R.drawable.ic_sync_local_only),

6
core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StatusBadgeWidget.kt
View file

@ -39,21 +39,21 @@ class StatusBadgeWidget @JvmOverloads constructor(
visible()
setImageResource(R.drawable.ic_synced_10)
}
SpaceSyncStatus.SYNCING -> {
visible()
setImageResource(R.drawable.ic_syncing)
}
SpaceSyncStatus.ERROR -> {
visible()
setImageResource(R.drawable.ic_sync_error_10)
}
SpaceSyncStatus.OFFLINE -> {
visible()
setImageResource(R.drawable.ic_sync_grey_10)
}
SpaceSyncStatus.NETWORK_UPDATE_NEEDED -> {
// TODO
}
}
}
}

2
gradle/libs.versions.toml
View file

@ -1,5 +1,5 @@
[versions]
middlewareVersion = "v0.35.4"
middlewareVersion = "v0.36.0-rc2"
kotlinVersion = '2.0.0'
kspVersion = "2.0.0-1.0.22"

2
middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt
View file

@ -630,6 +630,7 @@ fun MDVFilterQuickOption.toCoreModels(): DVFilterQuickOption = when (this) {
fun MDVFilterOperator.toCoreModels(): DVFilterOperator = when (this) {
MDVFilterOperator.And -> DVFilterOperator.AND
MDVFilterOperator.Or -> DVFilterOperator.OR
MDVFilterOperator.No -> DVFilterOperator.NO
}
fun MDVSort.toCoreModels(): Block.Content.DataView.Sort = DVSort(
@ -1081,6 +1082,7 @@ fun MSpaceSyncStatus.toCoreModel(): SpaceSyncStatus = when (this) {
MSpaceSyncStatus.Syncing -> SpaceSyncStatus.SYNCING
MSpaceSyncStatus.Error -> SpaceSyncStatus.ERROR
MSpaceSyncStatus.Offline -> SpaceSyncStatus.OFFLINE
MSpaceSyncStatus.NetworkNeedsUpdate -> SpaceSyncStatus.NETWORK_UPDATE_NEEDED
}
fun MSpaceSyncNetwork.toCoreModel(): SpaceSyncNetwork = when (this) {

1
middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt
View file

@ -408,6 +408,7 @@ fun Any?.validate() : Any? {
fun Block.Content.DataView.Filter.Operator.toMiddlewareModel(): MDVFilterOperator = when (this) {
Block.Content.DataView.Filter.Operator.AND -> MDVFilterOperator.And
Block.Content.DataView.Filter.Operator.OR -> MDVFilterOperator.Or
Block.Content.DataView.Filter.Operator.NO -> MDVFilterOperator.No
}
fun Block.Content.DataView.Filter.QuickOption.toMiddlewareModel(): MDVFilterQuickOption =

2
presentation/src/main/java/com/anytypeio/anytype/presentation/mapper/MapperExtension.kt
View file

@ -463,6 +463,7 @@ fun Block.Content.DataView.Sort.Type.toView(): Viewer.SortType = when (this) {
fun DVFilterOperator.toView(): Viewer.FilterOperator = when (this) {
Block.Content.DataView.Filter.Operator.AND -> Viewer.FilterOperator.And
Block.Content.DataView.Filter.Operator.OR -> Viewer.FilterOperator.Or
Block.Content.DataView.Filter.Operator.NO -> Viewer.FilterOperator.No
}
fun DVFilterCondition.toTextView(): Viewer.Filter.Condition.Text = when (this) {
@ -524,6 +525,7 @@ fun DVFilterCondition.toCheckboxView(): Viewer.Filter.Condition.Checkbox = when
fun Viewer.FilterOperator.toDomain(): DVFilterOperator = when (this) {
Viewer.FilterOperator.And -> DVFilterOperator.AND
Viewer.FilterOperator.Or -> DVFilterOperator.OR
Viewer.FilterOperator.No -> DVFilterOperator.NO
}
fun Viewer.Filter.Condition.toDomain(): DVFilterCondition = when (this) {

2
presentation/src/main/java/com/anytypeio/anytype/presentation/sets/model/Viewer.kt
View file

@ -127,7 +127,7 @@ sealed class Viewer {
}
enum class SortType { ASC, DESC, CUSTOM }
enum class FilterOperator { And, Or }
enum class FilterOperator { And, Or, No }
sealed class Filter {

35
protocol/src/main/proto/commands.proto
View file

@ -2417,6 +2417,35 @@ message Rpc {
}
}
message ListModifyDetailValues {
message Request {
repeated string objectIds = 1;
repeated Operation operations = 2;
message Operation {
string relationKey = 1;
google.protobuf.Value add = 2;
google.protobuf.Value set = 3;
google.protobuf.Value remove = 4;
}
}
message Response {
Error error = 1;
message Error {
Code code = 1;
string description = 2;
enum Code {
NULL = 0;
UNKNOWN_ERROR = 1;
BAD_INPUT = 2;
}
}
}
}
message ApplyTemplate {
message Request {
string contextId = 1;
@ -2559,9 +2588,9 @@ message Rpc {
}
message Response {
Error error = 1;
string collectionId = 2;
int64 objectsCount = 3;
Error error = 1; // deprecated
string collectionId = 2; // deprecated
int64 objectsCount = 3; // deprecated
message Error {
Code code = 1;

11
protocol/src/main/proto/events.proto
View file

@ -108,6 +108,8 @@ message Event {
Space.SyncStatus.Update spaceSyncStatusUpdate = 119;
P2PStatus.Update p2pStatusUpdate = 120;
Import.Finish importFinish = 121;
}
}
@ -1086,6 +1088,7 @@ message Event {
Syncing = 1;
Error = 2;
Offline = 3;
NetworkNeedsUpdate = 4;
}
enum Network {
Anytype = 0;
@ -1112,6 +1115,14 @@ message Event {
Connected = 2;
}
}
message Import {
message Finish {
string rootCollectionID = 1;
int64 objectsCount = 2;
model.Import.Type importType = 3;
}
}
}
message ResponseEvent {

4
protocol/src/main/proto/models.proto
View file

@ -432,10 +432,12 @@ message Block {
QuickOption quickOption = 6;
RelationFormat format = 7;
bool includeTime = 8;
repeated Filter nestedFilters = 10;
enum Operator {
And = 0;
No = 0;
Or = 1;
And = 2;
}
enum Condition {