From 6e298d69c1b98fb18353bad5f8f48ed74b54f3cf Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 25 Oct 2021 12:44:38 +0300 Subject: [PATCH] Codeviewer. 1.0.0-beta1 --- examples/codeviewer/android/build.gradle.kts | 6 +++--- examples/codeviewer/android/src/main/AndroidManifest.xml | 1 + examples/codeviewer/build.gradle.kts | 4 ++-- examples/codeviewer/common/build.gradle.kts | 4 ++-- .../kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt | 4 +--- .../kotlin/org/jetbrains/codeviewer/platform/Theme.kt | 6 ------ .../kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt | 4 +--- .../kotlin/org/jetbrains/codeviewer/platform/Theme.kt | 6 ------ .../kotlin/org/jetbrains/codeviewer/ui/MainView.kt | 7 ++----- .../org/jetbrains/codeviewer/ui/editor/EditorView.kt | 7 ++----- .../org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt | 8 ++------ .../kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt | 7 +------ .../kotlin/org/jetbrains/codeviewer/platform/Theme.kt | 7 ------- .../src/jvmMain/kotlin/org/jetbrains/codeviewer/main.kt | 2 -- 14 files changed, 17 insertions(+), 56 deletions(-) delete mode 100644 examples/codeviewer/common/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt delete mode 100644 examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt delete mode 100644 examples/codeviewer/common/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt diff --git a/examples/codeviewer/android/build.gradle.kts b/examples/codeviewer/android/build.gradle.kts index 2d3ef14095..86dad830b9 100644 --- a/examples/codeviewer/android/build.gradle.kts +++ b/examples/codeviewer/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { } android { - compileSdkVersion(30) + compileSdkVersion(31) defaultConfig { minSdkVersion(26) - targetSdkVersion(30) + targetSdkVersion(31) versionCode = 1 versionName = "1.0" } @@ -22,5 +22,5 @@ android { dependencies { implementation(project(":common")) - implementation("androidx.activity:activity-compose:1.3.0-alpha02") + implementation("androidx.activity:activity-compose:1.3.1") } \ No newline at end of file diff --git a/examples/codeviewer/android/src/main/AndroidManifest.xml b/examples/codeviewer/android/src/main/AndroidManifest.xml index 6e3e6786ef..64ddd4d7c6 100644 --- a/examples/codeviewer/android/src/main/AndroidManifest.xml +++ b/examples/codeviewer/android/src/main/AndroidManifest.xml @@ -10,6 +10,7 @@ android:supportsRtl="true" android:theme="@style/Theme.AppCompat.Light.NoActionBar"> diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index dd1959d8d2..b31e9405ec 100644 --- a/examples/codeviewer/build.gradle.kts +++ b/examples/codeviewer/build.gradle.kts @@ -8,8 +8,8 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.0.0-master-build423") - classpath("com.android.tools.build:gradle:4.0.1") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta1") + classpath("com.android.tools.build:gradle:4.2.2") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.5.31")) } diff --git a/examples/codeviewer/common/build.gradle.kts b/examples/codeviewer/common/build.gradle.kts index 9929cd5677..c61757acac 100644 --- a/examples/codeviewer/common/build.gradle.kts +++ b/examples/codeviewer/common/build.gradle.kts @@ -36,11 +36,11 @@ kotlin { } android { - compileSdkVersion(30) + compileSdkVersion(31) defaultConfig { minSdkVersion(21) - targetSdkVersion(30) + targetSdkVersion(31) versionCode = 1 versionName = "1.0" } diff --git a/examples/codeviewer/common/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt b/examples/codeviewer/common/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt index 95be105f61..52c58a9dc3 100644 --- a/examples/codeviewer/common/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt +++ b/examples/codeviewer/common/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt @@ -15,7 +15,5 @@ actual fun VerticalScrollbar( @Composable actual fun VerticalScrollbar( modifier: Modifier, - scrollState: LazyListState, - itemCount: Int, - averageItemSize: Dp + scrollState: LazyListState ) = Unit \ No newline at end of file diff --git a/examples/codeviewer/common/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt b/examples/codeviewer/common/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt deleted file mode 100644 index 7565fa1a0d..0000000000 --- a/examples/codeviewer/common/src/androidMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.jetbrains.codeviewer.platform - -import androidx.compose.runtime.Composable - -@Composable -actual fun PlatformTheme(content: @Composable () -> Unit) = content() \ No newline at end of file diff --git a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt index e1ea979b39..fd1f50c0d7 100644 --- a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt +++ b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt @@ -15,7 +15,5 @@ expect fun VerticalScrollbar( @Composable expect fun VerticalScrollbar( modifier: Modifier, - scrollState: LazyListState, - itemCount: Int, - averageItemSize: Dp + scrollState: LazyListState ) \ No newline at end of file diff --git a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt deleted file mode 100644 index 3c94f7e494..0000000000 --- a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.jetbrains.codeviewer.platform - -import androidx.compose.runtime.Composable - -@Composable -expect fun PlatformTheme(content: @Composable () -> Unit) \ No newline at end of file diff --git a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/MainView.kt b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/MainView.kt index f7000f4db4..7648efd5c0 100644 --- a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/MainView.kt +++ b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/MainView.kt @@ -6,7 +6,6 @@ import androidx.compose.material.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import org.jetbrains.codeviewer.platform.HomeFolder -import org.jetbrains.codeviewer.platform.PlatformTheme import org.jetbrains.codeviewer.ui.common.AppTheme import org.jetbrains.codeviewer.ui.common.Settings import org.jetbrains.codeviewer.ui.editor.Editors @@ -28,10 +27,8 @@ fun MainView() { MaterialTheme( colors = AppTheme.colors.material ) { - PlatformTheme { - Surface { - CodeViewerView(codeViewer) - } + Surface { + CodeViewerView(codeViewer) } } } diff --git a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorView.kt b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorView.kt index 5cc09e1bac..af895553ee 100644 --- a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorView.kt +++ b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/editor/EditorView.kt @@ -74,14 +74,13 @@ private fun Lines(lines: Editor.Lines, settings: Settings) = with(LocalDensity.c Box(Modifier.fillMaxSize()) { val scrollState = rememberLazyListState() - val lineHeight = settings.fontSize.toDp() * 1.6f LazyColumn( modifier = Modifier.fillMaxSize(), state = scrollState ) { items(lines.size) { index -> - Box(Modifier.height(lineHeight)) { + Box(Modifier.height(settings.fontSize.toDp() * 1.6f)) { Line(Modifier.align(Alignment.CenterStart), maxNum, lines[index], settings) } } @@ -89,9 +88,7 @@ private fun Lines(lines: Editor.Lines, settings: Settings) = with(LocalDensity.c VerticalScrollbar( Modifier.align(Alignment.CenterEnd), - scrollState, - lines.size, - lineHeight + scrollState ) } } diff --git a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt index d5905df35d..e570279036 100644 --- a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt +++ b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTreeView.kt @@ -49,23 +49,19 @@ fun FileTreeView(model: FileTree) = Surface( with(LocalDensity.current) { Box { val scrollState = rememberLazyListState() - val fontSize = 14.sp - val lineHeight = fontSize.toDp() * 1.5f LazyColumn( modifier = Modifier.fillMaxSize().withoutWidthConstraints(), state = scrollState ) { items(model.items.size) { - FileTreeItemView(fontSize, lineHeight, model.items[it]) + FileTreeItemView(14.sp, 14.sp.toDp() * 1.5f, model.items[it]) } } VerticalScrollbar( Modifier.align(Alignment.CenterEnd), - scrollState, - model.items.size, - lineHeight + scrollState ) } } diff --git a/examples/codeviewer/common/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt b/examples/codeviewer/common/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt index 4ce9357586..c8af7f095c 100644 --- a/examples/codeviewer/common/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt +++ b/examples/codeviewer/common/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Scrollbar.kt @@ -1,12 +1,10 @@ package org.jetbrains.codeviewer.platform -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ScrollState import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.rememberScrollbarAdapter import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.Dp @Composable actual fun VerticalScrollbar( @@ -17,13 +15,10 @@ actual fun VerticalScrollbar( modifier ) -@OptIn(ExperimentalFoundationApi::class) @Composable actual fun VerticalScrollbar( modifier: Modifier, - scrollState: LazyListState, - itemCount: Int, - averageItemSize: Dp + scrollState: LazyListState ) = androidx.compose.foundation.VerticalScrollbar( rememberScrollbarAdapter(scrollState), modifier diff --git a/examples/codeviewer/common/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt b/examples/codeviewer/common/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt deleted file mode 100644 index 2fc250cd76..0000000000 --- a/examples/codeviewer/common/src/desktopMain/kotlin/org/jetbrains/codeviewer/platform/Theme.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.jetbrains.codeviewer.platform - -import androidx.compose.desktop.DesktopMaterialTheme -import androidx.compose.runtime.Composable - -@Composable -actual fun PlatformTheme(content: @Composable () -> Unit) = DesktopMaterialTheme(content = content) \ No newline at end of file diff --git a/examples/codeviewer/desktop/src/jvmMain/kotlin/org/jetbrains/codeviewer/main.kt b/examples/codeviewer/desktop/src/jvmMain/kotlin/org/jetbrains/codeviewer/main.kt index 1c9c308567..b3e70a808f 100644 --- a/examples/codeviewer/desktop/src/jvmMain/kotlin/org/jetbrains/codeviewer/main.kt +++ b/examples/codeviewer/desktop/src/jvmMain/kotlin/org/jetbrains/codeviewer/main.kt @@ -1,6 +1,5 @@ package org.jetbrains.codeviewer -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.graphics.painter.BitmapPainter import androidx.compose.ui.res.loadImageBitmap import androidx.compose.ui.res.useResource @@ -9,7 +8,6 @@ import androidx.compose.ui.window.WindowState import androidx.compose.ui.window.singleWindowApplication import org.jetbrains.codeviewer.ui.MainView -@OptIn(ExperimentalComposeUiApi::class) fun main() = singleWindowApplication( title = "Code Viewer", state = WindowState(width = 1280.dp, height = 768.dp),