Added hash commit number as info and fixed alignments of duration value texts.

Author: Bytekeeper

build.gradle

@@ -80,7 +80,8 @@ jar {
 processResources {
     filesMatching('version.info') {
         filter(ReplaceTokens, tokens: [
-                "app.version": project.property("version")
+                "app.version": project.property("version"),
+                "app.hash": getCheckedOutGitCommitHash()
         ])
     }
 }
@@ -111,4 +112,22 @@ gradle.taskGraph.whenReady {taskGraph ->
 generateGrammarSource {
     maxHeapSize = "64m"
     arguments += ["-visitor", "-long-messages"]
+}
+
+def getCheckedOutGitCommitHash() {
+    def gitFolder = "$projectDir/.git/"
+    def takeFromHash = 12
+    /*
+     * '.git/HEAD' contains either
+     *      in case of detached head: the currently checked out commit hash
+     *      otherwise: a reference to a file containing the current commit hash
+     */
+    def head = new File(gitFolder + "HEAD").text.split(":") // .git/HEAD
+    def isCommit = head.length == 1 // e5a7c79edabbf7dd39888442df081b1c9d8e88fd
+    // def isRef = head.length > 1     // ref: refs/heads/master
+
+    if(isCommit) return head[0].trim().take(takeFromHash) // e5a7c79edabb
+
+    def refHead = new File(gitFolder + head[1].trim()) // .git/refs/heads/master
+    refHead.text.trim().take takeFromHash
 }

src/main/java/org/stt/BaseModule.java

@@ -122,4 +122,10 @@ static URL provideReleaseURL(@Named("applicationMetadata") Properties applicatio
             throw new UncheckedIOException(e);
         }
     }
+
+    @Provides
+    @Named("commit hash")
+    static String provideCommitHash(@Named("applicationMetadata") Properties applicationMetadata) {
+        return applicationMetadata.getProperty("app.hash");
+    }
 }

src/main/java/org/stt/gui/jfx/InfoController.java

@@ -37,21 +37,26 @@ public class InfoController {
     @FXML
     private Label versionLabel;
     @FXML
+    private Label hashValue;
+    @FXML
     private VBox updateArea;
     private Font fontAwesome;
     private final String appVersion;
+    private String commitHash;
     private final ExecutorService executorService;
 
     @Inject
     public InfoController(ResourceBundle localization,
                           UpdateChecker updateChecker,
                           @Named("glyph") Font fontAwesome,
                           @Named("version") String appVersion,
+                          @Named("commit hash") String commitHash,
                           ExecutorService executorService) {
         this.localization = requireNonNull(localization);
         this.updateChecker = requireNonNull(updateChecker);
         this.fontAwesome = requireNonNull(fontAwesome);
         this.appVersion = requireNonNull(appVersion);
+        this.commitHash = requireNonNull(commitHash);
         this.executorService = requireNonNull(executorService);
         FXMLLoader loader = new FXMLLoader(getClass().getResource(
                 "/org/stt/gui/jfx/InfoPanel.fxml"), localization);
@@ -66,6 +71,7 @@ public InfoController(ResourceBundle localization,
     @FXML
     public void initialize() {
         versionLabel.setText(appVersion);
+        hashValue.setText(commitHash);
     }
 
     public Pane getPanel() {

src/main/java/org/stt/gui/jfx/ReportController.java

@@ -176,6 +176,9 @@ public void initialize() {
                 .bind(STTBindings
                         .formattedDuration(createBindingForRoundedDurationSum(reportListModel)));
 
+        columnForRoundedDuration.setStyle("-fx-alignment: CENTER-RIGHT;");
+        columnForDuration.setStyle("-fx-alignment: CENTER-RIGHT;");
+
         setRoundedDurationColumnCellFactoryToConvertDurationToString();
         setDurationColumnCellFactoryToConvertDurationToString();
         setCommentColumnCellFactory();

src/main/resources/org/stt/gui/Application.properties

@@ -12,6 +12,7 @@ info.updateButton=Check for update
 info.upToDate=This is the most recent version
 info.newerVersion=Version %s of is available!
 info.nameAndVersion=SimpleTimeTracking Version:
+info.hash=Commit Hash:
 
 window.title=SimpleTimeTracking
 show_report=Show _report

src/main/resources/org/stt/gui/jfx/InfoPanel.fxml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
@@ -18,23 +16,34 @@
         </VBox>
     </bottom>
     <center>
-        <VBox alignment="CENTER" BorderPane.alignment="CENTER">
+        <VBox alignment="CENTER" fillWidth="false" BorderPane.alignment="CENTER">
             <children>
                 <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true">
                     <image>
                         <Image url="@../../../../Logo.png"/>
                     </image>
                 </ImageView>
-                <FlowPane alignment="TOP_CENTER" hgap="5.0">
+                <GridPane>
+                    <columnConstraints>
+                        <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="250.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="150.0"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
                     <children>
                         <Label text="%info.nameAndVersion">
                             <padding>
                                 <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
                             </padding>
                         </Label>
-                        <Label fx:id="versionLabel" text="Unknown"/>
+                        <Label fx:id="versionLabel" GridPane.columnIndex="1"/>
+                        <Label text="%info.hash" GridPane.rowIndex="1"/>
+                        <Label fx:id="hashValue" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
                     </children>
-                </FlowPane>
+                </GridPane>
             </children>
         </VBox>
     </center>

src/main/resources/org/stt/gui/jfx/ReportPanel.fxml

@@ -25,7 +25,7 @@
                     <GridPane hgap="10.0">
                         <columnConstraints>
                             <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0"/>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                            <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
                         </columnConstraints>
                         <rowConstraints>
                             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
@@ -50,7 +50,7 @@
                     <GridPane hgap="10.0">
                         <columnConstraints>
                             <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0"/>
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                            <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
                         </columnConstraints>
                         <rowConstraints>
                             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>

src/main/resources/version.info

@@ -1,2 +1,3 @@
 app.version=@app.version@
+app.hash=@app.hash@
 release.url=https://api.github.com/repos/SimpleTimeTracking/StandaloneClient/releases