From fd1007ad4feee742473b5623fc1318b484e9fdd6 Mon Sep 17 00:00:00 2001
From: Sabrina Furtado <145471677+SabrinaFurtado@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:27:59 -0300
Subject: [PATCH 1/5] Add files via upload

---
 calculoDiferenca.java | 0
 calculoMedia.java     | 0
 novoSalario.java      | 0
 salarioBruto.java     | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 calculoDiferenca.java
 create mode 100644 calculoMedia.java
 create mode 100644 novoSalario.java
 create mode 100644 salarioBruto.java

diff --git a/calculoDiferenca.java b/calculoDiferenca.java
new file mode 100644
index 0000000..e69de29
diff --git a/calculoMedia.java b/calculoMedia.java
new file mode 100644
index 0000000..e69de29
diff --git a/novoSalario.java b/novoSalario.java
new file mode 100644
index 0000000..e69de29
diff --git a/salarioBruto.java b/salarioBruto.java
new file mode 100644
index 0000000..e69de29

From b7aae96d4ca52024da803a7b0637b92a7751f724 Mon Sep 17 00:00:00 2001
From: Sabrina Furtado <145471677+SabrinaFurtado@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:30:15 -0300
Subject: [PATCH 2/5] Update calculoDiferenca.java

---
 calculoDiferenca.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/calculoDiferenca.java b/calculoDiferenca.java
index e69de29..5b50b58 100644
--- a/calculoDiferenca.java
+++ b/calculoDiferenca.java
@@ -0,0 +1,15 @@
+package calcularDiferenca;
+
+public class calculoDiferenca {
+    public static void main(String[] args) {
+
+        float n1 = 5.0f;
+        float n2 = 6.0f;
+        float n3 = 7.0f;
+        float n4 = 8.0f;
+        
+        float diferenca = (n1 * n2) - (n3 * n4);
+        
+        System.out.println("Diferença: " + diferenca);
+    }
+}

From f22e79609b2c076cfa8ab4b63b9824e9f73bd646 Mon Sep 17 00:00:00 2001
From: Sabrina Furtado <145471677+SabrinaFurtado@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:30:42 -0300
Subject: [PATCH 3/5] Update calculoMedia.java

---
 calculoMedia.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/calculoMedia.java b/calculoMedia.java
index e69de29..7e55913 100644
--- a/calculoMedia.java
+++ b/calculoMedia.java
@@ -0,0 +1,19 @@
+package calcularMedia;
+
+public class calculoMedia {
+    public static void main(String[] args) {
+        
+        float nota1 = 10;
+        float nota2 = 8;
+        float nota3 = 7;
+        float nota4 = 7;
+        
+        float mediaFinal = (nota1 + nota2 + nota3 + nota4) / 4;
+        
+        System.out.println("Nota 1: " + nota1);
+        System.out.println("Nota 2: " + nota2);
+        System.out.println("Nota 3: " + nota3);
+        System.out.println("Nota 4: " + nota4);
+        System.out.println("\nMédia final: " + mediaFinal);
+    }
+}

From 61bfe7d8eeb96d629dae1ff40819ff1955e87b28 Mon Sep 17 00:00:00 2001
From: Sabrina Furtado <145471677+SabrinaFurtado@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:31:02 -0300
Subject: [PATCH 4/5] Update novoSalario.java

---
 novoSalario.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/novoSalario.java b/novoSalario.java
index e69de29..19caa8e 100644
--- a/novoSalario.java
+++ b/novoSalario.java
@@ -0,0 +1,15 @@
+package calculoSalario;
+
+public class novoSalario {
+	
+public static void main(String[] args) {
+        
+        float salario = 10000;
+        float abono = 1000;
+        float novoSalario;
+      
+        novoSalario = salario + abono;
+
+        System.out.println("Novo Salário: " + novoSalario);
+    }
+}

From fef7bce2ad3d3550ca4a386eccb97a9bdf08ead1 Mon Sep 17 00:00:00 2001
From: Sabrina Furtado <145471677+SabrinaFurtado@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:31:37 -0300
Subject: [PATCH 5/5] Update salarioBruto.java

---
 salarioBruto.java | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/salarioBruto.java b/salarioBruto.java
index e69de29..4acdf13 100644
--- a/salarioBruto.java
+++ b/salarioBruto.java
@@ -0,0 +1,23 @@
+package calculoBruto;
+public class CalculoSalario {
+    public static void main(String[] args) {
+
+        float salarioBruto = 2000.00f;
+        float adicionalNoturno = 500.00f;
+        float horasExtras = 100.00f;
+        float descontos = 200.00f;
+        
+        float salarioLiquido = salarioBruto + adicionalNoturno + (horasExtras * 5) - descontos;
+        
+        System.out.println("Salário Bruto: " + salarioBruto);
+        System.out.println("Adicional Noturno: " + adicionalNoturno);
+        System.out.println("Horas Extras: " + horasExtras);
+        System.out.println("Descontos: " + descontos);
+        System.out.println("\nSalário Líquido: " + salarioLiquido);
+    }
+
+    @Override
+    public String toString() {
+        return "CalculoSalario []";
+    }
+}