Skip to content

Commit

Permalink
Nueva clase para manejo de propiedades, animaciones para las cajas de…
Browse files Browse the repository at this point in the history
… texto y algunas correcciones
  • Loading branch information
Israel-ICM committed Oct 15, 2021
1 parent 0ed1242 commit 9198f46
Show file tree
Hide file tree
Showing 63 changed files with 809 additions and 256 deletions.
4 changes: 0 additions & 4 deletions build/built-jar.properties

This file was deleted.

Empty file.
Empty file.
Binary file modified build/classes/icm/sphynx/styles/MetroUI.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/styles/MyStyles.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIButton.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UICheckBox.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIComboBox.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UILabel.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIList.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIMenuBar.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIMenuItem.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIOptionPane$1.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIOptionPane$2.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIOptionPane$3.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIOptionPane$4.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIOptionPane.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIPanel.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIProgressBar.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIRadioButton.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UIScrollBar.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UISlider.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UITabbedPane.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UITable.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UITableHeader.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UITextArea.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UITextField$1.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UITextField$2.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UITextField.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/components/metro/UITools.class
Binary file not shown.
Binary file modified build/classes/icm/sphynx/ui/tools/ToolsCellRendererTable.class
Binary file not shown.
Binary file not shown.
14 changes: 12 additions & 2 deletions nbproject/private/private.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,25 @@
<group>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/MetroUIConfigTheme.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIPanel.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIList.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UILabel.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UITools.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIProgressBar.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/tools/StyleColors.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UISplitPane.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIScrollBar.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIToggleButton.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIComboBox.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIFormattedTextField.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UITableHeader.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIRadioButton.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/tools/ThemeMetroUI.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UIPasswordField.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/styles/MyStyles.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/tools/ToolsCellRendererTable.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UITextField.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UITextArea.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/tools/StyleColorsMetro.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/UITable.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/components/metro/MetroUIComponent.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/styles/MetroUI.java</file>
<file>file:/C:/Users/josue2/Documents/NetBeansProjects/MyStyles/src/icm/sphynx/ui/tools/ToolsHeaderCellRendererTable.java</file>
</group>
Expand Down
24 changes: 12 additions & 12 deletions src/icm/sphynx/styles/MetroUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import icm.sphynx.ui.components.metro.UIToggleButton;
import icm.sphynx.ui.components.metro.UITools;
import icm.sphynx.ui.tools.IconsMetroUI;
import icm.sphynx.ui.tools.StyleColors;
import icm.sphynx.ui.tools.StyleColorsMetro;
import icm.sphynx.ui.tools.ThemeMetroUI;
import java.awt.Color;
import java.awt.Component;
Expand Down Expand Up @@ -64,21 +64,21 @@ public static void installLight(String primaryColor, boolean autoColorCorrector)

installComponents();

UIManager.put("MenuBar.background", Color.decode(StyleColors.LIGHT_BACKGROUND_PANEL));
UIManager.put("MenuBar.background", Color.decode(StyleColorsMetro.LIGHT_BACKGROUND_PANEL));
UIManager.put("MenuBar.border", null);

// UIManager.put("Menu.background", Color.decode(StyleColors.LIGHT_BACKGROUND_PANEL));
UIManager.put("Menu.foreground", Color.decode(StyleColors.LIGHT_FOREGROUND));
UIManager.put("Menu.foreground", Color.decode(StyleColorsMetro.LIGHT_FOREGROUND));
UIManager.put("Menu.font", new Font(UITools.FONT_DEFAULT, Font.BOLD, 13));

UIManager.put("MenuItem.background", Color.decode(StyleColors.LIGHT_BACKGROUND_PANEL));
UIManager.put("MenuItem.foreground", Color.decode(StyleColors.LIGHT_FOREGROUND));
UIManager.put("MenuItem.background", Color.decode(StyleColorsMetro.LIGHT_BACKGROUND_PANEL));
UIManager.put("MenuItem.foreground", Color.decode(StyleColorsMetro.LIGHT_FOREGROUND));

LineBorder border = new LineBorder(Color.decode(UITools.COLOR_BORDER_DEFAULT), 2);
// LineBorder border = new LineBorder(Color.decode(UITools.COLOR_BORDER_DEFAULT), 2);
// UIManager.put("ComboBox.selectionBackground", MetroUIConfigTheme.getPrimaryColor());
UIManager.put("ComboBox.selectionForeground", Color.WHITE);
UIManager.put("ComboBox.font", new Font(UITools.FONT_DEFAULT, Font.PLAIN, 12));
UIManager.put("ComboBox.border", border);
// UIManager.put("ComboBox.border", border);
// UIManager.put("ComboBox.buttonHighlight", MetroUIConfigTheme.getPrimaryColor());

