diff --git a/build.gradle b/build.gradle index 8ae8dd8b..c9e9666c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,14 @@ plugins { id 'application' id 'org.openjfx.javafxplugin' version '0.0.8' + id 'org.kordamp.gradle.jdeps' version '0.9.0' + id 'org.beryx.jlink' version '2.17.4' } -group 'com.craigraw' +group 'com.sparrowwallet' version '1.0-SNAPSHOT' -sourceCompatibility = 1.8 +sourceCompatibility = 1.9 repositories { mavenCentral() @@ -17,11 +19,49 @@ javafx { modules = [ 'javafx.controls', 'javafx.fxml' ] } +java { + disableAutoTargetJvm() +} + dependencies { - implementation project(':drongo') - compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.4' - compile group: 'no.tornado', name: 'tornadofx-controls', version: '1.0.4' - testCompile group: 'junit', name: 'junit', version: '4.12' + implementation(project(':drongo')) { + exclude group: 'org.hamcrest' + exclude group: 'junit' + } + implementation('org.fxmisc.richtext:richtextfx:0.10.4') + implementation('no.tornado:tornadofx-controls:1.0.4') + implementation('org.controlsfx:controlsfx:11.0.1' ) { + exclude group: 'org.openjfx', module: 'javafx-base' + exclude group: 'org.openjfx', module: 'javafx-graphics' + exclude group: 'org.openjfx', module: 'javafx-controls' + exclude group: 'org.openjfx', module: 'javafx-swing' + exclude group: 'org.openjfx', module: 'javafx-fxml' + exclude group: 'org.openjfx', module: 'javafx-web' + exclude group: 'org.openjfx', module: 'javafx-media' + } + testImplementation('junit:junit:4.12') } -mainClassName = 'com.craigraw.sparrow.MainApp' \ No newline at end of file +mainClassName = 'com.sparrowwallet.sparrow.MainApp' + + + +jlink { + mergedModule { + requires 'java.management'; + requires 'javafx.graphics'; + requires 'java.naming'; + requires 'javafx.controls'; + requires 'java.logging'; + requires 'java.sql'; + requires 'java.xml'; + requires 'javafx.base'; + requires 'jdk.unsupported'; + } + + options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages', '--ignore-signing-information'] + launcher { + name = 'sparrow' + } + addExtraDependencies("javafx") +} diff --git a/drongo b/drongo index 314ee075..e0a4b29e 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 314ee075c20c9a23d09e9dd84ee2b6eb3588a129 +Subproject commit e0a4b29ed4c21dc8f3fcd7596300808a69981d8e diff --git a/src/main/java/com/craigraw/sparrow/TransactionListener.java b/src/main/java/com/craigraw/sparrow/TransactionListener.java deleted file mode 100644 index 486bb545..00000000 --- a/src/main/java/com/craigraw/sparrow/TransactionListener.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.craigraw.sparrow; - -import com.craigraw.drongo.protocol.Transaction; - -public interface TransactionListener { - void updated(Transaction transaction); -} diff --git a/src/main/java/com/craigraw/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java similarity index 97% rename from src/main/java/com/craigraw/sparrow/AppController.java rename to src/main/java/com/sparrowwallet/sparrow/AppController.java index 88ac0906..13f0a6ed 100644 --- a/src/main/java/com/craigraw/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -1,9 +1,9 @@ -package com.craigraw.sparrow; +package com.sparrowwallet.sparrow; -import com.craigraw.drongo.Utils; -import com.craigraw.drongo.protocol.Transaction; -import com.craigraw.drongo.psbt.PSBT; -import com.craigraw.drongo.psbt.PSBTParseException; +import com.sparrowwallet.drongo.Utils; +import com.sparrowwallet.drongo.protocol.Transaction; +import com.sparrowwallet.drongo.psbt.PSBT; +import com.sparrowwallet.drongo.psbt.PSBTParseException; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; @@ -13,7 +13,6 @@ import javafx.scene.control.Tab; import javafx.scene.control.TabPane; import javafx.stage.FileChooser; import javafx.stage.Stage; -import org.bouncycastle.util.encoders.Hex; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/com/craigraw/sparrow/EventManager.java b/src/main/java/com/sparrowwallet/sparrow/EventManager.java similarity index 88% rename from src/main/java/com/craigraw/sparrow/EventManager.java rename to src/main/java/com/sparrowwallet/sparrow/EventManager.java index d8764f77..398f1fa2 100644 --- a/src/main/java/com/craigraw/sparrow/EventManager.java +++ b/src/main/java/com/sparrowwallet/sparrow/EventManager.java @@ -1,6 +1,6 @@ -package com.craigraw.sparrow; +package com.sparrowwallet.sparrow; -import com.craigraw.drongo.protocol.Transaction; +import com.sparrowwallet.drongo.protocol.Transaction; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/craigraw/sparrow/MainApp.java b/src/main/java/com/sparrowwallet/sparrow/MainApp.java similarity index 94% rename from src/main/java/com/craigraw/sparrow/MainApp.java rename to src/main/java/com/sparrowwallet/sparrow/MainApp.java index bc56910c..ea7a1d92 100644 --- a/src/main/java/com/craigraw/sparrow/MainApp.java +++ b/src/main/java/com/sparrowwallet/sparrow/MainApp.java @@ -1,4 +1,4 @@ -package com.craigraw.sparrow; +package com.sparrowwallet.sparrow; import javafx.application.Application; import javafx.fxml.FXMLLoader; diff --git a/src/main/java/com/craigraw/sparrow/TransactionController.java b/src/main/java/com/sparrowwallet/sparrow/TransactionController.java similarity index 96% rename from src/main/java/com/craigraw/sparrow/TransactionController.java rename to src/main/java/com/sparrowwallet/sparrow/TransactionController.java index 07fd9642..0a4e73c6 100644 --- a/src/main/java/com/craigraw/sparrow/TransactionController.java +++ b/src/main/java/com/sparrowwallet/sparrow/TransactionController.java @@ -1,8 +1,9 @@ -package com.craigraw.sparrow; +package com.sparrowwallet.sparrow; -import com.craigraw.drongo.protocol.*; -import com.craigraw.drongo.psbt.PSBT; -import com.craigraw.sparrow.form.*; +import com.sparrowwallet.drongo.Utils; +import com.sparrowwallet.drongo.protocol.*; +import com.sparrowwallet.drongo.psbt.PSBT; +import com.sparrowwallet.sparrow.form.*; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.Node; @@ -12,7 +13,6 @@ import javafx.scene.control.TreeView; import javafx.scene.control.cell.TextFieldTreeCell; import javafx.scene.layout.Pane; import javafx.util.StringConverter; -import org.bouncycastle.util.encoders.Hex; import org.fxmisc.richtext.CodeArea; import java.io.ByteArrayOutputStream; @@ -110,7 +110,7 @@ public class TransactionController implements Initializable, TransactionListener try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); transaction.bitcoinSerializeToStream(baos); - hex = Hex.toHexString(baos.toByteArray()); + hex = Utils.bytesToHex(baos.toByteArray()); } catch(IOException e) { throw new IllegalStateException("Can't happen"); } diff --git a/src/main/java/com/sparrowwallet/sparrow/TransactionListener.java b/src/main/java/com/sparrowwallet/sparrow/TransactionListener.java new file mode 100644 index 00000000..df27ee3d --- /dev/null +++ b/src/main/java/com/sparrowwallet/sparrow/TransactionListener.java @@ -0,0 +1,7 @@ +package com.sparrowwallet.sparrow; + +import com.sparrowwallet.drongo.protocol.Transaction; + +public interface TransactionListener { + void updated(Transaction transaction); +} diff --git a/src/main/java/com/craigraw/sparrow/form/Form.java b/src/main/java/com/sparrowwallet/sparrow/form/Form.java similarity index 78% rename from src/main/java/com/craigraw/sparrow/form/Form.java rename to src/main/java/com/sparrowwallet/sparrow/form/Form.java index 0d1f9705..00d07544 100644 --- a/src/main/java/com/craigraw/sparrow/form/Form.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/Form.java @@ -1,4 +1,4 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; import javafx.scene.Node; diff --git a/src/main/java/com/craigraw/sparrow/form/FormController.java b/src/main/java/com/sparrowwallet/sparrow/form/FormController.java similarity index 87% rename from src/main/java/com/craigraw/sparrow/form/FormController.java rename to src/main/java/com/sparrowwallet/sparrow/form/FormController.java index a8d8f043..fe6a9c69 100644 --- a/src/main/java/com/craigraw/sparrow/form/FormController.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/FormController.java @@ -1,8 +1,8 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.address.Address; -import com.craigraw.drongo.protocol.TransactionOutput; -import com.craigraw.drongo.protocol.NonStandardScriptException; +import com.sparrowwallet.drongo.address.Address; +import com.sparrowwallet.drongo.protocol.TransactionOutput; +import com.sparrowwallet.drongo.protocol.NonStandardScriptException; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.scene.chart.PieChart; diff --git a/src/main/java/com/craigraw/sparrow/form/HeadersController.java b/src/main/java/com/sparrowwallet/sparrow/form/HeadersController.java similarity index 76% rename from src/main/java/com/craigraw/sparrow/form/HeadersController.java rename to src/main/java/com/sparrowwallet/sparrow/form/HeadersController.java index b3b9c967..d95e9a1d 100644 --- a/src/main/java/com/craigraw/sparrow/form/HeadersController.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/HeadersController.java @@ -1,8 +1,8 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.protocol.Transaction; -import com.craigraw.sparrow.EventManager; -import com.craigraw.sparrow.TransactionListener; +import com.sparrowwallet.drongo.protocol.Transaction; +import com.sparrowwallet.sparrow.EventManager; +import com.sparrowwallet.sparrow.TransactionListener; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; @@ -29,7 +29,10 @@ public class HeadersController implements Initializable, TransactionListener { private TextField segwit; @FXML - private ToggleGroup locktimeType; + private ToggleGroup locktimeToggleGroup; + + @FXML + private ToggleButton locktimeNoneType; @FXML private ToggleButton locktimeBlockType; @@ -94,13 +97,22 @@ public class HeadersController implements Initializable, TransactionListener { } segwit.setText(type); - locktimeType.selectedToggleProperty().addListener((ov, old_toggle, new_toggle) -> { - if(locktimeType.getSelectedToggle() != null) { - String selection = locktimeType.getSelectedToggle().getUserData().toString(); - if(selection.equals("block")) { + locktimeToggleGroup.selectedToggleProperty().addListener((ov, old_toggle, new_toggle) -> { + if(locktimeToggleGroup.getSelectedToggle() != null) { + String selection = locktimeToggleGroup.getSelectedToggle().getUserData().toString(); + if(selection.equals("none")) { + locktimeFieldset.getChildren().remove(locktimeDateField); + locktimeFieldset.getChildren().remove(locktimeBlockField); + locktimeFieldset.getChildren().add(locktimeBlockField); + locktimeBlock.setDisable(true); + locktimeBlock.getValueFactory().setValue(0); + tx.setLockTime(0); + EventManager.get().notify(tx); + } else if(selection.equals("block")) { locktimeFieldset.getChildren().remove(locktimeDateField); locktimeFieldset.getChildren().remove(locktimeBlockField); locktimeFieldset.getChildren().add(locktimeBlockField); + locktimeBlock.setDisable(false); Integer block = locktimeBlock.getValue(); if(block != null) { tx.setLockTime(block); @@ -121,12 +133,17 @@ public class HeadersController implements Initializable, TransactionListener { if(tx.getLockTime() < MAX_BLOCK_LOCKTIME) { locktimeBlock.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, (int)MAX_BLOCK_LOCKTIME-1, (int)tx.getLockTime())); - locktimeType.selectToggle(locktimeBlockType); + if(tx.getLockTime() == 0) { + locktimeToggleGroup.selectToggle(locktimeNoneType); + locktimeBlock.setDisable(true); + } else { + locktimeToggleGroup.selectToggle(locktimeBlockType); + } } else { locktimeBlock.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, (int)MAX_BLOCK_LOCKTIME-1)); LocalDateTime date = Instant.ofEpochSecond(tx.getLockTime()).atZone(ZoneId.systemDefault()).toLocalDateTime(); locktimeDate.setDateTimeValue(date); - locktimeType.selectToggle(locktimeDateType); + locktimeToggleGroup.selectToggle(locktimeDateType); } locktimeBlock.valueProperty().addListener((obs, oldValue, newValue) -> { diff --git a/src/main/java/com/craigraw/sparrow/form/HeadersForm.java b/src/main/java/com/sparrowwallet/sparrow/form/HeadersForm.java similarity index 86% rename from src/main/java/com/craigraw/sparrow/form/HeadersForm.java rename to src/main/java/com/sparrowwallet/sparrow/form/HeadersForm.java index 37cbad4e..c50d3253 100644 --- a/src/main/java/com/craigraw/sparrow/form/HeadersForm.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/HeadersForm.java @@ -1,7 +1,7 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.protocol.Transaction; -import com.craigraw.drongo.psbt.PSBT; +import com.sparrowwallet.drongo.protocol.Transaction; +import com.sparrowwallet.drongo.psbt.PSBT; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/src/main/java/com/craigraw/sparrow/form/InputController.java b/src/main/java/com/sparrowwallet/sparrow/form/InputController.java similarity index 89% rename from src/main/java/com/craigraw/sparrow/form/InputController.java rename to src/main/java/com/sparrowwallet/sparrow/form/InputController.java index 8f9c1f2a..5c9b274f 100644 --- a/src/main/java/com/craigraw/sparrow/form/InputController.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/InputController.java @@ -1,4 +1,4 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; import javafx.fxml.Initializable; diff --git a/src/main/java/com/craigraw/sparrow/form/InputForm.java b/src/main/java/com/sparrowwallet/sparrow/form/InputForm.java similarity index 87% rename from src/main/java/com/craigraw/sparrow/form/InputForm.java rename to src/main/java/com/sparrowwallet/sparrow/form/InputForm.java index eb9a2f27..bb826064 100644 --- a/src/main/java/com/craigraw/sparrow/form/InputForm.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/InputForm.java @@ -1,6 +1,6 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.protocol.TransactionInput; +import com.sparrowwallet.drongo.protocol.TransactionInput; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/src/main/java/com/craigraw/sparrow/form/InputsController.java b/src/main/java/com/sparrowwallet/sparrow/form/InputsController.java similarity index 94% rename from src/main/java/com/craigraw/sparrow/form/InputsController.java rename to src/main/java/com/sparrowwallet/sparrow/form/InputsController.java index 7bebbf4b..3f006403 100644 --- a/src/main/java/com/craigraw/sparrow/form/InputsController.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/InputsController.java @@ -1,7 +1,7 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.protocol.*; -import com.craigraw.drongo.psbt.PSBTInput; +import com.sparrowwallet.drongo.protocol.*; +import com.sparrowwallet.drongo.psbt.PSBTInput; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.chart.PieChart; diff --git a/src/main/java/com/craigraw/sparrow/form/InputsForm.java b/src/main/java/com/sparrowwallet/sparrow/form/InputsForm.java similarity index 85% rename from src/main/java/com/craigraw/sparrow/form/InputsForm.java rename to src/main/java/com/sparrowwallet/sparrow/form/InputsForm.java index e880902f..fbfae8d7 100644 --- a/src/main/java/com/craigraw/sparrow/form/InputsForm.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/InputsForm.java @@ -1,7 +1,7 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.protocol.Transaction; -import com.craigraw.drongo.psbt.PSBT; +import com.sparrowwallet.drongo.protocol.Transaction; +import com.sparrowwallet.drongo.psbt.PSBT; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/src/main/java/com/craigraw/sparrow/form/OutputController.java b/src/main/java/com/sparrowwallet/sparrow/form/OutputController.java similarity index 89% rename from src/main/java/com/craigraw/sparrow/form/OutputController.java rename to src/main/java/com/sparrowwallet/sparrow/form/OutputController.java index 177e4165..a57984d0 100644 --- a/src/main/java/com/craigraw/sparrow/form/OutputController.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/OutputController.java @@ -1,4 +1,4 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; import javafx.fxml.Initializable; diff --git a/src/main/java/com/craigraw/sparrow/form/OutputForm.java b/src/main/java/com/sparrowwallet/sparrow/form/OutputForm.java similarity index 87% rename from src/main/java/com/craigraw/sparrow/form/OutputForm.java rename to src/main/java/com/sparrowwallet/sparrow/form/OutputForm.java index cd367eac..3c9089fd 100644 --- a/src/main/java/com/craigraw/sparrow/form/OutputForm.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/OutputForm.java @@ -1,6 +1,6 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.protocol.TransactionOutput; +import com.sparrowwallet.drongo.protocol.TransactionOutput; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/src/main/java/com/craigraw/sparrow/form/OutputsController.java b/src/main/java/com/sparrowwallet/sparrow/form/OutputsController.java similarity index 87% rename from src/main/java/com/craigraw/sparrow/form/OutputsController.java rename to src/main/java/com/sparrowwallet/sparrow/form/OutputsController.java index 45a461f9..3148b300 100644 --- a/src/main/java/com/craigraw/sparrow/form/OutputsController.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/OutputsController.java @@ -1,7 +1,7 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.protocol.Transaction; -import com.craigraw.drongo.protocol.TransactionOutput; +import com.sparrowwallet.drongo.protocol.Transaction; +import com.sparrowwallet.drongo.protocol.TransactionOutput; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.chart.PieChart; diff --git a/src/main/java/com/craigraw/sparrow/form/OutputsForm.java b/src/main/java/com/sparrowwallet/sparrow/form/OutputsForm.java similarity index 88% rename from src/main/java/com/craigraw/sparrow/form/OutputsForm.java rename to src/main/java/com/sparrowwallet/sparrow/form/OutputsForm.java index 53dc6560..c51b8722 100644 --- a/src/main/java/com/craigraw/sparrow/form/OutputsForm.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/OutputsForm.java @@ -1,6 +1,6 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.protocol.Transaction; +import com.sparrowwallet.drongo.protocol.Transaction; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/src/main/java/com/craigraw/sparrow/form/PartialInputController.java b/src/main/java/com/sparrowwallet/sparrow/form/PartialInputController.java similarity index 90% rename from src/main/java/com/craigraw/sparrow/form/PartialInputController.java rename to src/main/java/com/sparrowwallet/sparrow/form/PartialInputController.java index f04eb32a..1f33ac51 100644 --- a/src/main/java/com/craigraw/sparrow/form/PartialInputController.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/PartialInputController.java @@ -1,4 +1,4 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; import javafx.fxml.Initializable; diff --git a/src/main/java/com/craigraw/sparrow/form/PartialInputForm.java b/src/main/java/com/sparrowwallet/sparrow/form/PartialInputForm.java similarity index 86% rename from src/main/java/com/craigraw/sparrow/form/PartialInputForm.java rename to src/main/java/com/sparrowwallet/sparrow/form/PartialInputForm.java index b3ff03f8..bcbaccd4 100644 --- a/src/main/java/com/craigraw/sparrow/form/PartialInputForm.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/PartialInputForm.java @@ -1,6 +1,6 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.psbt.PSBTInput; +import com.sparrowwallet.drongo.psbt.PSBTInput; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/src/main/java/com/craigraw/sparrow/form/PartialOutputController.java b/src/main/java/com/sparrowwallet/sparrow/form/PartialOutputController.java similarity index 90% rename from src/main/java/com/craigraw/sparrow/form/PartialOutputController.java rename to src/main/java/com/sparrowwallet/sparrow/form/PartialOutputController.java index 8410e550..c0468cac 100644 --- a/src/main/java/com/craigraw/sparrow/form/PartialOutputController.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/PartialOutputController.java @@ -1,4 +1,4 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; import javafx.fxml.Initializable; diff --git a/src/main/java/com/craigraw/sparrow/form/PartialOutputForm.java b/src/main/java/com/sparrowwallet/sparrow/form/PartialOutputForm.java similarity index 86% rename from src/main/java/com/craigraw/sparrow/form/PartialOutputForm.java rename to src/main/java/com/sparrowwallet/sparrow/form/PartialOutputForm.java index 6d013915..b32778cf 100644 --- a/src/main/java/com/craigraw/sparrow/form/PartialOutputForm.java +++ b/src/main/java/com/sparrowwallet/sparrow/form/PartialOutputForm.java @@ -1,6 +1,6 @@ -package com.craigraw.sparrow.form; +package com.sparrowwallet.sparrow.form; -import com.craigraw.drongo.psbt.PSBTOutput; +import com.sparrowwallet.drongo.psbt.PSBTOutput; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 00000000..e1b87860 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,8 @@ +open module com.sparrowwallet.sparrow { + requires java.desktop; + requires javafx.controls; + requires javafx.fxml; + requires org.controlsfx.controls; + requires org.fxmisc.richtext; + requires com.sparrowwallet.drongo; +} \ No newline at end of file diff --git a/src/main/resources/com/craigraw/sparrow/app.css b/src/main/resources/com/sparrowwallet/sparrow/app.css similarity index 100% rename from src/main/resources/com/craigraw/sparrow/app.css rename to src/main/resources/com/sparrowwallet/sparrow/app.css diff --git a/src/main/resources/com/craigraw/sparrow/app.fxml b/src/main/resources/com/sparrowwallet/sparrow/app.fxml similarity index 88% rename from src/main/resources/com/craigraw/sparrow/app.fxml rename to src/main/resources/com/sparrowwallet/sparrow/app.fxml index 506ac15f..a66800e8 100644 --- a/src/main/resources/com/craigraw/sparrow/app.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/app.fxml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/com/craigraw/sparrow/form/headers.css b/src/main/resources/com/sparrowwallet/sparrow/form/headers.css similarity index 100% rename from src/main/resources/com/craigraw/sparrow/form/headers.css rename to src/main/resources/com/sparrowwallet/sparrow/form/headers.css diff --git a/src/main/resources/com/craigraw/sparrow/form/headers.fxml b/src/main/resources/com/sparrowwallet/sparrow/form/headers.fxml similarity index 86% rename from src/main/resources/com/craigraw/sparrow/form/headers.fxml rename to src/main/resources/com/sparrowwallet/sparrow/form/headers.fxml index ff761367..eab6c27d 100644 --- a/src/main/resources/com/craigraw/sparrow/form/headers.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/form/headers.fxml @@ -12,7 +12,8 @@ - + + @@ -51,16 +52,16 @@
- - - - - - - - - - + + + + + + + + + + diff --git a/src/main/resources/com/craigraw/sparrow/form/input.fxml b/src/main/resources/com/sparrowwallet/sparrow/form/input.fxml similarity index 81% rename from src/main/resources/com/craigraw/sparrow/form/input.fxml rename to src/main/resources/com/sparrowwallet/sparrow/form/input.fxml index 95474a90..0e7317a1 100644 --- a/src/main/resources/com/craigraw/sparrow/form/input.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/form/input.fxml @@ -8,7 +8,7 @@ diff --git a/src/main/resources/com/craigraw/sparrow/form/inputs.css b/src/main/resources/com/sparrowwallet/sparrow/form/inputs.css similarity index 100% rename from src/main/resources/com/craigraw/sparrow/form/inputs.css rename to src/main/resources/com/sparrowwallet/sparrow/form/inputs.css diff --git a/src/main/resources/com/craigraw/sparrow/form/inputs.fxml b/src/main/resources/com/sparrowwallet/sparrow/form/inputs.fxml similarity index 95% rename from src/main/resources/com/craigraw/sparrow/form/inputs.fxml rename to src/main/resources/com/sparrowwallet/sparrow/form/inputs.fxml index 068cc1a7..9bc06afd 100644 --- a/src/main/resources/com/craigraw/sparrow/form/inputs.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/form/inputs.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/resources/com/craigraw/sparrow/form/output.fxml b/src/main/resources/com/sparrowwallet/sparrow/form/output.fxml similarity index 81% rename from src/main/resources/com/craigraw/sparrow/form/output.fxml rename to src/main/resources/com/sparrowwallet/sparrow/form/output.fxml index bc32f4be..16e227fd 100644 --- a/src/main/resources/com/craigraw/sparrow/form/output.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/form/output.fxml @@ -8,7 +8,7 @@ diff --git a/src/main/resources/com/craigraw/sparrow/form/outputs.css b/src/main/resources/com/sparrowwallet/sparrow/form/outputs.css similarity index 100% rename from src/main/resources/com/craigraw/sparrow/form/outputs.css rename to src/main/resources/com/sparrowwallet/sparrow/form/outputs.css diff --git a/src/main/resources/com/craigraw/sparrow/form/outputs.fxml b/src/main/resources/com/sparrowwallet/sparrow/form/outputs.fxml similarity index 94% rename from src/main/resources/com/craigraw/sparrow/form/outputs.fxml rename to src/main/resources/com/sparrowwallet/sparrow/form/outputs.fxml index 006e3671..d4eff085 100644 --- a/src/main/resources/com/craigraw/sparrow/form/outputs.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/form/outputs.fxml @@ -6,7 +6,7 @@ - + diff --git a/src/main/resources/com/craigraw/sparrow/form/partialinput.fxml b/src/main/resources/com/sparrowwallet/sparrow/form/partialinput.fxml similarity index 80% rename from src/main/resources/com/craigraw/sparrow/form/partialinput.fxml rename to src/main/resources/com/sparrowwallet/sparrow/form/partialinput.fxml index 49e122c9..4fef2dee 100644 --- a/src/main/resources/com/craigraw/sparrow/form/partialinput.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/form/partialinput.fxml @@ -8,7 +8,7 @@ diff --git a/src/main/resources/com/craigraw/sparrow/form/partialoutput.fxml b/src/main/resources/com/sparrowwallet/sparrow/form/partialoutput.fxml similarity index 80% rename from src/main/resources/com/craigraw/sparrow/form/partialoutput.fxml rename to src/main/resources/com/sparrowwallet/sparrow/form/partialoutput.fxml index e9fe2753..003a0543 100644 --- a/src/main/resources/com/craigraw/sparrow/form/partialoutput.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/form/partialoutput.fxml @@ -8,7 +8,7 @@ diff --git a/src/main/resources/com/craigraw/sparrow/general.css b/src/main/resources/com/sparrowwallet/sparrow/general.css similarity index 100% rename from src/main/resources/com/craigraw/sparrow/general.css rename to src/main/resources/com/sparrowwallet/sparrow/general.css diff --git a/src/main/resources/com/craigraw/sparrow/transaction.css b/src/main/resources/com/sparrowwallet/sparrow/transaction.css similarity index 100% rename from src/main/resources/com/craigraw/sparrow/transaction.css rename to src/main/resources/com/sparrowwallet/sparrow/transaction.css diff --git a/src/main/resources/com/craigraw/sparrow/transaction.fxml b/src/main/resources/com/sparrowwallet/sparrow/transaction.fxml similarity index 88% rename from src/main/resources/com/craigraw/sparrow/transaction.fxml rename to src/main/resources/com/sparrowwallet/sparrow/transaction.fxml index e05b6e3e..adf294bb 100644 --- a/src/main/resources/com/craigraw/sparrow/transaction.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/transaction.fxml @@ -5,7 +5,7 @@ - +