Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import io.writeopia.model.ColorThemeOption
import io.writeopia.model.isDarkTheme
import io.writeopia.navigation.Navigation
import io.writeopia.navigation.notes.navigateToFolder
import io.writeopia.navigation.notes.navigateToNote
import io.writeopia.navigation.notes.navigateToNoteMobile
import io.writeopia.notemenu.data.usecase.NotesNavigationUseCase
import io.writeopia.notemenu.di.NotesMenuKmpInjection
import io.writeopia.notemenu.navigation.NAVIGATION_PATH
Expand Down Expand Up @@ -159,7 +159,7 @@ fun DesktopApp(
val navigation = NotesNavigation.Folder(id)
navigationController.navigateToNotes(navigation)
},
navigateToEditDocument = navigationController::navigateToNote,
navigateToEditDocument = navigationController::navigateToNoteMobile,
moveRequest = globalShellViewModel::moveToFolder,
expandFolder = globalShellViewModel::expandFolder,
searchClick = globalShellViewModel::showSearch,
Expand Down Expand Up @@ -269,7 +269,7 @@ fun DesktopApp(
searchResults = searchViewModel.queryResults,
onSearchType = searchViewModel::onSearchType,
onDismissRequest = globalShellViewModel::hideSearch,
documentClick = navigationController::navigateToNote,
documentClick = navigationController::navigateToNoteMobile,
onFolderClick = navigationController::navigateToFolder
)
}
Expand Down
4 changes: 2 additions & 2 deletions application/composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ android {
applicationId = "io.writeopia"
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
versionCode = 38
versionName = "0.25.0"
versionCode = 40
versionName = "0.27.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
import io.writeopia.BuildConfig
import io.writeopia.auth.navigation.authNavigation
import io.writeopia.common.utils.Destinations
import io.writeopia.common.utils.NotesNavigation
import io.writeopia.common.utils.di.SharedPreferencesInjector
import io.writeopia.editor.di.EditorKmpInjector
import io.writeopia.features.search.di.MobileSearchInjection
import io.writeopia.mobile.AppMobile
import io.writeopia.model.isDarkTheme
import io.writeopia.notemenu.di.NotesMenuKmpInjection
import io.writeopia.notemenu.di.UiConfigurationInjector
import io.writeopia.notemenu.navigation.navigateToNotes
import io.writeopia.persistence.room.DatabaseConfigAndroid
import io.writeopia.persistence.room.WriteopiaApplicationDatabase
import io.writeopia.persistence.room.injection.AppRoomDaosInjection
Expand All @@ -48,7 +44,6 @@ class NavigationActivity : ComponentActivity() {
NavigationGraph(
application = application,
window = window,
startDestination = Destinations.START_APP.id
)
}
}
Expand All @@ -69,7 +64,6 @@ fun NavigationGraph(
application
)
),
startDestination: String
) {
SharedPreferencesInjector.init(sharedPreferences)
WriteopiaRoomInjector.init(database)
Expand Down Expand Up @@ -98,18 +92,12 @@ fun NavigationGraph(
.isAppearanceLightStatusBars = !color.isDarkTheme()

AppMobile(
startDestination = startDestination,
navController = navController,
searchInjector = searchInjector,
uiConfigViewModel = uiConfigViewModel,
notesMenuInjection = notesMenuInjection,
editorInjector = editorInjector,
navigationViewModel = navigationViewModel
) {
startScreen(navController, colorThemeState)

authNavigation(navController, colorThemeState) {
navController.navigateToNotes(NotesNavigation.Root)
}
}
navigationViewModel,
editorInjector,
notesMenuInjection,
searchInjector,
uiConfigViewModel,
colorThemeState,
navController
)
}
Loading