Skip to content

Commit ded049f

Browse files
leandroBorgesFerreiraleandroBorgesFerreira
authored
Making it possible to write documents again in the web version (#547)
* Making it possible to write documents again * Adding select by click in web * adding wasm target * js version of webapp working * Bumping libraries and desktop app working * Update yarn.lock * working for js * Fixing android compilation * fixing ktlint * FIxing backend compilation * Update proguard-rules-desktop.pro * fixing unit test * fixing unit test for backend * Update DesktopNoteEditorScreen.kt * fixing tests * Update SqlDelightAuthRepositoryTest.kt * baseline * code clean * Update DocumentRepositoryTest.kt
1 parent e6ee1ef commit ded049f

179 files changed

Lines changed: 2083 additions & 5787 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎application/common_flows/wide_screen_common/build.gradle.kts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
@file:OptIn(ExperimentalWasmDsl::class)
2+
13
import org.jetbrains.compose.compose
4+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
25

36
plugins {
47
kotlin("multiplatform")
@@ -11,7 +14,13 @@ kotlin {
1114
jvmToolchain(21)
1215

1316
jvm()
14-
js(IR) {
17+
18+
js {
19+
browser()
20+
binaries.library()
21+
}
22+
23+
wasmJs {
1524
browser()
1625
binaries.library()
1726
}
@@ -62,6 +71,8 @@ kotlin {
6271
implementation(compose.runtime)
6372
implementation(compose.foundation)
6473
implementation(compose.material3)
74+
implementation(libs.material.icons.core)
75+
6576

6677
implementation(libs.compose.navigation)
6778
}

‎application/common_flows/wide_screen_common/config/ktlint/baseline.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<baseline version="1.0">
3+
<file name="build.gradle.kts">
4+
<error line="76" column="1" source="standard:no-consecutive-blank-lines" />
5+
</file>
36
</baseline>

‎application/common_flows/wide_screen_common/src/commonMain/kotlin/io/writeopia/notes/desktop/components/DesktopApp.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ fun DesktopApp(
109109

110110
coroutineScope.launch {
111111
navigationController.currentBackStackEntryFlow.collect { navEntry ->
112-
val navigationType = navEntry.arguments?.getString(NAVIGATION_TYPE)
113-
val navigationPath = navEntry.arguments?.getString(NAVIGATION_PATH)
112+
val navigationType = navEntry.savedStateHandle.get<String?>(NAVIGATION_TYPE)
113+
val navigationPath = navEntry.savedStateHandle.get<String?>(NAVIGATION_PATH)
114114
if (navigationType != null && navigationPath != null) {
115115
NotesNavigation.fromType(
116116
NotesNavigationType.fromType(navigationType),
@@ -133,8 +133,8 @@ fun DesktopApp(
133133
width = sideMenuWidth.dp,
134134
homeClick = {
135135
val navType = navigationController.currentBackStackEntry
136-
?.arguments
137-
?.getString(NAVIGATION_TYPE)
136+
?.savedStateHandle
137+
?.get<String>(NAVIGATION_TYPE)
138138
?.let(NotesNavigationType::fromType)
139139

140140
if (navType != NotesNavigationType.ROOT) {
@@ -143,8 +143,8 @@ fun DesktopApp(
143143
},
144144
favoritesClick = {
145145
val navType = navigationController.currentBackStackEntry
146-
?.arguments
147-
?.getString(NAVIGATION_TYPE)
146+
?.savedStateHandle
147+
?.get<String?>(NAVIGATION_TYPE)
148148
?.let(NotesNavigationType::fromType)
149149

150150
if (navType != NotesNavigationType.FAVORITES) {

‎application/composeApp/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ android {
175175
buildConfigField("String", "BASE_URL", "\"$baseUrl\"")
176176

177177
applicationId = "io.writeopia"
178-
minSdk = 24
178+
minSdk = libs.versions.minSdk.get().toInt()
179179
targetSdk = libs.versions.targetSdk.get().toInt()
180180
versionCode = 35
181181
versionName = "0.22.0"

‎application/composeApp/proguard-rules-desktop.pro‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@
2222
-dontwarn org.bouncycastle.**
2323
-dontwarn org.openjsse.**
2424
-dontwarn java.util.List
25+
-dontwarn okhttp3.internal.graal.**
2526

‎application/core/auth_core/build.gradle.kts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
@file:OptIn(ExperimentalWasmDsl::class)
2+
3+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
4+
15
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
26
plugins {
37
alias(libs.plugins.androidLibrary)
@@ -12,7 +16,12 @@ kotlin {
1216
jvm {}
1317
androidTarget()
1418

15-
js(IR) {
19+
js {
20+
browser()
21+
binaries.library()
22+
}
23+
24+
wasmJs {
1625
browser()
1726
binaries.library()
1827
}
@@ -47,7 +56,7 @@ kotlin {
4756

4857
implementation(libs.kotlinx.coroutines.core)
4958
implementation(libs.kotlinx.serialization.json)
50-
implementation(libs.kotlinx.datetime)
59+
//
5160

5261
implementation(libs.ktor.client.core)
5362
}
@@ -87,7 +96,7 @@ android {
8796
compileSdk = libs.versions.compileSdk.get().toInt()
8897

8998
defaultConfig {
90-
minSdk = 24
99+
minSdk = libs.versions.minSdk.get().toInt()
91100

92101
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
93102
consumerProguardFiles("consumer-rules.pro")

‎application/core/auth_core/config/ktlint/baseline.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
<error line="75" column="67" source="standard:function-expression-body" />
88
</file>
99
<file name="src/commonMain/kotlin/io/writeopia/auth/core/data/WorkspaceApi.kt">
10-
<error line="52" column="84" source="standard:function-expression-body" />
10+
<error line="55" column="84" source="standard:function-expression-body" />
1111
</file>
1212
<file name="src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt">
13-
<error line="16" column="51" source="standard:function-expression-body" />
13+
<error line="19" column="51" source="standard:function-expression-body" />
1414
</file>
1515
<file name="src/commonMain/kotlin/io/writeopia/auth/core/utils/UserExtensions.kt">
1616
<error line="7" column="52" source="standard:function-expression-body" />
1717
</file>
18+
<file name="src/webMain/kotlin/io/writeopia/auth/core/token/AppBearerTokenHandler.web.kt">
19+
<error line="9" column="1" source="standard:no-consecutive-blank-lines" />
20+
</file>
1821
</baseline>

‎application/core/auth_core/src/androidMain/kotlin/io/writeopia/auth/core/repository/RoomAuthRepository.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:OptIn(ExperimentalTime::class)
2+
13
package io.writeopia.auth.core.repository
24

35
import io.writeopia.auth.core.manager.AuthRepository
@@ -7,6 +9,7 @@ import io.writeopia.common.utils.persistence.daos.WorkspaceCommonDao
79
import io.writeopia.sdk.models.workspace.Workspace
810
import io.writeopia.sdk.models.user.WriteopiaUser
911
import io.writeopia.sdk.models.utils.ResultData
12+
import kotlin.time.ExperimentalTime
1013

1114
class RoomAuthRepository(
1215
private val userDao: UserCommonDao,

‎application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/data/WorkspaceApi.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:OptIn(ExperimentalTime::class)
2+
13
package io.writeopia.auth.core.data
24

35
import io.ktor.client.HttpClient
@@ -19,7 +21,8 @@ import io.writeopia.sdk.serialization.data.WorkspaceApi
1921
import io.writeopia.sdk.serialization.data.toModel
2022
import kotlinx.coroutines.flow.MutableStateFlow
2123
import kotlinx.coroutines.flow.StateFlow
22-
import kotlinx.datetime.Clock
24+
import kotlin.time.Clock
25+
import kotlin.time.ExperimentalTime
2326

2427
class WorkspaceApi(private val client: HttpClient, private val baseUrl: String) {
2528

‎application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:OptIn(ExperimentalTime::class)
2+
13
package io.writeopia.auth.core.manager
24

35
import io.writeopia.auth.core.utils.toModel
@@ -7,7 +9,8 @@ import io.writeopia.sdk.models.workspace.Workspace
79
import io.writeopia.sdk.models.user.WriteopiaUser
810
import io.writeopia.sdk.models.utils.ResultData
911
import io.writeopia.sql.WriteopiaDb
10-
import kotlinx.datetime.Instant
12+
import kotlin.time.ExperimentalTime
13+
import kotlin.time.Instant
1114

1215
internal class SqlDelightAuthRepository(
1316
private val writeopiaDb: WriteopiaDb?

0 commit comments

Comments
 (0)