From ec67e0101c7c548b87914fd290be95c63b42fbd0 Mon Sep 17 00:00:00 2001
From: Feyzu <feyzullah-aras@hotmail.de>
Date: Mon, 14 Nov 2022 10:25:17 +0100
Subject: [PATCH] Finale Version

---
 .idea/misc.xml                                |  2 ++
 .../acapendulum20/canvas/CanvasPendulum.kt    | 21 +++++++++----------
 .../acapendulum20/data/MeasurementDao.kt      |  3 ++-
 .../acapendulum20/data/PendulumDatabase.kt    |  2 +-
 .../com/example/acapendulum20/data/UserDao.kt |  3 +--
 .../fragments/add/AddFragment.kt              |  1 +
 .../fragments/pendulum/PendulumFragment.kt    |  9 --------
 .../fragments/update/UpdateFragment.kt        |  3 +--
 .../acapendulum20/model/Measurement.kt        |  1 +
 .../com/example/acapendulum20/model/User.kt   |  3 ++-
 .../repository/MeasurementRepository.kt       |  3 +--
 .../repository/UserRepository.kt              |  2 +-
 .../viewmodel/MeasurementViewmodel.kt         |  2 +-
 .../acapendulum20/viewmodel/UserViewmodel.kt  |  3 +--
 app/src/main/res/layout/fragment_pendulum.xml |  5 +++--
 app/src/main/res/navigation/my_nav.xml        | 12 -----------
 16 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 16389f9..78e7a67 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,10 +12,12 @@
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/activity_main.xml" value="0.29713114754098363" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/custom_row.xml" value="0.384375" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/custom_row_measurement.xml" value="0.5" />
+        <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/dropdown_item.xml" value="0.30570652173913043" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/fragment_add.xml" value="0.45416666666666666" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/fragment_list.xml" value="0.45416666666666666" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/fragment_pendulum.xml" value="0.33" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/fragment_pendulum2.xml" value="0.5541666666666667" />
+        <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/fragment_pendulum_settings.xml" value="0.3984375" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/fragment_start_pendulum.xml" value="0.33" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/fragment_update.xml" value="0.33" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/start_pendulum_fragment.xml" value="0.38697916666666665" />
diff --git a/app/src/main/java/com/example/acapendulum20/canvas/CanvasPendulum.kt b/app/src/main/java/com/example/acapendulum20/canvas/CanvasPendulum.kt
index aae0c75..0d4b5ef 100644
--- a/app/src/main/java/com/example/acapendulum20/canvas/CanvasPendulum.kt
+++ b/app/src/main/java/com/example/acapendulum20/canvas/CanvasPendulum.kt
@@ -26,7 +26,6 @@ class CanvasPendulum @JvmOverloads constructor(
             this.canvas = it
         }
 
-        //println("ONDRAW")
         //draw line
         mPendulum.startPosition.x = (width / 2).toFloat()
         paint.isAntiAlias = true
