mirror of
https://github.com/ovrport/app.git
synced 2026-10-26 19:19:56 -04:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c7cb335c8 | ||
|
|
3b1d59224a | ||
|
|
5028a0e8f0 |
No files matched your search
@@ -45,6 +45,7 @@ kotlin {
|
||||
desktopMain.dependencies {
|
||||
implementation(compose.desktop.currentOs)
|
||||
implementation(libs.kotlinx.coroutines.swing)
|
||||
implementation(libs.com.formdev.flatlaf)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,6 +101,7 @@ fun PatcherScreen(
|
||||
errorMessage =
|
||||
getString(Res.string.cant_checkout_title) to getString(Res.string.cant_checkout_message)
|
||||
} catch (ex: Throwable) {
|
||||
ex.printStackTrace()
|
||||
viewModel.cancel()
|
||||
errorMessage = getString(Res.string.unknown_error) to ex.stackTraceToString()
|
||||
} finally {
|
||||
|
||||
@@ -13,6 +13,7 @@ import androidx.compose.ui.draganddrop.awtTransferable
|
||||
import androidx.compose.ui.window.Window
|
||||
import androidx.compose.ui.window.application
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import com.formdev.flatlaf.util.SystemFileChooser
|
||||
import kotlinx.coroutines.flow.MutableSharedFlow
|
||||
import kotlinx.coroutines.launch
|
||||
import moe.crx.overport.app.composables.AppContent
|
||||
@@ -24,7 +25,6 @@ import org.jetbrains.compose.resources.stringResource
|
||||
import overportapp.composeapp.generated.resources.Res
|
||||
import overportapp.composeapp.generated.resources.select_a_file
|
||||
import overportapp.composeapp.generated.resources.window_icon
|
||||
import java.awt.FileDialog
|
||||
import java.awt.Frame
|
||||
import java.awt.datatransfer.DataFlavor
|
||||
import java.io.*
|
||||
@@ -97,23 +97,26 @@ fun main(args: Array<String>) = application {
|
||||
AppContent(
|
||||
viewModel = viewModel,
|
||||
openFile = {
|
||||
val fileDialog = FileDialog(Frame(), selectFileString, FileDialog.LOAD).apply {
|
||||
directory = lastOpenedDirectory
|
||||
isVisible = true
|
||||
val fileDialog = SystemFileChooser(selectFileString).apply {
|
||||
currentDirectory = File(lastOpenedDirectory)
|
||||
selectedFile = null
|
||||
}
|
||||
|
||||
val file = fileDialog.file?.let { File(fileDialog.directory).resolve(it) }
|
||||
val file = if (fileDialog.showOpenDialog(Frame()) != SystemFileChooser.APPROVE_OPTION) null else {
|
||||
fileDialog.selectedFile
|
||||
}
|
||||
|
||||
openFile(file)
|
||||
},
|
||||
saveFile = { name ->
|
||||
val fileDialog = FileDialog(Frame(), selectFileString, FileDialog.SAVE).apply {
|
||||
directory = lastOpenedDirectory
|
||||
file = name
|
||||
isVisible = true
|
||||
val fileDialog = SystemFileChooser(selectFileString).apply {
|
||||
currentDirectory = File(lastOpenedDirectory)
|
||||
selectedFile = File(lastOpenedDirectory, name)
|
||||
}
|
||||
|
||||
val file = fileDialog.file?.let { File(fileDialog.directory).resolve(it) }
|
||||
val file = if (fileDialog.showSaveDialog(Frame()) != SystemFileChooser.APPROVE_OPTION) null else {
|
||||
fileDialog.selectedFile
|
||||
}
|
||||
|
||||
scope.launch {
|
||||
if (file == null) {
|
||||
|
||||
@@ -13,8 +13,11 @@ bcpkix = "1.83"
|
||||
kotlinx-serialization = "1.9.0"
|
||||
lifecycle-viewmodel-compose = "2.9.6"
|
||||
compose-hot-reload = "1.0.0"
|
||||
flatlaf = "3.7.2"
|
||||
|
||||
[libraries]
|
||||
com-formdev-flatlaf = { group = "com.formdev", name = "flatlaf", version.ref = "flatlaf" }
|
||||
|
||||
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activityCompose" }
|
||||
|
||||
androidx-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
|
||||
@@ -24,8 +27,8 @@ androidx-lifecycle-viewmodel-compose = { group = "org.jetbrains.androidx.lifecyc
|
||||
|
||||
android-tools-build = { group = "com.android.tools.build", name = "apksig", version.ref = "apksig" }
|
||||
bouncycastle-pkix = { group = "org.bouncycastle", name = "bcpkix-jdk18on", version.ref = "bcpkix" }
|
||||
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name ="kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
|
||||
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name ="kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
|
||||
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
|
||||
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
|
||||
|
||||
[plugins]
|
||||
androidApplication = { id = "com.android.application", version.ref = "agp" }
|
||||
|
||||
@@ -95,9 +95,17 @@ val PATCH_VR_METADATA = Patch("patch_vr_metadata") {
|
||||
this?.put(createUsesFeature("android.software.xr.api.openxr", true))
|
||||
?.put(createUsesFeature("android.software.xr.api.spatial", true))
|
||||
?.put(createUsesFeature("android.software.xr.input.controller", false))
|
||||
?.put(createUsesFeature("android.hardware.xr.input.hand_tracking", false))
|
||||
?.put(createUsesFeature("android.hardware.xr.input.eye_tracking", false))
|
||||
?.put(createUsesPermission("org.khronos.openxr.permission.OPENXR"))
|
||||
?.put(createUsesPermission("org.khronos.openxr.permission.OPENXR_SYSTEM"))
|
||||
?.put(createUsesPermission("com.huawei.android.permission.VR"))
|
||||
?.put(createUsesPermission("android.permission.EYE_TRACKING_COARSE"))
|
||||
?.put(createUsesPermission("android.permission.EYE_TRACKING_FINE"))
|
||||
?.put(createUsesPermission("android.permission.FACE_TRACKING"))
|
||||
?.put(createUsesPermission("android.permission.HAND_TRACKING"))
|
||||
?.put(createUsesPermission("android.permission.SCENE_UNDERSTANDING_COARSE"))
|
||||
?.put(createUsesPermission("android.permission.SCENE_UNDERSTANDING_FINE"))
|
||||
}
|
||||
takeNodesEach({ named("application") }) {
|
||||
takeNodesEach({ named("activity") }) {
|
||||
|
||||
Reference in new issue
Block a user