Browse Source

Merge pull request #11 from JetBrains/mouse_move

Move to dev85.
pull/15/head
Nikolay Igotti 4 years ago committed by GitHub
parent
commit
79466c338a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      examples/imageviewer/settings.gradle.kts
  2. 5
      examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt
  3. 8
      examples/issues/local.properties
  4. 2
      examples/issues/settings.gradle.kts
  5. 2
      templates/desktop-template/build.gradle.kts
  6. 2
      templates/multiplatform-template/settings.gradle.kts

2
examples/imageviewer/settings.gradle.kts

@ -6,7 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-build63") classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev85")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
classpath(kotlin("gradle-plugin", version = "1.4.0")) classpath(kotlin("gradle-plugin", version = "1.4.0"))
} }

5
examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt

@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.* import androidx.compose.material.*
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.WithConstraints import androidx.compose.ui.WithConstraints
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
@ -105,7 +106,7 @@ fun SingleColumnLayout(currentIssue: MutableState<IssuesQuery.Node?>) {
@Composable @Composable
fun TwoColumnsLayout(currentIssue: MutableState<IssuesQuery.Node?>) { fun TwoColumnsLayout(currentIssue: MutableState<IssuesQuery.Node?>) {
Row(Modifier.fillMaxSize()) { Row(Modifier.fillMaxSize()) {
Box(modifier = Modifier.fillMaxWidth(0.4f)) { Box(modifier = Modifier.fillMaxWidth(0.4f), alignment = Alignment.Center) {
IssuesList(currentIssue) IssuesList(currentIssue)
} }
CurrentIssue(currentIssue.value) CurrentIssue(currentIssue.value)
@ -253,7 +254,7 @@ fun ListBody(
for (iss in it.data.nodes) { for (iss in it.data.nodes) {
Box(modifier = Modifier.clickable { Box(modifier = Modifier.clickable {
currentIssue.value = iss currentIssue.value = iss
}) { }, alignment = Alignment.CenterStart) {
ListItem(iss) ListItem(iss)
} }
} }

8
examples/issues/local.properties

@ -1,8 +0,0 @@
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Sat Aug 22 13:16:28 CEST 2020
sdk.dir=/Users/prepor/repos/androidx/prebuilts/fullsdk-darwin

2
examples/issues/settings.gradle.kts

@ -6,7 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-build63") classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev85")
classpath("com.android.tools.build:gradle:4.0.1") classpath("com.android.tools.build:gradle:4.0.1")
classpath(kotlin("gradle-plugin", version = "1.4.0")) classpath(kotlin("gradle-plugin", version = "1.4.0"))
} }

2
templates/desktop-template/build.gradle.kts

@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
plugins { plugins {
kotlin("jvm") version "1.4.0" kotlin("jvm") version "1.4.0"
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-build63") id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev85")
application application
} }

2
templates/multiplatform-template/settings.gradle.kts

@ -1,5 +1,5 @@
buildscript { buildscript {
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-build63" val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev85"
repositories { repositories {
google() google()

Loading…
Cancel
Save