Skip to content

Controlling backend access #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandroBorgesFerreira merged 1 commit into from
Jun 29, 2025
Merged

Controlling backend access #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion application/composeApp/src/jvmMain/kotlin/io/writeopia/desktop/MainDesktop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import io.writeopia.theme.WrieopiaTheme
import io.writeopia.theme.WriteopiaTheme
import io.writeopia.ui.image.ImageLoadConfig
import io.writeopia.ui.keyboard.KeyboardEvent
import io.writeopia.common.utils.ALLOW_BACKEND
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down Expand Up @@ -235,7 +236,11 @@ private fun ApplicationScope.App(onCloseRequest: () -> Unit = ::exitApplication)
) {
NavHost(
navController = navigationController,
startDestination = Destinations.START_APP.id
startDestination = if (ALLOW_BACKEND) {
Destinations.START_APP.id
} else {
Destinations.MAIN_APP.id
}
) {
startScreen(navigationController, authInjection, colorTheme)

Expand Down
39 changes: 21 additions & 18 deletions application/core/common_ui/src/commonMain/kotlin/io/writeopia/commonui/SettingsPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import io.writeopia.common.utils.ALLOW_BACKEND
import io.writeopia.resources.WrStrings
import io.writeopia.theme.WriteopiaTheme

Expand All @@ -35,28 +36,30 @@ fun SettingsPanel(
modifier: Modifier = Modifier,
) {
var pageState by remember {
mutableStateOf(SettingsPage.ACCOUNT)
mutableStateOf(if (ALLOW_BACKEND) SettingsPage.ACCOUNT else SettingsPage.APPEARANCE)
}

Row(modifier = modifier) {
Column(modifier = Modifier.width(180.dp).fillMaxHeight()) {
Text(
WrStrings.account(),
modifier = Modifier.fillMaxWidth()
.padding(top = 2.dp, bottom = 2.dp, end = 16.dp)
.clip(MaterialTheme.shapes.medium)
.background(
if (pageState == SettingsPage.ACCOUNT) {
WriteopiaTheme.colorScheme.highlight
} else {
Color.Unspecified
}
)
.clickable {
pageState = SettingsPage.ACCOUNT
}.padding(vertical = 4.dp, horizontal = 12.dp),
style = MaterialTheme.typography.bodyMedium
)
if (ALLOW_BACKEND) {
Text(
WrStrings.account(),
modifier = Modifier.fillMaxWidth()
.padding(top = 2.dp, bottom = 2.dp, end = 16.dp)
.clip(MaterialTheme.shapes.medium)
.background(
if (pageState == SettingsPage.ACCOUNT) {
WriteopiaTheme.colorScheme.highlight
} else {
Color.Unspecified
}
)
.clickable {
pageState = SettingsPage.ACCOUNT
}.padding(vertical = 4.dp, horizontal = 12.dp),
style = MaterialTheme.typography.bodyMedium
)
}

Text(
WrStrings.appearance(),
Expand Down
3 changes: 3 additions & 0 deletions application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/Configuration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package io.writeopia.common.utils

const val ALLOW_BACKEND = false
2 changes: 1 addition & 1 deletion ...eatures/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/di/NotesMenuKmpInjection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class NotesMenuKmpInjection private constructor(
private val keyboardEventFlow: Flow<KeyboardEvent>,
private val appConnectionInjection: AppConnectionInjection = AppConnectionInjection.singleton(),
private val connectionInjector: WriteopiaConnectionInjector =
WriteopiaConnectionInjector.singleton()
WriteopiaConnectionInjector.singleton(),
) : NotesMenuInjection {

private fun provideDocumentRepository(): DocumentRepository =
Expand Down
8 changes: 7 additions & 1 deletion ...note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteKmpViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import io.writeopia.sdk.models.id.GenerateId
import io.writeopia.sdk.models.sorting.OrderBy
import io.writeopia.sdk.models.story.StoryStep
import io.writeopia.sdk.models.story.StoryTypes
import io.writeopia.sdk.models.user.Tier
import io.writeopia.sdk.models.user.WriteopiaUser
import io.writeopia.sdk.models.utils.ResultData
import io.writeopia.sdk.preview.PreviewParser
Expand Down Expand Up @@ -436,7 +437,12 @@ internal class ChooseNoteKmpViewModel(
override fun syncFolderWithCloud() {
viewModelScope.launch(Dispatchers.Default) {
// Refresh happens inside syncFolder
documentsSync.syncFolder(notesNavigation.id, authRepository.getUser().id)
if (authRepository.isLoggedIn() && authRepository.getUser().tier == Tier.PREMIUM) {
documentsSync.syncFolder(
notesNavigation.id,
authRepository.getUser().id
)
}
}
}

Expand Down