From ccc2fd2a8859933a4f3bc8a8e17443e644dd8477 Mon Sep 17 00:00:00 2001
From: "S.long" <s.long@cubetiqs.com>
Date: Thu, 10 Sep 2020 14:22:28 +0700
Subject: [PATCH] update main

---
 .idea/vcs.xml       |  6 ++++++
 .idea/workspace.xml | 26 ++++++++++++++++++++++++--
 main.dart           | 15 +++++++++------
 3 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b931fbc..aac1d3a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="286d83b5-9a28-456c-8b99-023b18a60548" name="Default Changelist" comment="" />
+    <list default="true" id="286d83b5-9a28-456c-8b99-023b18a60548" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="ProjectId" id="1hIhb0ef6nJysSoG0U0WhqR3xaz" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="dart.analysis.tool.window.force.activate" value="false" />
@@ -36,11 +44,25 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1599704580697</updated>
-      <workItem from="1599704583590" duration="1903000" />
+      <workItem from="1599704583590" duration="2666000" />
+      <workItem from="1599709663822" duration="1200000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/main.dart b/main.dart
index 6276748..ad058d9 100644
--- a/main.dart
+++ b/main.dart
@@ -8,6 +8,9 @@ String input(String message ){
 }
 
 void main() {
+  print("      Dart Tax Calculation ");
+  print("=================================");
+
   var salary = double.parse( input("Enter Salary : ")) ;
 
   var bonus = double.parse(input("Enter Bonus : "));
@@ -20,22 +23,22 @@ void main() {
 
   var familyCount  = spouse + children;
   var familyCost = familyCount * 150000;
-  print("family : ${familyCount} * 150000 = ${familyCost}");
+  print("family = ${familyCost}");
 
   var noFamilySalary = salary - familyCost;
-  print("salary = ${salary} - ${familyCost} = ${noFamilySalary}");
+  print("salary = ${noFamilySalary}");
 
   var tax1 = noFamilySalary * 0.1 -160000;
-  print("Tax 1 = ${noFamilySalary} * 0.1 - 160000 = ${tax1}");
+  print("Tax 1 = ${tax1}");
 
   var tax2 = bonus * 0.2 ;
-  print("Tax 2 = ${bonus} * 0.2 = ${tax2}");
+  print("Tax 2 = ${tax2}");
 
   var taxSum = tax1 + tax2;
-  print("Tax = ${tax1} + ${tax2} = ${taxSum}");
+  print("Tax = ${taxSum}");
 
   var lastSalary = salary + bonus - taxSum;
-  print("Last Salary = ${salary} + ${bonus} - ${taxSum} = ${lastSalary}");
+  print("Last Salary = ${lastSalary}");
 
 
 }