Westrock

src/advclient/FancyProgressBar.java

@@ -60,7 +60,7 @@ protected void paintDeterminate(Graphics g, JComponent c) {
 
         width = (int) Math.round(width * dProgress);
 
-        g2d.setColor(AppUI.getColor6());
+        g2d.setColor(AppUI.getColor2());
         RoundRectangle2D fill = new RoundRectangle2D.Double(0, 0, width, height - 1, 20, 20);
 
         g2d.fill(fill);

src/advclient/ImageJPanel.java

@@ -95,9 +95,9 @@ public void paintComponent(Graphics g) {
 
     //Graphics2D g2d = (Graphics2D) g;
     //g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    //g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f));
+    //g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.1f));
     //g2d.setColor(Color.yellow);
         //g2d.fillOval(point.x, point.y, 120, 60);
-    g.drawImage(backgroundImage, 0, 0, this); 
+    g.drawImage(backgroundImage, 32, 306, this); 
   }
 }

src/advclient/MyButton.java

@@ -9,6 +9,7 @@
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
+import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemListener;
 import javax.swing.JButton;
@@ -25,9 +26,24 @@ public class MyButton {
 
     JPanel core;
     JButton button;
+    Color color;
+    boolean lastActionAdded;
 
     public MyButton(String text) {
+        this.color = AppUI.getColor2();
         core = makeUI(text);
+        this.lastActionAdded = false;
+        if (!text.toLowerCase().equals("continue") && !text.toLowerCase().equals("confirm"))
+            this.lastActionAdded = true;
+
+    }
+
+    public MyButton(String text, Color color) {
+        this.color = color;
+        core = makeUI(text);
+        this.lastActionAdded = false;
+        if (!text.toLowerCase().equals("continue") && !text.toLowerCase().equals("confirm"))
+            this.lastActionAdded = true;
     }
 
     public JPanel getButton() {
@@ -36,6 +52,14 @@ public JPanel getButton() {
 
     public void addListener(ActionListener a) {
         button.addActionListener(a);
+        if (!this.lastActionAdded) {
+            this.lastActionAdded = true;
+            addListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    disable();
+                }
+            });
+        }
     }
 
     public void disable() {
@@ -49,7 +73,7 @@ public void disable() {
     public void enable() {
         button.setEnabled(true);
         RoundedBorder rb = (RoundedBorder) button.getBorder();
-        rb.setColor(AppUI.getColor0());
+        rb.setColor(this.color);
         button.repaint();
         button.revalidate();
     }
@@ -73,11 +97,11 @@ public boolean doWork(Graphics g, JComponent c) {
             }
         };
 
-        AppUI.roundCorners(button, AppUI.getColor0(), 18, cb);
+        AppUI.roundCorners(button, this.color, 48, cb);
         AppUI.noOpaque(button);
         button.setContentAreaFilled(false);
-        AppUI.setSize(button, 224, 50);
-        AppUI.setBoldFont(button, 20);
+        AppUI.setSize(button, 190, 48);
+        AppUI.setFont(button, 18);
         AppUI.setHandCursor(button);
 
         JPanel p = new JPanel();

src/advclient/MyCheckBox.java

@@ -51,6 +51,11 @@ public boolean isChecked() {
         return cb.isSelected();
     }
 
+    public void setFont(int size, Color color) {
+        AppUI.setFont(txt, size);
+        AppUI.setColor(txt, color);
+    }
+
     public void setBoldFont() {
         AppUI.setBoldFont(txt, 18);
     }

src/advclient/MyCheckBoxToggle.java

@@ -0,0 +1,95 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package advclient;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.RenderingHints;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import javax.imageio.ImageIO;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/**
+ *
+ * @author Alexander
+ */
+public class MyCheckBoxToggle {
+
+    Icon imgUnchecked, imgChecked;
+    boolean isChecked;
+
+    JPanel core;
+    JCheckBox cb;
+
+    public MyCheckBoxToggle() {
+        core = makeUI();
+    }
+
+    public JPanel getCheckBox() {
+        return core;
+    }
+
+    public void addListener(ItemListener i) {
+        cb.addItemListener(i);
+    }
+
+    public boolean isChecked() {
+        return cb.isSelected();
+    }
+
+    public void setSelected(boolean isSelected) {
+        cb.setSelected(isSelected);
+    }
+
+    public JPanel makeUI() {
+        cb = new JCheckBox();
+
+        try {
+            Image img;
+
+            img = ImageIO.read(getClass().getClassLoader().getResource("resources/toggleno.png"));
+            imgUnchecked = new ImageIcon(img);
+
+            img = ImageIO.read(getClass().getClassLoader().getResource("resources/toggleyes.png"));
+            imgChecked = new ImageIcon(img);
+        } catch (Exception ex) {
+
+        }
+
+        AppUI.noOpaque(cb);
+        cb.addItemListener(new ItemListener() {
+            public void itemStateChanged(ItemEvent e) {
+                Icon img;
+
+                img = (e.getStateChange() != ItemEvent.SELECTED) ? imgUnchecked : imgChecked;                     
+                cb.setIcon(img);
+            }
+        });
+
+        cb.setIcon(imgUnchecked);
+
+        JPanel p = new JPanel();
+        AppUI.setBoxLayout(p, false);
+        AppUI.noOpaque(p);
+        AppUI.setHandCursor(p);
+
+        p.add(cb);
+
+        return p;
+    }      
+}
+
+

src/advclient/MyTextField.java

@@ -80,11 +80,13 @@ public void setData(String text) {
 
     public JPanel makeUI(String placeholder) {
         tf = new RoundedTextField(placeholder);
+        tf.setCaretColor(Color.WHITE);
 
         AppUI.noOpaque(tf);
         AppUI.setSize(tf, (int) AppUI.getBoxWidth(), (int) AppUI.getBoxHeight());
-        AppUI.setBackground(tf, AppUI.getColor4());
+        AppUI.setBackground(tf, AppUI.getColor8());
         AppUI.setFont(tf, 18);
+        AppUI.setColor(tf, AppUI.getColor5());
         AppUI.setMargin(tf, 10);
         tf.setLayout(new BorderLayout());
 
@@ -107,9 +109,10 @@ public void focusLost(FocusEvent e) {
         if (isPassword) {
             tf.hide();        
             try {
-                Image img;
+                BufferedImage img;
 
-                img = ImageIO.read(getClass().getClassLoader().getResource("resources/eye.png"));       
+                img = ImageIO.read(getClass().getClassLoader().getResource("resources/eye.png"));   
+                AppUI.invertImage(img);
                 imgEye = new ImageIcon(img);
             } catch (Exception ex) {
 
@@ -128,9 +131,10 @@ public void mouseReleased(MouseEvent e) {
             AppUI.setHandCursor(label);
         } else if (isFilepicker) {
             try {
-                Image img;
+                BufferedImage img;
 
-                img = ImageIO.read(getClass().getClassLoader().getResource("resources/lg0.png"));       
+                img = ImageIO.read(getClass().getClassLoader().getResource("resources/lg0.png"));   
+                AppUI.invertImage(img);
                 imgEye = new ImageIcon(img);
             } catch (Exception ex) {
 

src/advclient/ProgramState.java

@@ -57,6 +57,21 @@ public class ProgramState {
     final public static int SCREEN_MAKING_CHANGE = 39;
     final public static int SCREEN_SETTING_DNS_RECORD = 40;
     final public static int SCREEN_DOING_BACKUP = 41;
+    final public static int SCREEN_EXPORTING = 42;
+    final public static int SCREEN_CHECKING_SKYID = 43;
+    final public static int SCREEN_SETTINGS = 44;
+    final public static int SCREEN_SETTINGS_SAVED = 45;
+    final public static int SCREEN_WARN_FRACKED_TO_SEND = 46;
+    final public static int SCREEN_DEPOSIT_LEFTOVER = 47;
+    final public static int SCREEN_SHOW_SENT_COINS = 48;
+    final public static int SCREEN_SHOW_BACKUP_KEYS = 49;
+    final public static int SCREEN_SHOW_BACKUP_KEYS_DONE = 50;
+    final public static int SCREEN_SHOW_BILL_PAY = 51;
+    final public static int SCREEN_SHOW_CONFIRM_BILL_PAY = 52;
+    final public static int SCREEN_DOING_BILL_PAY = 53;
+    final public static int SCREEN_BILL_PAY_DONE = 54;
+
+
 
 
     final static int CB_STATE_INIT = 1;
@@ -82,7 +97,6 @@ public class ProgramState {
     int[][] counters;
     int cbState;
 
-    boolean isDefaultWalletBeingCreated;
     boolean isAddingWallet;
 
     ArrayList<String> files;
@@ -93,8 +107,10 @@ public class ProgramState {
     Wallet dstWallet;
     Wallet srcWallet;
 
+    Wallet coinIDinFix;
+
     boolean isEchoFinished;
-    boolean isShowCoinsFinished;
+
 
     int statToBankValue, statToBank, statFailed, statLost;
     int statFailedValue, statLostValue;
@@ -111,8 +127,6 @@ public class ProgramState {
 
     int sendType;
 
-    boolean isUpdatedWallets;
-
     int foundSN;
 
     boolean needBackup;
@@ -124,11 +138,7 @@ public class ProgramState {
     String trustedServer;
 
     boolean isSkyDeposit;
-
-    boolean defaultWalletCreated;
-
-    String defaultWalletName;
-
+
     boolean isCreatingNewSkyWallet;
 
     String skyVaultDomain;
@@ -145,6 +155,25 @@ public class ProgramState {
 
     boolean changeFromExport;
 
+    boolean popupVisible;
+
+    boolean isCheckingSkyID;
+
+    boolean needInitWallets;
+
+    boolean needExtra;
+
+    int rrAmount;
+
+    int failedFiles;
+
+    String[][] billpays;
+
+    boolean frombillpay;
+
+    boolean finishedMc;
+
+
     public ProgramState() {
         currentScreen = SCREEN_AGREEMENT;
         cwalletRecoveryRequested = cwalletPasswordRequested = false;
@@ -161,11 +190,9 @@ public ProgramState() {
         files = new ArrayList<String>();
         dstWallet = srcWallet = null;
         isEchoFinished = false;
-        isShowCoinsFinished = true;
         statToBankValue = statToBank = statFailed = 0;
         statFailedValue = statLostValue = 0;
 
-        isDefaultWalletBeingCreated = false;
         isAddingWallet = false;
 
         receiptId = "";
@@ -179,8 +206,6 @@ public ProgramState() {
 
         sendType = SEND_TYPE_WALLET;
 
-        isUpdatedWallets = false;
-
         needBackup = false;
 
         cenvelopes = null;
@@ -192,12 +217,8 @@ public ProgramState() {
         trustedServer = "";
 
         isSkyDeposit = false;
-
-        defaultWalletCreated = false;
-
-        defaultWalletName = null;
 
-        isCreatingNewSkyWallet = false;
+        isCreatingNewSkyWallet = true;
 
         skyVaultDomain = "";
 
@@ -213,6 +234,24 @@ public ProgramState() {
 
         changeFromExport = false;
 
+        popupVisible = false;
+
+        isCheckingSkyID = false;
+
+        coinIDinFix = null;
+
+        needInitWallets = false;
+
+        needExtra = false;
+
+        rrAmount = 0;
+
+        billpays = null;
+
+        frombillpay = false;
+
+        finishedMc = false;
+
     }
 
     public String toString() {