Skip to content

Commit

Permalink
Small Update
Browse files Browse the repository at this point in the history
  • Loading branch information
isHarryh committed Jan 27, 2024
1 parent 82a69a6 commit 628798f
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 26 deletions.
16 changes: 8 additions & 8 deletions assets/UI/Homepage.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<JFXButton fx:id="menuBtn1" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" styleClass="shadowed" text="模型" textAlignment="CENTER">
<JFXButton fx:id="menuBtn1" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" text="模型" textAlignment="CENTER">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
Expand All @@ -42,7 +42,7 @@
</AnchorPane>
</graphic>
</JFXButton>
<JFXButton fx:id="menuBtn2" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" styleClass="shadowed" text="行为" textAlignment="CENTER" GridPane.rowIndex="1">
<JFXButton fx:id="menuBtn2" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" text="行为" textAlignment="CENTER" GridPane.rowIndex="1">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
Expand All @@ -52,7 +52,7 @@
</AnchorPane>
</graphic>
</JFXButton>
<JFXButton fx:id="menuBtn3" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" styleClass="shadowed" text="选项" textAlignment="CENTER" GridPane.rowIndex="2">
<JFXButton fx:id="menuBtn3" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" text="选项" textAlignment="CENTER" GridPane.rowIndex="2">
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
Expand All @@ -77,13 +77,13 @@
<Label layoutX="10.0" layoutY="15.0" styleClass="config-group-title" text="模型选择" />
<ImageView fx:id="selectedModelView" fitHeight="140.0" fitWidth="140.0" layoutX="15.0" layoutY="85.0" pickOnBounds="true" preserveRatio="true" />
<VBox layoutX="15.0" layoutY="200.0" prefHeight="140.0" prefWidth="140.0">
<Label fx:id="selectedModelName" styleClass="Info-primary" text="Name" />
<Label fx:id="selectedModelAppellation" styleClass="Info-secondary" text="Appellation" />
<Label fx:id="selectedModelSkinGroupName" styleClass="Info-secondary" text="SkinGroup" />
<Label fx:id="selectedModelName" styleClass="info-primary" text="Name" />
<Label fx:id="selectedModelAppellation" styleClass="info-secondary" text="Appellation" />
<Label fx:id="selectedModelSkinGroupName" styleClass="info-secondary" text="SkinGroup" />
<Label fx:id="selectedModelType" text="ModelType">
<styleClass>
<String fx:value="Info-tag" />
<String fx:value="Info-tag-theme" />
<String fx:value="info-tag" />
<String fx:value="info-tag-theme" />
</styleClass>
</Label>
</VBox>
Expand Down
23 changes: 12 additions & 11 deletions assets/UI/Main.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

/* Drop shadow for Nodes */
.shadowed {
-fx-effect: dropshadow(gaussian, #00000040, 10, 0.2, 0, 1);
/* Note: dropshadow(type, color, radius, spread, x, y) */
-fx-effect: dropshadow(gaussian, #00000040, 10, 0.1, 0, 0.5);
}

/* Fluorescent strokes for Shapes */
Expand Down Expand Up @@ -125,7 +126,7 @@ JFXButton {
-fx-border-style: solid;
}

.menu-btn-active, .menu-btn-active:hover, .menu-btn-active:focused {
.menu-btn-active {
/* Active */
-fx-text-fill: #FFFFFF;
-fx-background-color: #204880;
Expand All @@ -136,7 +137,7 @@ JFXButton {
-fx-fill: #204880;
}

.menu-btn-active SVGPath, .menu-btn-active:hover SVGPath, .menu-btn-active:focused SVGPath {
.menu-btn-active SVGPath {
/* Hover & Active */
-fx-fill: #FFFFFF;
}
Expand Down Expand Up @@ -247,27 +248,27 @@ JFXButton {
-fx-text-fill: #606060;
}

.Info-primary {
.info-primary {
-fx-font-size: 16px;
-fx-text-fill: #202020;
-fx-font-weight: bold;
-fx-label-padding: 4px 2px 4px 2px;
}

.Info-secondary {
.info-secondary {
-fx-font-size: 12px;
-fx-font-weight: normal;
-fx-text-fill: #808080;
-fx-label-padding: 2px;
}

.Info-tag {
.info-tag {
-fx-font-size: 10px;
-fx-background-radius: 6px;
-fx-label-padding: 2px 4px 2px 4px;
}

.Info-tag-theme {
.info-tag-theme {
-fx-text-fill: #FFFFFF;
-fx-background-color: #4D7999;
}
Expand Down Expand Up @@ -434,11 +435,11 @@ ProgressBar > .bar, ProgressBar:indeterminate > .bar{
-fx-padding: 0;
}

.scroll-pane:focused, .scroll-pane .corner {
-fx-background-insets: 0;
}

.scroll-v {
-fx-hbar-policy: never;
-fx-vbar-policy: as-needed;
}

.scroll-pane:focused, .scroll-pane .corner {
-fx-background-insets: 0;
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ allprojects {
apply plugin: "java-library"
apply plugin: "org.openjfx.javafxplugin"

version = "2.4.0"
version = "2.4.1"
ext {
// App Metadata
appName = "ArkPets"
Expand Down
2 changes: 1 addition & 1 deletion core/src/cn/harryh/arkpets/Const.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
public final class Const {
// App version
public static final Version appVersion = new Version(2, 4, 0);
public static final Version appVersion = new Version(2, 4, 1);

// App name
public static final String appName = "ArkPets";
Expand Down
8 changes: 4 additions & 4 deletions core/src/cn/harryh/arkpets/assets/AssetItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@ public interface PropertyExtractor<T> extends Function<AssetItem, Set<T>> {
@Override
Set<T> apply(AssetItem assetItem);

PropertyExtractor<String> ASSET_ITEM_TYPE = item -> Set.of(item.type);
PropertyExtractor<String> ASSET_ITEM_STYLE = item -> Set.of(item.style);
PropertyExtractor<String> ASSET_ITEM_SKIN_GROUP_NAME = item -> Set.of(item.skinGroupName);
PropertyExtractor<String> ASSET_ITEM_SORT_TAGS = item -> new HashSet<>(item.sortTags.toJavaList(String.class));
PropertyExtractor<String> ASSET_ITEM_TYPE = item -> item.type == null ? Set.of() : Set.of(item.type);
PropertyExtractor<String> ASSET_ITEM_STYLE = item -> item.style == null ? Set.of() : Set.of(item.style);
PropertyExtractor<String> ASSET_ITEM_SKIN_GROUP_NAME = item -> item.skinGroupName == null ? Set.of() : Set.of(item.skinGroupName);
PropertyExtractor<String> ASSET_ITEM_SORT_TAGS = item -> new HashSet<>(item.sortTags.toJavaList(String.class));
}
}
2 changes: 1 addition & 1 deletion docs/scripts/ExePacking.iss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
; Download Inno Setup: https://jrsoftware.org/isdl.php

#define MyAppName "ArkPets"
#define MyAppVersion "2.4.0"
#define MyAppVersion "2.4.1"
#define MyAppPublisher "Harry Huang"
#define MyAppURL "https://arkpets.harryh.cn/"

Expand Down

0 comments on commit 628798f

Please sign in to comment.