Reorganise GUI Layout #106
Conversation
…section fill up the remaining space.
Codecov Report
@@ Coverage Diff @@
## master #106 +/- ##
============================================
- Coverage 67.57% 66.02% -1.56%
Complexity 430 430
============================================
Files 77 80 +3
Lines 1462 1498 +36
Branches 154 158 +4
============================================
+ Hits 988 989 +1
- Misses 429 464 +35
Partials 45 45
Continue to review full report at Codecov.
|
| @@ -12,7 +12,7 @@ | |||
| <?import javafx.scene.text.Text?> | |||
| <?import javafx.scene.text.TextFlow?> | |||
|
|
|||
| <HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1"> | |||
| <HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1"> | |||
There was a problem hiding this comment.
Is this change to /11.0.1 automated by your intellij system or you changed it manually?
There was a problem hiding this comment.
oh didn't realise that happened, must have been automatic
| <StackPane VBox.vgrow="NEVER" fx:id="" styleClass="pane-with-border" | ||
| minHeight="295" prefHeight="295"> | ||
| <VBox minHeight="-Infinity" prefHeight="440.0"> | ||
| <StackPane fx:id="deliveryDisplayPlaceholder" minHeight="-Infinity" prefHeight="440.0" |
There was a problem hiding this comment.
| <StackPane fx:id="deliveryDisplayPlaceholder" minHeight="-Infinity" prefHeight="440.0" | |
| <StackPane fx:id="deliveryListPanelPlaceholder" minHeight="-Infinity" prefHeight="440.0" |
| @@ -50,6 +51,9 @@ | |||
| @FXML | |||
| private StackPane resultDisplayPlaceholder; | |||
|
|
|||
| @FXML | |||
| private StackPane deliveryDisplayPlaceholder; | |||
There was a problem hiding this comment.
| private StackPane deliveryDisplayPlaceholder; | |
| private StackPane deliveryItemListPlaceholder; |
Just to keep it more consistent with itemListPanelPlaceholder, what do you think? Just some minor stuff
|
WIP: as discussed in #95
Please tick once done so that we know when to merge 👍 |
|
@Wincenttjoi I've made the changes you requested, plus changed the whole structure of the DeliveryList GUI to match that of the ItemList. (Tonnes of headache cuz debugging GUI is super hard). I also wrote the basic code in MainWindow.java for initialising the values into the DeliveryList on starting the app, with currently an empty ObservableList being initialised temporarily. The Delivery class I wrote is also currently just a stub with no functionality. |
Thanks for changing and doing more than required! LGTM |
| */ | ||
| public class DeliveryCard extends UiPart<Region> { | ||
|
|
||
| private static final String FXML = "ItemListCard.fxml"; |
There was a problem hiding this comment.
Is this meant to be DeliveryListCard.fxml or sth along that line? Or you plan to merge the different cards into same style hence they both refer to ItemListCard?
There was a problem hiding this comment.
thanks for catching that! yes it should be DeliveryListCard
Resolves #95
Result bar moved to the bottom. Delivery section fills up remaining space.
The padding between the quantity and max quantity has been reduced by half as well.