Skip to content

Commit 6f5345e

Browse files
oleksii-unnamedoleksii-unnamed
committed
Updated Compose, Dropwizard, Javalin, Ktor, Micronaut and Spring demos and Samples to use GroupDocs.Comparison for Java v23.3
1 parent 10bb78e commit 6f5345e

158 files changed

Lines changed: 491 additions & 1100 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.

‎Demos/Compose/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![GroupDocs.Comparison](https://raw.githubusercontent.com/groupdocs-comparison/groupdocs-comparison.github.io/master/resources/image/banner.png "GroupDocs.Comparison")
22
# GroupDocs.Comparison for Kotlin Compose Example
33
New GroupDocs.Comparison for Java Dropwizard UI Example
4-
###### version 23.1
4+
###### version 23.3
55

66
[![GitHub license](https://img.shields.io/github/license/groupdocs-comparison/GroupDocs.Comparison-for-Java-Dropwizard.svg)](https://github.com/groupdocs-comparison/GroupDocs.Comparison-for-Java/blob/master/Demos/Compose/LICENSE)
77

‎Demos/Compose/build.gradle.kts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ plugins {
77
id("org.jetbrains.compose") version "1.0.0"
88
}
99

10-
group = "com.groupdocs.ui"
11-
version = "23.1"
10+
group = "com.groupdocs.ui.comparison.compose"
11+
version = "23.3"
1212

1313
repositories {
1414
google()
@@ -25,12 +25,14 @@ dependencies {
2525
}
2626

2727
tasks.withType<KotlinCompile> {
28-
kotlinOptions.jvmTarget = "11"
28+
kotlinOptions.jvmTarget = "15"
29+
}
30+
tasks.withType<JavaCompile> {
31+
options.release.set(15)
2932
}
30-
3133
compose.desktop {
3234
application {
33-
mainClass = "com.groupdocs.ui.MainKt"
35+
mainClass = "com.groupdocs.ui.comparison.compose.MainKt"
3436
nativeDistributions {
3537
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
3638
packageName = "groupdocs-comparison-compose"

Demos/Compose/src/main/kotlin/com/groupdocs/ui/Main.kt renamed to Demos/Compose/src/main/kotlin/com/groupdocs/ui/comparison/compose/Main.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
2-
package com.groupdocs.ui
2+
package com.groupdocs.ui.comparison.compose
33

44
import androidx.compose.desktop.ui.tooling.preview.Preview
55
import androidx.compose.foundation.layout.Box
@@ -12,11 +12,11 @@ import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.res.painterResource
1313
import androidx.compose.ui.window.Window
1414
import androidx.compose.ui.window.application
15-
import com.groupdocs.ui.settings.SettingsScreen
16-
import com.groupdocs.ui.common.Screen
17-
import com.groupdocs.ui.home.HomeScreen
18-
import com.groupdocs.ui.result.ResultScreen
19-
import com.groupdocs.ui.theme.GroupDocsTheme
15+
import com.groupdocs.ui.comparison.compose.common.Screen
16+
import com.groupdocs.ui.comparison.compose.home.HomeScreen
17+
import com.groupdocs.ui.comparison.compose.result.ResultScreen
18+
import com.groupdocs.ui.comparison.compose.settings.SettingsScreen
19+
import com.groupdocs.ui.comparison.compose.theme.GroupDocsTheme
2020
import java.awt.Dimension
2121

2222
@Composable

Demos/Compose/src/main/kotlin/com/groupdocs/ui/common/LocalResourceLoader.kt renamed to Demos/Compose/src/main/kotlin/com/groupdocs/ui/comparison/compose/common/LocalResourceLoader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.groupdocs.ui.common
1+
package com.groupdocs.ui.comparison.compose.common
22

33
import androidx.compose.ui.ExperimentalComposeUiApi
44
import androidx.compose.ui.res.ResourceLoader

Demos/Compose/src/main/kotlin/com/groupdocs/ui/common/Screen.kt renamed to Demos/Compose/src/main/kotlin/com/groupdocs/ui/comparison/compose/common/Screen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.groupdocs.ui.common
1+
package com.groupdocs.ui.comparison.compose.common
22

33
class NavigationException(message: String = "") : RuntimeException(message)
44

Demos/Compose/src/main/kotlin/com/groupdocs/ui/common/Settings.kt renamed to Demos/Compose/src/main/kotlin/com/groupdocs/ui/comparison/compose/common/Settings.kt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.groupdocs.ui.common
1+
package com.groupdocs.ui.comparison.compose.common
22

33
import com.groupdocs.comparison.options.style.DetalisationLevel
4-
import com.groupdocs.ui.settings.SettingsViewModel
54
import java.io.*
65
import java.nio.file.Files
76
import java.nio.file.Path
@@ -25,18 +24,18 @@ class Settings private constructor(val path: Path) {
2524
properties.setProperty("licensePath", if (value.isNullOrBlank()) "" else value)
2625
}
2726

28-
var detalisationLevel: Int
27+
var detalisationLevel: DetalisationLevel
2928
get() =
3029
when (properties.getProperty("detalizationLevel", "Middle")) {
31-
"Low" -> DetalisationLevel.Low
32-
"High" -> DetalisationLevel.High
33-
else -> DetalisationLevel.Middle
30+
"Low" -> DetalisationLevel.LOW
31+
"High" -> DetalisationLevel.HIGH
32+
else -> DetalisationLevel.MIDDLE
3433
}
3534
set(value) {
3635
properties.setProperty(
3736
"detalizationLevel", when (value) {
38-
DetalisationLevel.Low -> "Low"
39-
DetalisationLevel.High -> "High"
37+
DetalisationLevel.LOW -> "Low"
38+
DetalisationLevel.HIGH -> "High"
4039
else -> "Middle"
4140
}
4241
)

Demos/Compose/src/main/kotlin/com/groupdocs/ui/common/Utils.kt renamed to Demos/Compose/src/main/kotlin/com/groupdocs/ui/comparison/compose/common/Utils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.groupdocs.ui
1+
package com.groupdocs.ui.comparison.compose.common
22

33
import java.awt.Desktop
44
import java.net.URI

Demos/Compose/src/main/kotlin/com/groupdocs/ui/home/HomeScreen.kt renamed to Demos/Compose/src/main/kotlin/com/groupdocs/ui/comparison/compose/home/HomeScreen.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.groupdocs.ui.home
1+
package com.groupdocs.ui.comparison.compose.home
22

33
import androidx.compose.foundation.Image
44
import androidx.compose.foundation.background
@@ -17,9 +17,9 @@ import androidx.compose.ui.text.font.FontWeight
1717
import androidx.compose.ui.text.style.TextAlign
1818
import androidx.compose.ui.text.style.TextDecoration
1919
import androidx.compose.ui.unit.dp
20-
import com.groupdocs.ui.common.Screen
21-
import com.groupdocs.ui.home.component.FileScreen
22-
import com.groupdocs.ui.theme.spaces
20+
import com.groupdocs.ui.comparison.compose.common.Screen
21+
import com.groupdocs.ui.comparison.compose.home.component.FileScreen
22+
import com.groupdocs.ui.comparison.compose.theme.spaces
2323

2424
@Composable
2525
fun HomeScreen(screen: MutableState<Screen>) {

Demos/Compose/src/main/kotlin/com/groupdocs/ui/home/HomeState.kt renamed to Demos/Compose/src/main/kotlin/com/groupdocs/ui/comparison/compose/home/HomeState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.groupdocs.ui.home
1+
package com.groupdocs.ui.comparison.compose.home
22

33
import java.nio.file.Paths
44

Demos/Compose/src/main/kotlin/com/groupdocs/ui/home/HomeViewModel.kt renamed to Demos/Compose/src/main/kotlin/com/groupdocs/ui/comparison/compose/home/HomeViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.groupdocs.ui.home
1+
package com.groupdocs.ui.comparison.compose.home
22

33
import androidx.compose.runtime.MutableState
44
import androidx.compose.runtime.State
55
import androidx.compose.runtime.mutableStateOf
6-
import com.groupdocs.ui.common.Screen
7-
import com.groupdocs.ui.openInBrowser
6+
import com.groupdocs.ui.comparison.compose.common.Screen
7+
import com.groupdocs.ui.comparison.compose.common.openInBrowser
88
import java.net.URI
99
import javax.swing.JFileChooser
1010
import javax.swing.filechooser.FileNameExtensionFilter

0 commit comments

Comments
 (0)