UIManager.put("Table.focusCellHighlightBorder", BorderFactory.createMatteBorder(2, 2, 2, 2, Color.WHITE));
Expand Down Expand Up @@ -114,15 +114,15 @@ public static void installDark(String primaryColor, boolean autoColorCorrector)

installComponents();

UIManager.put("MenuBar.background", Color.decode(StyleColors.LIGHT_BACKGROUND_PANEL));
UIManager.put("MenuBar.background", Color.decode(StyleColorsMetro.LIGHT_BACKGROUND_PANEL));
UIManager.put("MenuBar.border", null);

// UIManager.put("Menu.background", Color.decode(StyleColors.LIGHT_BACKGROUND_PANEL));
UIManager.put("Menu.foreground", Color.decode(StyleColors.LIGHT_FOREGROUND));
UIManager.put("Menu.foreground", Color.decode(StyleColorsMetro.LIGHT_FOREGROUND));
UIManager.put("Menu.font", new Font(UITools.FONT_DEFAULT, Font.BOLD, 13));

UIManager.put("MenuItem.background", Color.decode(StyleColors.LIGHT_BACKGROUND_PANEL));
UIManager.put("MenuItem.foreground", Color.decode(StyleColors.LIGHT_FOREGROUND));
UIManager.put("MenuItem.background", Color.decode(StyleColorsMetro.LIGHT_BACKGROUND_PANEL));
UIManager.put("MenuItem.foreground", Color.decode(StyleColorsMetro.LIGHT_FOREGROUND));

LineBorder border = new LineBorder(Color.decode(UITools.COLOR_BORDER_DEFAULT), 2);
// UIManager.put("ComboBox.selectionBackground", MetroUIConfigTheme.getPrimaryColor());
Expand All @@ -132,7 +132,7 @@ public static void installDark(String primaryColor, boolean autoColorCorrector)
// UIManager.put("ComboBox.buttonHighlight", MetroUIConfigTheme.getPrimaryColor());

Color bordeFocus = Color.WHITE;
if (MetroUIConfigTheme.getDarkMode())
if (MetroUIConfigTheme.isDarkMode())
bordeFocus = Color.decode("#CCCCCC");
UIManager.put("Table.focusCellHighlightBorder", BorderFactory.createMatteBorder(2, 2, 2, 2, bordeFocus));

Expand Down
4 changes: 2 additions & 2 deletions src/icm/sphynx/styles/MyStyles.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import icm.sphynx.ui.components.metro.MetroUIConfigTheme;
import icm.sphynx.ui.components.metro.UITools;
import icm.sphynx.ui.tools.StyleColors;
import icm.sphynx.ui.tools.StyleColorsMetro;
import java.awt.Color;

/**
Expand Down Expand Up @@ -30,7 +30,7 @@ public class MyStyles {
* @param style Estilo que se utilizará (Ej. MyStyles.METRO_UI)
*/
public static void install(int style) {
install(style, StyleColors.COLOR_PRIMARY, false);
install(style, StyleColorsMetro.COLOR_PRIMARY, false);
}
/**
* Inicializa el estilo que se quiere utilizar
Expand Down
68 changes: 68 additions & 0 deletions src/icm/sphynx/ui/components/metro/MetroUIComponent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package icm.sphynx.ui.components.metro;

import javax.swing.UIManager;

/**
* Agrega propiedades a los componentes que lo soportan
* @author israel-icm
*/
public class MetroUIComponent {
private static final String TEXT_FIELD = "MetroTextField";
private static final String PASSWORD_FIELD = "MetroPasswordField";

private static final String TEXT_FIELD_PROPERTY_PLACEHOLDER = "placeholder";
private static final String TEXT_FIELD_PROPERTY_ICON = "icon";
public static final String ICON_SEARCH = "search";

/**
* Agrega el ícono predeterminado a un textfield
* @param nameComponent Nombre del componente al que se aplicará la propiedad
* @param value Valor de la propiedad (Ej: MetroUIConfigComponent.ICON_SEARCH)
* @example MetroUIConfigComponent.setPropertyTextField("buscar", TEXT_FIELD_PROPERTY_PLACEHOLDER, "Buscar...");
*/
public static void setTextFieldIcon(String nameComponent, String value) {
UIManager.put(TEXT_FIELD + "." + nameComponent + "." + TEXT_FIELD_PROPERTY_ICON, value);
}
/**
* Agrega el placeholder a un textfield en específico
* @param nameComponent Nombre del componente al que se aplicará la propiedad
* @param value Texto que se mostrará en la caja de texto
* @example MetroUIConfigComponent.setPropertyTextField("buscar", TEXT_FIELD_PROPERTY_PLACEHOLDER, "Buscar...");
*/
public static void setTextFieldPlaceholder(String nameComponent, String value) {
UIManager.put(TEXT_FIELD + "." + nameComponent + "." + TEXT_FIELD_PROPERTY_PLACEHOLDER, value);
}
/**
* Agrega el placeholder a un passwordField en específico
* @param nameComponent Nombre del componente al que se aplicará la propiedad
* @param value Texto que se mostrará en la caja de texto
* @example MetroUIConfigComponent.setPropertyTextField("buscar", TEXT_FIELD_PROPERTY_PLACEHOLDER, "Buscar...");
*/
public static void setPasswordFieldPlaceholder(String nameComponent, String value) {
UIManager.put(PASSWORD_FIELD + "." + nameComponent + "." + TEXT_FIELD_PROPERTY_PLACEHOLDER, value);
}
/**
* Retorna el valor de la propiedad icon
* @param nameComponent
* @return
*/
public static String getPropertyTextFieldIcon(String nameComponent) {
return UIManager.getString(TEXT_FIELD + "." + nameComponent + "." + TEXT_FIELD_PROPERTY_ICON);
}
/**
* Retorna el valor de la propiedad placeholder
* @param nameComponent
* @return
*/
public static String getPropertyTextFieldPlaceholder(String nameComponent) {
return UIManager.getString(TEXT_FIELD + "." + nameComponent + "." + TEXT_FIELD_PROPERTY_PLACEHOLDER);
}
/**
* Retorna el valor de la propiedad placeholder
* @param nameComponent
* @return
*/
public static String getPropertyPasswordFieldPlaceholder(String nameComponent) {
return UIManager.getString(PASSWORD_FIELD + "." + nameComponent + "." + TEXT_FIELD_PROPERTY_PLACEHOLDER);
}
}
4 changes: 1 addition & 3 deletions src/icm/sphynx/ui/components/metro/MetroUIConfigTheme.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package icm.sphynx.ui.components.metro;

