Skip to content

Commit

Permalink
Its finally out, 1.0!
Browse files Browse the repository at this point in the history
- Fixed the small image key input
- Normalized the letters in the UI
- Some code clean up
  • Loading branch information
DummyBubbleTea committed Oct 20, 2018
1 parent 671351f commit e0818a1
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

group 'com.github.bumbleboss'
version '0.9'
version '1.0'

sourceCompatibility = 1.8

Expand Down
18 changes: 9 additions & 9 deletions src/main/java/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class App extends Application {
private Stage window;
public static final File cache = new File("cache.json");
private static final String appName = "custom-rpc-java";
private static final double appVersion = 0.9;
private static final double appVersion = 1.0;
public static final Logger logger = LoggerFactory.getLogger(appName);
private static final String icon = App.class.getResource("256x256.png").toExternalForm().replace("20%", " ");
private static final String font = App.class.getResource("TipoType_Brother_1816_Medium.otf").toExternalForm().replace("%20", " ");
Expand All @@ -47,7 +47,7 @@ public class App extends Application {
public static final TextField smlImgKey = getTextField(11);
public static final TextField lrgImgTxt = getTextField(13);
public static final TextField smlImgTxt = getTextField(15);
private static final Label enTime = getLabel("ENABLE TIME", 6);
private static final Label enTime = getLabel("Enable time", 6);
public static final CheckBox box = new CheckBox();
public static final ChoiceBox<String> drpDown = new ChoiceBox<>();

Expand Down Expand Up @@ -172,14 +172,14 @@ public void start(Stage primaryStage) {

//ADDING THE LOVELY STUFF
grid.getChildren().addAll(
getLabel("CLIENT ID*", 0), clientText,
getLabel("DETAILS", 2), detailsText,
getLabel("STATE", 4), stateText,
getLabel("Client Id*", 0), clientText,
getLabel("Details", 2), detailsText,
getLabel("State", 4), stateText,
enTime, box,
getLabel("LARGE IMAGE KEY", 8), lrgImgKey,
getLabel("SMALL IMAGE KEY", 10), smlImgKey,
getLabel("LARGE IMAGE TEXT", 12), lrgImgTxt,
getLabel("SMALL IMAGE TEXT", 14), smlImgTxt,
getLabel("Large image key", 8), lrgImgKey,
getLabel("Large image text", 10), lrgImgTxt,
getLabel("Small image key", 12), smlImgKey,
getLabel("Small image text", 14), smlImgTxt,
upd, shut, drpDown
);

Expand Down
1 change: 1 addition & 0 deletions src/main/java/Cache.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import java.io.*;
import java.util.Objects;

@SuppressWarnings({"CanBeFinal", "WeakerAccess"})
public class Cache {

private static final String jsonData = readFile(App.cache.getName());
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/CacheHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import javafx.scene.control.TextField;

@SuppressWarnings("WeakerAccess")
public class CacheHandler {

private static final File cache = App.cache;
Expand Down Expand Up @@ -37,7 +38,7 @@ public static void setSettings(int i) {
timestamp.setSelected(app.getBoolean("timestamp"));
lrgKey.setText(app.getString("lrgKey"));
lrgTxt.setText(app.getString("lrgTxt"));
smlKey.setText(app.getString("lrgTxt"));
smlKey.setText(app.getString("smlKey"));
smlTxt.setText(app.getString("smlTxt"));
} catch (JSONException ex) {
Windows.display("An error has occured", ex.getMessage()+ "\nPlease check if there's any wrong inputs with the cache file and try again", true, true);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/Windows.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import javafx.stage.Modality;
import javafx.stage.Stage;

@SuppressWarnings("WeakerAccess")
public class Windows {

private static boolean answer;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

/*LABEL*/
.label {
-fx-text-fill: #FFFFFF;
-fx-text-fill: #99AAB5;
-fx-font-size: 18px;
}

Expand Down

0 comments on commit e0818a1

Please sign in to comment.