Merge remote-tracking branch 'origin/akhoonak(client)' into akhoonak(…

…client)
Advanced-Programming-2021 · Jul 21, 2021 · 7918b05 · 7918b05
2 parents adeec50 + c910130
commit 7918b05
Show file tree

Hide file tree

Showing 6 changed files with 276 additions and 215 deletions.
diff --git a/src/main/java/sample/controller/ShopController.java b/src/main/java/sample/controller/ShopController.java
@@ -82,4 +82,8 @@ public String allowCard(String cardName){
     public String increaseNumberOfCard(String cardName, String amount){
         return sender.getResponseWithToken(PREFIX, "increaseNumberOfCard", cardName,amount);
     }
+
+    public String removeNumberOfCardToShop(String cardName, String amount){
+        return sender.getResponseWithToken(PREFIX, "removeNumberOfCardToShop", cardName,amount);
+    }
 }
diff --git a/src/main/java/sample/view/profileAndSetting/ProfileAndSettingFxml.fxml b/src/main/java/sample/view/profileAndSetting/ProfileAndSettingFxml.fxml
@@ -228,7 +228,7 @@
             </LinearGradient>
          </textFill>
       </Label>
-      <Label layoutX="124.0" layoutY="603.0" prefHeight="32.0" prefWidth="155.0" text="buy your first card" textFill="#c7c7c7">
+      <Label layoutX="124.0" layoutY="603.0" prefHeight="32.0" prefWidth="155.0" text="buy your 1000 card" textFill="#c7c7c7">
          <font>
             <Font name="Garamond" size="14.0" />
          </font>

diff --git a/src/main/java/sample/view/scoreBoard/ScoreBoardFxml.fxml b/src/main/java/sample/view/scoreBoard/ScoreBoardFxml.fxml
@@ -10,6 +10,9 @@
 <?import javafx.scene.shape.Line?>
 <?import javafx.scene.text.Font?>
 
+<?import javafx.scene.paint.LinearGradient?>
+<?import javafx.scene.paint.Stop?>
+<?import javafx.scene.paint.Color?>
 <AnchorPane fx:id="scoreBoardScenePane" prefHeight="720.0" prefWidth="1280.0" stylesheets="@../../../../resources/cssFiles/ScoreBoardViewCss.css" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sample.view.scoreBoard.ScoreboardViewController">
    <children>
       <PieChart layoutX="862.0" layoutY="207.0" prefHeight="400.0" prefWidth="410.0" />
@@ -258,6 +261,43 @@
             <Font size="10.0" />
          </font>
       </JFXTextArea>
+      <JFXButton buttonType="RAISED" layoutX="665.0" layoutY="27.0" onAction="#refresh" prefHeight="26.0" prefWidth="86.0" text="refresh">
+         <textFill>
+            <LinearGradient endX="0.6832060631904893" endY="0.6450381788588662">
+               <stops>
+                  <Stop>
+                     <color>
+                        <Color red="0.13333334028720856" blue="1.0" />
+                     </color>
+                  </Stop>
+                  <Stop offset="1.0">
+                     <color>
+                        <Color red="0.9333333373069763" blue="1.0" />
+                     </color>
+                  </Stop>
+               </stops>
+            </LinearGradient>
+         </textFill>
+         <ripplerFill>
+            <LinearGradient endX="0.7748091748652568" endY="0.7709923595872544">
+               <stops>
+                  <Stop>
+                     <color>
+                        <Color green="0.1666666716337204" blue="1.0" opacity="0.14482758939266205" />
+                     </color>
+                  </Stop>
+                  <Stop offset="1.0">
+                     <color>
+                        <Color red="0.8666666746139526" blue="1.0" opacity="0.1068965420126915" />
+                     </color>
+                  </Stop>
+               </stops>
+            </LinearGradient>
+         </ripplerFill>
+         <font>
+            <Font size="16.0" />
+         </font>
+      </JFXButton>
       <!--      <JFXButton fx:id="backButton" layoutX="21.0" layoutY="26.0" onAction="#backButton" prefHeight="38.0" prefWidth="93.0">-->
       <!--         <graphic>-->
       <!--            <ImageView fitHeight="30.0" fitWidth="39.0" pickOnBounds="true" preserveRatio="true">-->