import icm.sphynx.styles.MetroUI;
import icm.sphynx.ui.tools.StyleColors;
import java.awt.Color;
import javax.swing.UIManager;

Expand Down Expand Up @@ -31,7 +29,7 @@ public static Color getSecondColor() {
return UIManager.getColor("MetroUI.secondColor");
}

public static boolean getDarkMode() {
public static boolean isDarkMode() {
return UIManager.getBoolean("MetroUI.darkMode");
}
}
2 changes: 1 addition & 1 deletion src/icm/sphynx/ui/components/metro/UIButton.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package icm.sphynx.ui.components.metro;

import icm.sphynx.ui.tools.StyleColors;
import icm.sphynx.ui.tools.StyleColorsMetro;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Font;
Expand Down
8 changes: 4 additions & 4 deletions src/icm/sphynx/ui/components/metro/UICheckBox.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package icm.sphynx.ui.components.metro;

import icm.sphynx.ui.tools.StyleColors;
import icm.sphynx.ui.tools.StyleColorsMetro;
import java.awt.AlphaComposite;
import java.awt.BasicStroke;
import java.awt.Color;
Expand Down Expand Up @@ -32,7 +32,7 @@ public synchronized void paint(Graphics g, JComponent c) {
super.paint(g2d, chk);

chk.setBackground(null);
chk.setForeground(Color.decode(StyleColors.LIGHT_FOREGROUND));
chk.setForeground(Color.decode(StyleColorsMetro.LIGHT_FOREGROUND));
chk.setFont(new Font(UITools.FONT_DEFAULT, chk.getFont().getStyle(), chk.getFont().getSize()));
chk.setIcon(createCheckImage(18, 18, chk.isSelected()));
}
Expand All @@ -54,15 +54,15 @@ private ImageIcon createCheckImage(int width, int height, boolean checked) {
AlphaComposite ac = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.9f);
g2d.setComposite(ac);
g2d.setColor(Color.decode("#FFFFFF"));
if (MetroUIConfigTheme.getDarkMode())
if (MetroUIConfigTheme.isDarkMode())
g2d.setColor(Color.decode("#CCCCCC"));
g2d.fillRect(1, 1, width, height);

// Borde del check
AlphaComposite ac2 = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f);
g2d.setComposite(ac2);
g2d.setColor(Color.decode("#212121"));
if (MetroUIConfigTheme.getDarkMode())
if (MetroUIConfigTheme.isDarkMode())
g2d.setColor(Color.decode("#A6A6A6"));
g2d.setStroke(new BasicStroke(2));
g2d.drawRect(1, 1, width - 1, height - 1);
Expand Down
47 changes: 35 additions & 12 deletions src/icm/sphynx/ui/components/metro/UIComboBox.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package icm.sphynx.ui.components.metro;

