Skip to content

Commit

Permalink
- kotlin, tornadofx, jfoenix, gradle wrapper version bump.
Browse files Browse the repository at this point in the history
- modified snackbar to use new abstracted to hold message.
- Added new build for JFXDecorator.
  • Loading branch information
bkenn committed Dec 11, 2018
1 parent 2e3a9e5 commit ea701a0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
10 changes: 6 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,25 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.load.kotlin.signatures

plugins {
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "1.3.11"
id("org.jetbrains.dokka") version "0.9.17"
id("maven-publish")
id("signing")
}

group = "kfoenix"
version = "0.1.3"
version = "0.1.4"

repositories {
mavenCentral()
}

dependencies {
compile(kotlin("stdlib-jdk8"))
compile("com.jfoenix:jfoenix:8.0.7")
compile("no.tornado:tornadofx:1.7.16")
compile("com.jfoenix:jfoenix:8.0.8")
compile("no.tornado:tornadofx:1.7.17") {
exclude("org.jetbrains.kotlin")
}
}


Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
5 changes: 1 addition & 4 deletions src/main/kotlin/kfoenix/Controls.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@ package kfoenix

import com.jfoenix.controls.*
import com.jfoenix.controls.JFXButton.ButtonType.*
import javafx.beans.property.ObjectProperty
import javafx.beans.property.Property
import javafx.beans.value.ObservableValue
import javafx.event.EventTarget
import javafx.geometry.Orientation
import javafx.scene.Node
import javafx.scene.control.ButtonBar
import javafx.scene.control.ToggleButton
import javafx.scene.control.ToggleGroup
import javafx.scene.control.ToolBar
import javafx.scene.layout.Pane
import javafx.scene.layout.Region
import javafx.scene.paint.Color
import javafx.util.StringConverter
import tornadofx.*
import java.time.LocalDate
Expand Down Expand Up @@ -213,7 +210,7 @@ fun View.jfxsnackbar(message: String, timeout: Long = -1, op: JFXSnackbar.() ->
* SnackBar
*/
fun <T: Pane> jfxsnackbar(message: String, pane: T, op: JFXSnackbar.() -> Unit = {})
= JFXSnackbar(pane).also(op).enqueue(JFXSnackbar.SnackbarEvent(message))
= JFXSnackbar(pane).also(op).enqueue(JFXSnackbar.SnackbarEvent(JFXSnackbarLayout(message)))

fun Pane.jfxsnackbar(message: String, op: JFXSnackbar.() -> Unit = {}) = jfxsnackbar(message,this, op)

Expand Down
6 changes: 4 additions & 2 deletions src/main/kotlin/kfoenix/Layouts.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ import kotlin.reflect.KClass
* You will receive the following exception: java.lang.IllegalStateException: Cannot set style once stage has been set visible
*
*/
fun <T: UIComponent> View.jfxdecorator(uiComponent: T, op: JFXDecorator.() -> Unit = {}) = opcr(this, JFXDecorator(primaryStage, uiComponent.root), op)
fun <T: UIComponent> View.jfxdecorator(uiComponent: T, op: JFXDecorator.() -> Unit = {})
= opcr(this, JFXDecorator(primaryStage, uiComponent.root), op)

fun View.jfxdecorator(node: Node, op: JFXDecorator.() -> Unit = {}) = opcr(this, JFXDecorator(primaryStage, node), op)
fun View.jfxdecorator(node: Node, fullScreen: Boolean = true, max: Boolean = true, min: Boolean = true, op: JFXDecorator.() -> Unit = {})
= opcr(this, JFXDecorator(primaryStage, node, fullScreen, max, min), op)

fun View.jfxdecorator(uiComponent: KClass<out UIComponent>, op: JFXDecorator.() -> Unit = {}) = jfxdecorator(find(uiComponent), op)

Expand Down

0 comments on commit ea701a0

Please sign in to comment.