1.0.3

gabrielmjr · Oct 9, 2022 · 0131e18 · 0131e18
1 parent 61997e2
commit 0131e18
Show file tree

Hide file tree

Showing 6 changed files with 323 additions and 154 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 app/build
+info.txt
diff --git a/app/src/main/java/com/gabrielMJr/twaire/physic/Physic.java b/app/src/main/java/com/gabrielMJr/twaire/physic/Physic.java
@@ -3,6 +3,9 @@
 import com.gabrielMJr.twaire.tools.Tools;
 
 public class Physic{
+
+  public static final String version = "1.0.3";
+  public static final String creator = "Gabriel MJr";
 
   public static void main(String[] args) {
     return;
@@ -14,4 +17,12 @@ protected String expNormalizer(double value) {
     Long[] list = tools.expNormalizer(value);
     return tools.normalize(list);
   }
+
+  public String getVersion () {
+    return version;
+  }
+
+  public String getCreator () {
+    return creator;
+  }
 }
diff --git a/app/src/main/java/com/gabrielMJr/twaire/physic/fluidFlow/FluidFlow.java b/app/src/main/java/com/gabrielMJr/twaire/physic/fluidFlow/FluidFlow.java
@@ -119,26 +119,23 @@ public String sSpeed(
                        + Physic.expNormalizer(fluidFlow) 
                        + "m³/s" +  " ÷ [3.14 × (" 
                        +  Physic.expNormalizer(raio) 
-                       + "m)²]";
-
-         result += "\nv = "
-                + Physic.expNormalizer(fluidFlow) 
-                + "m³/s" 
-                + " ÷ (3.14 × " 
-                + stp1 
-                + "m²)";
-
-         result += "\nv = " 
-                + "(" 
-                + Physic.expNormalizer(fluidFlow) 
-                + "m³/s) ÷ " 
-                + "(" 
-                + Physic.expNormalizer(stp2) 
-                + "m²)";
-
-         result += "\nv = " 
-                + Physic.expNormalizer(stp3) 
-                + "m/s";
+                       + "m)²]"
+                       + "\nv = "
+                       + Physic.expNormalizer(fluidFlow) 
+                       + "m³/s" 
+                       + " ÷ (3.14 × " 
+                       + stp1 
+                       + "m²)"
+                       + "\nv = " 
+                       + "(" 
+                       + Physic.expNormalizer(fluidFlow) 
+                       + "m³/s) ÷ " 
+                       + "(" 
+                       + Physic.expNormalizer(stp2) 
+                       + "m²)"
+                       + "\nv = " 
+                       + Physic.expNormalizer(stp3) 
+                       + "m/s";
 
          return result;    
 
@@ -177,21 +174,18 @@ public String ray(
                     + Physic.expNormalizer(fluidFlow) 
                     + "m³/s ÷ (3.14 × " 
                     + Physic.expNormalizer(velocidade) 
-                    + "m/s)]";
-
-      result += "\nr = √[(" 
-             + Physic.expNormalizer(fluidFlow) 
-             + "m³/s) ÷ (" 
-             + Physic.expNormalizer(stp1) 
-             + "m/s)]";
-
-      result += "\nr = √(" 
-             + Physic.expNormalizer(stp2) 
-             + "m²)";
-
-      result += "\nr = " 
-             + Physic.expNormalizer(stp3) 
-             + "m";
+                    + "m/s)]"
+                    + "\nr = √[(" 
+                    + Physic.expNormalizer(fluidFlow) 
+                    + "m³/s) ÷ (" 
+                    + Physic.expNormalizer(stp1) 
+                    + "m/s)]"
+                    + "\nr = √(" 
+                    + Physic.expNormalizer(stp2) 
+                    + "m²)"
+                    + "\nr = " 
+                    + Physic.expNormalizer(stp3) 
+                    + "m";
 
       return result;
 

diff --git a/app/src/main/java/com/gabrielMJr/twaire/physic/kinematics/MRU.java b/app/src/main/java/com/gabrielMJr/twaire/physic/kinematics/MRU.java
@@ -53,18 +53,14 @@ public String tVDisplacement(
          	       + physic.expNormalizer(initial_time)
         	        + "s ) x ("
          	       + physic.expNormalizer(media_speed)
-              	  + "m/s)";
-
-	      res +=
-     	     "\n"
+              	  + "m/s)"
+     	           + "\n"
        	         + "∆S = "
         	        + physic.expNormalizer(step1)
         	        + "s x ("
               	  + physic.expNormalizer(media_speed)
-          	      + "m/s)";
-
-  	    res += 
-    	      "\n"
+          	      + "m/s)"
+             	   + "\n"
        	         + "∆S = "
           	      + physic.expNormalizer(step2) +
            	     "m";
@@ -114,19 +110,17 @@ public String spaceLaw(
              + physic.expNormalizer(speed)
              + "m/s x "
              + physic.expNormalizer(variation_time)
-             + "s";
-
-        res += "\n"
-            + "S = "
-            + physic.expNormalizer(initial_displacement)
-            + "m + "
-            + physic.expNormalizer(step1)
-            + "m";
-
-        res += "\n"
-            + "S = " 
-            + physic.expNormalizer(step2) 
-            + "m";
+             + "s"
+             + "\n"
+             + "S = "
+             + physic.expNormalizer(initial_displacement)
+             + "m + "
+             + physic.expNormalizer(step1)
+             + "m"
+             + "\n"
+             + "S = " 
+             + physic.expNormalizer(step2) 
+             + "m";
 
         return res;
 
@@ -190,21 +184,17 @@ public String speedLaw2(
               + "s"
               + signal2
               + physic.expNormalizer(initial_time)
-              + "s)";
-
-      res +=
-            "\n"
-            + "v = "
-            + physic.expNormalizer(step1) 
-            + "m ÷ " 
-            + physic.expNormalizer(step2) 
-            + "s";
-
-      res +=
-           "\n" 
-           + "v = " 
-           + physic.expNormalizer(step3) 
-           + "m/s";
+              + "s)"
+              + "\n"
+              + "v = "
+              + physic.expNormalizer(step1) 
+              + "m ÷ " 
+              + physic.expNormalizer(step2) 
+              + "s"
+              + "\n"
+              + "v = " 
+              + physic.expNormalizer(step3) 
+              + "m/s";
 
       return res;
 
@@ -258,19 +248,17 @@ public String tVTime(
             + physic.expNormalizer(initial_displacement)
             + "m) ÷ ("
             + physic.expNormalizer(speed)
-            + "m/s)";
-
-      res += "\n"
-          + "∆t = "
-          + physic.expNormalizer(step1) 
-          + "m ÷ (" 
-          + physic.expNormalizer(speed) 
-          + "m/s)";
-
-      res += "\n"
-          + "∆t = " 
-          + physic.expNormalizer(step2) 
-          + "s";
+            + "m/s)"
+            + "\n"
+            + "∆t = "
+            + physic.expNormalizer(step1) 
+            + "m ÷ (" 
+            + physic.expNormalizer(speed) 
+            + "m/s)"
+            + "\n"
+            + "∆t = " 
+            + physic.expNormalizer(step2) 
+            + "s";
 
       return res;