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-1814 Settings | Fix | Fix space storage settings (#475)

Browse source
This commit is contained in:
Evgenii Kozlov 2023-10-26 20:33:03 +02:00 • committed by GitHub
parent ba15bf0d87
commit 4153f58042
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/anytypeio/anytype/ui/spaces/SelectSpaceScreen.kt
View file

@ -200,14 +200,15 @@ private fun SelectSpaceProfileHeader(
start = 74.dp,
end = 74.dp
)
.clickable { onProfileClicked() }
.fillMaxWidth()
.noRippleClickable { onProfileClicked() }
)
Box(
modifier = Modifier
.padding(end = 30.dp)
.size(32.dp)
.align(Alignment.CenterEnd)
.clickable { onSpaceSettingsClicked() }
.noRippleClickable { onSpaceSettingsClicked() }
) {
Image(
painter = painterResource(id = R.drawable.ic_space_settings),

2
middleware/src/main/java/com/anytypeio/anytype/middleware/block/BlockMiddleware.kt
View file

@ -403,7 +403,7 @@ class BlockMiddleware(
relation = relation
)
override suspend fun debugSpace(space: SpaceId): String = middleware.debugSpace(space)
override suspend fun debugSpace(space: SpaceId): String = middleware.debugSpaceSummary(space)
override suspend fun debugObject(objectId: Id, path: String): String =
middleware.debugObject(objectId = objectId, path = path)

4
middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/Middleware.kt
View file

@ -771,10 +771,10 @@ class Middleware @Inject constructor(
}
@Throws(Exception::class)
fun debugSpace(space: SpaceId): String {
fun debugSpaceSummary(space: SpaceId): String {
val request = Rpc.Debug.SpaceSummary.Request(spaceId = space.id)
if (BuildConfig.DEBUG) logRequest(request)
val response = service.debugSpace(request)
val response = service.debugSpaceSummary(request)
if (BuildConfig.DEBUG) logResponse(response)
return response.infos.toCoreModel()
}

2
middleware/src/main/java/com/anytypeio/anytype/middleware/service/MiddlewareService.kt
View file

@ -425,7 +425,7 @@ interface MiddlewareService {
//region DEBUG commands
@Throws(Exception::class)
fun debugSpace(request: Rpc.Debug.SpaceSummary.Request): Rpc.Debug.SpaceSummary.Response
fun debugSpaceSummary(request: Rpc.Debug.SpaceSummary.Request): Rpc.Debug.SpaceSummary.Response
@Throws(Exception::class)
fun debugObject(request: Rpc.Debug.Tree.Request): Rpc.Debug.Tree.Response

2
middleware/src/main/java/com/anytypeio/anytype/middleware/service/MiddlewareServiceImplementation.kt
View file

@ -593,7 +593,7 @@ class MiddlewareServiceImplementation @Inject constructor(
}
}
override fun debugSpace(request: Rpc.Debug.SpaceSummary.Request): Rpc.Debug.SpaceSummary.Response {
override fun debugSpaceSummary(request: Rpc.Debug.SpaceSummary.Request): Rpc.Debug.SpaceSummary.Response {
val encoded = Service.debugSpaceSummary(Rpc.Debug.SpaceSummary.Request.ADAPTER.encode(request))
val response = Rpc.Debug.SpaceSummary.Response.ADAPTER.decode(encoded)
val error = response.error

19
presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchConstants.kt
View file

@ -10,11 +10,7 @@ import com.anytypeio.anytype.core_models.Id
import com.anytypeio.anytype.core_models.Key
import com.anytypeio.anytype.core_models.Marketplace.MARKETPLACE_SPACE_ID
import com.anytypeio.anytype.core_models.ObjectType
import com.anytypeio.anytype.core_models.ObjectTypeIds.AUDIO
import com.anytypeio.anytype.core_models.ObjectTypeIds.FILE
import com.anytypeio.anytype.core_models.ObjectTypeIds.IMAGE
import com.anytypeio.anytype.core_models.ObjectTypeIds.SET
import com.anytypeio.anytype.core_models.ObjectTypeIds.VIDEO
import com.anytypeio.anytype.core_models.Relations
import com.anytypeio.anytype.presentation.objects.SupportedLayouts
@ -784,13 +780,18 @@ object ObjectSearchConstants {
value = true
),
DVFilter(
relation = Relations.TYPE,
relation = Relations.IS_ARCHIVED,
condition = DVFilterCondition.NOT_EQUAL,
value = true
),
DVFilter(
relation = Relations.LAYOUT,
condition = DVFilterCondition.IN,
value = listOf(
IMAGE,
FILE,
VIDEO,
AUDIO
ObjectType.Layout.IMAGE.code.toDouble(),
ObjectType.Layout.FILE.code.toDouble(),
ObjectType.Layout.VIDEO.code.toDouble(),
ObjectType.Layout.AUDIO.code.toDouble()
)
),
DVFilter(

2
presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/collection/CollectionViewModel.kt
View file

@ -213,11 +213,9 @@ class CollectionViewModel(
Subscription.Favorites -> {
favoritesSubscriptionFlow().map { it.map { it as CollectionView } }
}
Subscription.Files -> {
filesSubscriptionFlow()
}
else -> {
subscriptionFlow()
}