import icm.sphynx.ui.tools.StyleColorsMetro;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Component;
Expand All @@ -17,6 +18,8 @@
import javax.swing.JComponent;
import javax.swing.JList;
import javax.swing.ListCellRenderer;
import javax.swing.UIManager;
import javax.swing.border.LineBorder;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicComboBoxUI;

Expand All @@ -25,34 +28,51 @@
* @author israel-icm
*/
public class UIComboBox extends BasicComboBoxUI {
private final String _colorBackground = StyleColorsMetro.COLOR_BACKGROUND_COMBOBOX;
private final String _colorBorder = StyleColorsMetro.COLOR_BORDER_COMBOBOX;
private final String _colorText = "#000000";
private final String _colorTextSelection = "#000000";
private final String _colorIconButton = "#838383";

private JComboBox combobox;

public static ComponentUI createUI(JComponent c) {
return new UIComboBox();
}

@Override
public void paint(Graphics g, JComponent c) {
super.paint(g, c);
JComboBox cbx = (JComboBox)c;
cbx.setBackground(MetroUIConfigTheme.getPrimaryColor());
cbx.setForeground(Color.WHITE);
cbx.setPreferredSize(new Dimension(cbx.getWidth(), 30));
combobox = (JComboBox)c;

combobox.setBackground(Color.decode(_colorBackground));
combobox.setForeground(Color.decode(_colorText));
combobox.setBorder(new LineBorder(Color.decode(_colorBorder), 2));
if (combobox.getHeight() <= 26)
combobox.setPreferredSize(new Dimension(combobox.getWidth(), 28));
// c.setBorder(BorderFactory.createCompoundBorder(c.getBorder(), BorderFactory.createEmptyBorder(UITools.PADDING_CONTENTS, UITools.PADDING_CONTENTS, UITools.PADDING_CONTENTS, UITools.PADDING_CONTENTS)));
}

@Override
protected JButton createArrowButton() {
protected JButton createArrowButton() {
JButton button = new JButton();
button.setName("ButtonComboboxMetroUI");
button.setText("");
button.setBorder(BorderFactory.createLineBorder(MetroUIConfigTheme.getPrimaryColor(), 0));
button.setBorder(BorderFactory.createLineBorder(Color.decode(_colorBackground), 0));
button.setContentAreaFilled(false);
button.setIcon(createCbxImage(20, 20));
button.setFocusable(false);

// EL BOTON DEBERIA CAMBIAR TAMBIEN AL COLOR DEL FOREGROUND
// TAL VEZ FUNCIONA CON LA NUEVA FUNCIONA DE PROPERTY

button.setBackground(Color.decode(_colorBackground));
return button;
}

@Override
public void paintCurrentValueBackground(Graphics g, Rectangle bounds, boolean hasFocus){
g.setColor(MetroUIConfigTheme.getPrimaryColor());
g.setColor(Color.decode(_colorBackground));
g.fillRect(bounds.x, bounds.y, bounds.width, bounds.height);
}

Expand All @@ -62,14 +82,17 @@ protected ListCellRenderer createRenderer(){
@Override
public Component getListCellRendererComponent(JList list, Object value,int index, boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
list.setSelectionBackground(MetroUIConfigTheme.getPrimaryColor());
list.setSelectionBackground(Color.decode(_colorBackground));
list.setSelectionForeground(Color.decode(_colorText));
if (isSelected){
setBackground(MetroUIConfigTheme.getPrimaryColor());
setForeground(Color.WHITE);
/* setBackground(MetroUIConfigTheme.getPrimaryColor());
setForeground(Color.WHITE);*/
setBackground(Color.decode(UITools.subirBrillo(UITools.colorToHex(MetroUIConfigTheme.getPrimaryColor()))));
setForeground(Color.decode(_colorTextSelection));
}
else {
setBackground(Color.WHITE);
if (MetroUIConfigTheme.getDarkMode())
if (MetroUIConfigTheme.isDarkMode())
setBackground(Color.decode("#A6A6A6"));
setForeground(Color.BLACK);
}
Expand All @@ -91,7 +114,7 @@ private ImageIcon createCbxImage(int width, int height) {
int yPuntoMedio = (height / 2) + 3;
int xPuntoMedio = width / 2;

g2d.setColor(Color.decode("#FFFFFF"));
g2d.setColor(Color.decode(_colorIconButton));
g2d.setStroke(new BasicStroke(2));
g2d.drawLine(5, yIniFin, xPuntoMedio, yPuntoMedio);
g2d.drawLine(xPuntoMedio, yPuntoMedio, width - 5, yIniFin);
Expand Down
Loading

0 comments on commit 9198f46

Please sign in to comment.