@@ -84,25 +83,26 @@ class CanvasPendulum @JvmOverloads constructor(
 
     fun startPendulum() {
 
+        //when active button is pushed
         if (mPendulum.magneticField) {
 
             var gravity = 0.981f
             var damping = 0.996f
 
+            //Pendulum positioning inside magnetic field close to Sensor left and right
             if (mPendulum.stopPosition.x > canvas.width / 4f && mPendulum.stopPosition.x <= canvas.width * 0.75f) {
                 gravity = 1.981f
-
+                //Pendulum positioning inside magnetic field at Sensor left and right
                 if (mPendulum.stopPosition.x > canvas.width / 3.toFloat() && mPendulum.stopPosition.x <= canvas.width / 1.5.toFloat()) {
                     gravity = 2.981f
-
+                    //Pendulum positioning inside magnetic field close to magnet
                     if (mPendulum.stopPosition.x >= canvas.width / 2.toFloat() - 3 && mPendulum.stopPosition.x <= canvas.width / 2.toFloat() + 3) {
                         damping = 0.3f
                     }
                 }
             }
 
-            mPendulum.angleAcceleration =
-                ((-1 * gravity / mPendulum.r) * (mPendulum.angle)).toFloat()
+            mPendulum.angleAcceleration = ((-1 * gravity / mPendulum.r) * (mPendulum.angle)).toFloat()
             mPendulum.angleVelocity += mPendulum.angleAcceleration
             mPendulum.angleVelocity *= damping
             mPendulum.angle += mPendulum.angleVelocity
@@ -113,12 +113,12 @@ class CanvasPendulum @JvmOverloads constructor(
             mPendulum.stopPosition.x += mPendulum.startPosition.x
         }
 
+        //when active button released
         if (!mPendulum.magneticField) {
             val gravity = 0.981f
             val damping = 0.996f
 
-            mPendulum.angleAcceleration =
-                ((-1 * gravity / mPendulum.r) * (mPendulum.angle)).toFloat()
+            mPendulum.angleAcceleration = ((-1 * gravity / mPendulum.r) * (mPendulum.angle)).toFloat()
             mPendulum.angleVelocity += mPendulum.angleAcceleration
             mPendulum.angleVelocity *= damping
             mPendulum.angle += mPendulum.angleVelocity
@@ -156,10 +156,9 @@ class Pendulum {
     var stopPosition: Position = Position(0f, 0f)
     var r = 800f
 
-    //PI/6 Max ausschwingen
     var angle: Double = Math.PI / 12
-    var angleVelocity: Float = 0.0f   //
-    var angleAcceleration: Float = 0.0f    //
-    var ballr: Float = 70.0f    //
+    var angleVelocity: Float = 0.0f
+    var angleAcceleration: Float = 0.0f
+    var ballr: Float = 70.0f
     var magneticField: Boolean = false
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/acapendulum20/data/MeasurementDao.kt b/app/src/main/java/com/example/acapendulum20/data/MeasurementDao.kt
index 51fe108..16dcaa8 100644
--- a/app/src/main/java/com/example/acapendulum20/data/MeasurementDao.kt
+++ b/app/src/main/java/com/example/acapendulum20/data/MeasurementDao.kt
@@ -21,4 +21,5 @@ interface MeasurementDao {
 
     @Query("SELECT * FROM measurement_table ")
     fun readAllData(): LiveData<List<Measurement>>
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/java/com/example/acapendulum20/data/PendulumDatabase.kt b/app/src/main/java/com/example/acapendulum20/data/PendulumDatabase.kt
index 9e5f224..e932f08 100644
--- a/app/src/main/java/com/example/acapendulum20/data/PendulumDatabase.kt
+++ b/app/src/main/java/com/example/acapendulum20/data/PendulumDatabase.kt
@@ -32,4 +32,4 @@ abstract class PendulumDatabase: RoomDatabase() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/acapendulum20/data/UserDao.kt b/app/src/main/java/com/example/acapendulum20/data/UserDao.kt
index 3f73304..14bc25d 100644
--- a/app/src/main/java/com/example/acapendulum20/data/UserDao.kt
+++ b/app/src/main/java/com/example/acapendulum20/data/UserDao.kt
@@ -21,5 +21,4 @@ interface UserDao {
 
     @Query("SELECT * FROM user_table ORDER BY lastName ASC")
     fun readAllData(): LiveData<List<User>>
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/acapendulum20/fragments/add/AddFragment.kt b/app/src/main/java/com/example/acapendulum20/fragments/add/AddFragment.kt
index f593112..224bf80 100644
--- a/app/src/main/java/com/example/acapendulum20/fragments/add/AddFragment.kt
+++ b/app/src/main/java/com/example/acapendulum20/fragments/add/AddFragment.kt
@@ -34,6 +34,7 @@ class AddFragment : Fragment() {
         mUserViewModel = ViewModelProvider(this).get(UserViewmodel::class.java)
 
         //dropdown sex
+
         val sex = resources.getStringArray(R.array.sex)
         val arrayAdapterSex = ArrayAdapter(requireContext(), R.layout.dropdown_item, sex)
         view.chooseSex_et.setAdapter(arrayAdapterSex)
diff --git a/app/src/main/java/com/example/acapendulum20/fragments/pendulum/PendulumFragment.kt b/app/src/main/java/com/example/acapendulum20/fragments/pendulum/PendulumFragment.kt
index 8bf0c2e..4ea1ae1 100644
--- a/app/src/main/java/com/example/acapendulum20/fragments/pendulum/PendulumFragment.kt
+++ b/app/src/main/java/com/example/acapendulum20/fragments/pendulum/PendulumFragment.kt
@@ -38,7 +38,6 @@ class PendulumFragment : Fragment() {
         val mCanvasPendulum: CanvasPendulum = view.findViewById(R.id.canvasContainer)!!
         mMeasurementViewmodel = ViewModelProvider(this).get(MeasurementViewmodel::class.java)
 
-
         //activate the magnet
         val magnetButton = view.findViewById<Button>(R.id.activate_btn)
 
@@ -56,9 +55,6 @@ class PendulumFragment : Fragment() {
         val timer = view.findViewById<TextView>(R.id.timer_view)
         val currentVelocity = view.findViewById<TextView>(R.id.actV_view)
 
-        // Value endTime
-        //val endTIme: Long
-
         targetVelocity.text = args.measurement.targetVelocity.toString() + "cm/s"
         maxAttemptTime.text = args.measurement.maxAttemptTime.toString() + "sec"
 
@@ -86,18 +82,15 @@ class PendulumFragment : Fragment() {
                 if (event?.action == MotionEvent.ACTION_DOWN){
                     println("button action DOWN")
                     mCanvasPendulum.startMagnet(true)
-                    //mCanvasPendulum.magnet(true)
                 }
 
                 if (event?.action == MotionEvent.ACTION_UP){
                     println("button action UP")
                     mCanvasPendulum.stopMagnet(false)
-                    //mCanvasPendulum.magnet(false)
                 }
                 return true
             }
         })
-
         return view
     }
 
@@ -121,6 +114,4 @@ class PendulumFragment : Fragment() {
         val action = PendulumFragmentDirections.actionPendulumFragmentToUpdateFragment(args.currentUser)
         findNavController().navigate(action)
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/acapendulum20/fragments/update/UpdateFragment.kt b/app/src/main/java/com/example/acapendulum20/fragments/update/UpdateFragment.kt
index 9f0a8a8..112357c 100644
--- a/app/src/main/java/com/example/acapendulum20/fragments/update/UpdateFragment.kt
+++ b/app/src/main/java/com/example/acapendulum20/fragments/update/UpdateFragment.kt
@@ -152,5 +152,4 @@ class UpdateFragment : Fragment() {
         builder.setMessage("Are you sure you want to delete ${args.currentUser.firstName}?")
         builder.create().show()
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/acapendulum20/model/Measurement.kt b/app/src/main/java/com/example/acapendulum20/model/Measurement.kt
index 958e1d1..2fad7aa 100644
--- a/app/src/main/java/com/example/acapendulum20/model/Measurement.kt
+++ b/app/src/main/java/com/example/acapendulum20/model/Measurement.kt
@@ -24,3 +24,4 @@ data class Measurement(
     val usedHand: String,
     val owner: String,
 ): Parcelable
+
diff --git a/app/src/main/java/com/example/acapendulum20/model/User.kt b/app/src/main/java/com/example/acapendulum20/model/User.kt
index bad26da..7a51be0 100644
--- a/app/src/main/java/com/example/acapendulum20/model/User.kt
+++ b/app/src/main/java/com/example/acapendulum20/model/User.kt
@@ -15,4 +15,5 @@ data class User(
     val birthday: String,
     val sex: String,
     val handiness: String,
-): Parcelable
\ No newline at end of file
+): Parcelable
+
diff --git a/app/src/main/java/com/example/acapendulum20/repository/MeasurementRepository.kt b/app/src/main/java/com/example/acapendulum20/repository/MeasurementRepository.kt
index c3296f5..99c18cb 100644
--- a/app/src/main/java/com/example/acapendulum20/repository/MeasurementRepository.kt
+++ b/app/src/main/java/com/example/acapendulum20/repository/MeasurementRepository.kt
@@ -23,6 +23,5 @@ class MeasurementRepository(private val measurementDao: MeasurementDao) {
     suspend fun deleteMeasurement(measurement: Measurement){
         measurementDao.deleteMeasurement(measurement)
     }
+}
 
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/acapendulum20/repository/UserRepository.kt b/app/src/main/java/com/example/acapendulum20/repository/UserRepository.kt
index 6593240..b294851 100644
--- a/app/src/main/java/com/example/acapendulum20/repository/UserRepository.kt
+++ b/app/src/main/java/com/example/acapendulum20/repository/UserRepository.kt
@@ -23,4 +23,4 @@ class UserRepository(private val userDao: UserDao) {
     suspend fun deleteAllUser(){
         userDao.deleteAllUsers()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/acapendulum20/viewmodel/MeasurementViewmodel.kt b/app/src/main/java/com/example/acapendulum20/viewmodel/MeasurementViewmodel.kt
index cade02b..53128a0 100644
--- a/app/src/main/java/com/example/acapendulum20/viewmodel/MeasurementViewmodel.kt
+++ b/app/src/main/java/com/example/acapendulum20/viewmodel/MeasurementViewmodel.kt
@@ -41,4 +41,4 @@ class MeasurementViewmodel(application: Application): AndroidViewModel(applicati
             repository.deleteMeasurement(measurement)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/acapendulum20/viewmodel/UserViewmodel.kt b/app/src/main/java/com/example/acapendulum20/viewmodel/UserViewmodel.kt
index b41243f..55293b6 100644
--- a/app/src/main/java/com/example/acapendulum20/viewmodel/UserViewmodel.kt
+++ b/app/src/main/java/com/example/acapendulum20/viewmodel/UserViewmodel.kt
@@ -26,7 +26,6 @@ class UserViewmodel(application: Application): AndroidViewModel(application) {
             repository.addUser(user)
         }
     }
-
     fun updateUser(user: User){
         viewModelScope.launch(Dispatchers.IO) {
             repository.updateUser(user)
@@ -44,4 +43,4 @@ class UserViewmodel(application: Application): AndroidViewModel(application) {
             repository.deleteAllUser()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/fragment_pendulum.xml b/app/src/main/res/layout/fragment_pendulum.xml
index 047da9d..19f9e02 100644
--- a/app/src/main/res/layout/fragment_pendulum.xml
+++ b/app/src/main/res/layout/fragment_pendulum.xml
@@ -65,12 +65,13 @@
         android:id="@+id/speichern_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Speichern"
+        android:text="Save"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/activate_btn"
-        app:layout_constraintVertical_bias="0.187" />
+        app:layout_constraintVertical_bias="0.675" />
 
     <Button
         android:id="@+id/activate_btn"
diff --git a/app/src/main/res/navigation/my_nav.xml b/app/src/main/res/navigation/my_nav.xml
index eff76ee..660c6c4 100644
--- a/app/src/main/res/navigation/my_nav.xml
+++ b/app/src/main/res/navigation/my_nav.xml
@@ -55,9 +55,6 @@
         <argument
             android:name="currentUser"
             app:argType="com.example.acapendulum20.model.User" />
-        <action
-            android:id="@+id/action_startPendulumFragment_to_pendulumSettingsFragment"
-            app:destination="@id/pendulumSettingsFragment" />
     </fragment>
     <fragment
         android:id="@+id/pendulumFragment"
@@ -74,13 +71,4 @@
             android:name="currentUser"
             app:argType="com.example.acapendulum20.model.User" />
     </fragment>
-    <fragment
-        android:id="@+id/pendulumSettingsFragment"
-        android:name="com.example.acapendulum20.PendulumSettingsFragment"
-        android:label="fragment_pendulum_settings"
-        tools:layout="@layout/fragment_pendulum_settings" >
-        <action
-            android:id="@+id/action_pendulumSettingsFragment_to_startPendulumFragment"
-            app:destination="@id/startPendulumFragment" />
-    </fragment>
 </navigation>
\ No newline at end of file