From ae0daffd0b2d384a614171ae074ae6c1b8e90172 Mon Sep 17 00:00:00 2001
From: Feyzu <feyzullah-aras@hotmail.de>
Date: Sun, 17 Jul 2022 17:26:28 +0200
Subject: [PATCH] Pendel Logic READY Pendelsession information save in profile
 in progress new fragment "fragment_start_pendulum" finished last step save
 Data from Pendulum in Profil

---
 .idea/misc.xml                                |  3 +-
 app/src/main/AndroidManifest.xml              |  7 +-
 .../acapendulum20/canvas/CanvasPendulum.kt    | 11 ++-
 .../acapendulum20/data/MeasurementDao.kt      |  9 ++
 ...urementDatabase.kt => PendulumDatabase.kt} | 16 ++--
 .../acapendulum20/data/UserDatabase.kt        | 33 -------
 .../fragments/pendulum/PendulumFragment.kt    | 42 ++++++---
 .../pendulum/StartPendulumFragment.kt         | 14 ++-
 .../fragments/update/SessionList.kt           | 49 +++++++++++
 .../fragments/update/UpdateFragment.kt        | 24 +++++-
 .../acapendulum20/model/Measurement.kt        | 19 ++---
 .../com/example/acapendulum20/model/User.kt   |  1 -
 .../repository/MeasurementRepository.kt       | 10 +++
 .../viewmodel/MeasurementViewmodel.kt         | 25 ++++--
 .../acapendulum20/viewmodel/UserViewmodel.kt  |  4 +-
 .../res/layout/custom_row_measurement.xml     | 85 +++++++++++++++++++
 app/src/main/res/layout/fragment_pendulum.xml |  4 +-
 app/src/main/res/navigation/my_nav.xml        | 14 +--
 18 files changed, 272 insertions(+), 98 deletions(-)
 rename app/src/main/java/com/example/acapendulum20/data/{MeasurementDatabase.kt => PendulumDatabase.kt} (65%)
 delete mode 100644 app/src/main/java/com/example/acapendulum20/data/UserDatabase.kt
 create mode 100644 app/src/main/java/com/example/acapendulum20/fragments/update/SessionList.kt
 create mode 100644 app/src/main/res/layout/custom_row_measurement.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5292b8d..96b0eed 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,9 +11,10 @@
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/drawable/ic_launcher_background.xml" value="0.17" />
         <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/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.1" />
+        <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_start_pendulum.xml" value="0.33" />
         <entry key="..\:/Users/Feyzu/AndroidStudioProjects/acaPendulum20/app/src/main/res/layout/fragment_update.xml" value="0.33" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cbcbe74..4d9c6dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.acapendulum20">
+    package="com.example.acapendulum20"
+    android:versionCode="2">
+
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AcaPendulum20">
+
         <activity
             android:name=".MainActivity"
             android:exported="true">
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 0fa4b7b..fca999d 100644
--- a/app/src/main/java/com/example/acapendulum20/canvas/CanvasPendulum.kt
+++ b/app/src/main/java/com/example/acapendulum20/canvas/CanvasPendulum.kt
@@ -6,8 +6,8 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.util.AttributeSet
 import android.view.View
-import kotlin.math.cos
-import kotlin.math.sin
+import kotlinx.coroutines.delay
+import kotlin.math.*
 
 
 class CanvasPendulum @JvmOverloads constructor(
@@ -142,6 +142,13 @@ class CanvasPendulum @JvmOverloads constructor(
         println(magnet)
         mPendulum.magneticField = magnet
     }
+
+     fun getVelocity(): Double {
+            var currentVelocity = mPendulum.angleVelocity * 1000
+
+            val roundoff = (currentVelocity * 100.0).roundToInt() / 100.0
+            return abs(roundoff)
+    }
 }
 
 class Position(var x: Float, var y: Float) {
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 42e932d..69c21f0 100644
--- a/app/src/main/java/com/example/acapendulum20/data/MeasurementDao.kt
+++ b/app/src/main/java/com/example/acapendulum20/data/MeasurementDao.kt
@@ -11,5 +11,14 @@ interface MeasurementDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE )
     fun addMeasurement(measurement: Measurement)
 
+    @Update
+    fun  finishMeasurement(measurement: Measurement)
+
+    @Query("SELECT * FROM measurement_table WHERE owner =:id")
+    fun readAllData(id: String): LiveData<List<Measurement>>
+
+    @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/MeasurementDatabase.kt b/app/src/main/java/com/example/acapendulum20/data/PendulumDatabase.kt
similarity index 65%
rename from app/src/main/java/com/example/acapendulum20/data/MeasurementDatabase.kt
rename to app/src/main/java/com/example/acapendulum20/data/PendulumDatabase.kt
index 136d79b..9e5f224 100644
--- a/app/src/main/java/com/example/acapendulum20/data/MeasurementDatabase.kt
+++ b/app/src/main/java/com/example/acapendulum20/data/PendulumDatabase.kt
@@ -1,22 +1,22 @@
 package com.example.acapendulum20.data
 
 import android.content.Context
-import android.icu.util.Measure
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import com.example.acapendulum20.model.User
 import com.example.acapendulum20.model.Measurement
+import com.example.acapendulum20.model.User
 
-@Database(entities = [Measurement::class], version = 1, exportSchema = false)
-abstract class MeasurementDatabase: RoomDatabase() {
+@Database(entities = [Measurement::class, User::class], version = 1, exportSchema = false)
+abstract class PendulumDatabase: RoomDatabase() {
+    abstract fun userDao(): UserDao
     abstract fun measurementDao(): MeasurementDao
 
     companion object {
         @Volatile
-        private var INSTANCE: MeasurementDatabase? = null
+        private var INSTANCE: PendulumDatabase? = null
 
-        fun getDatabase(context: Context): MeasurementDatabase{
+        fun getDatabase(context: Context): PendulumDatabase{
             val tempInstance = INSTANCE
             if(tempInstance != null){
                 return tempInstance
@@ -24,8 +24,8 @@ abstract class MeasurementDatabase: RoomDatabase() {
             synchronized(this){
                 val instance = Room.databaseBuilder(
                     context.applicationContext,
-                    MeasurementDatabase::class.java,
-                    "measurement_database"
+                    PendulumDatabase::class.java,
+                    "user_database"
                 ).build()
                 INSTANCE = instance
                 return instance
diff --git a/app/src/main/java/com/example/acapendulum20/data/UserDatabase.kt b/app/src/main/java/com/example/acapendulum20/data/UserDatabase.kt
deleted file mode 100644
index ff15845..0000000
--- a/app/src/main/java/com/example/acapendulum20/data/UserDatabase.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.example.acapendulum20.data
-
-import android.content.Context
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
-import com.example.acapendulum20.model.User
-
-@Database(entities = [User::class], version = 1, exportSchema = false)
-abstract class UserDatabase: RoomDatabase() {
-    abstract fun userDao(): UserDao
-
-    companion object {
-        @Volatile
-        private var INSTANCE: UserDatabase? = null
-
-        fun getDatabase(context: Context): UserDatabase{
-            val tempInstance = INSTANCE
-            if(tempInstance != null){
-                return tempInstance
-            }
-            synchronized(this){
-                val instance = Room.databaseBuilder(
-                    context.applicationContext,
-                    UserDatabase::class.java,
-                    "user_database"
-                ).build()
-                INSTANCE = instance
-                return instance
-            }
-        }
-    }
-}
\ No newline at end of file
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 985c004..91db921 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
@@ -6,23 +6,26 @@ import android.os.CountDownTimer
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
-import android.view.View.OnTouchListener
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.example.acapendulum20.R
 import com.example.acapendulum20.canvas.CanvasPendulum
+import com.example.acapendulum20.model.Measurement
 import com.example.acapendulum20.viewmodel.MeasurementViewmodel
 import kotlinx.android.synthetic.main.fragment_pendulum.*
-import java.time.LocalDateTime
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
 
 
 class PendulumFragment : Fragment() {
 
     private val args by navArgs<PendulumFragmentArgs>()
-
     private lateinit var mMeasurementViewmodel: MeasurementViewmodel
 
     @SuppressLint("ClickableViewAccessibility")
@@ -33,35 +36,41 @@ class PendulumFragment : Fragment() {
         // Inflate the layout for this fragment
         val view = inflater.inflate(R.layout.fragment_pendulum, container, false)
         val mCanvasPendulum: CanvasPendulum = view.findViewById(R.id.canvasContainer)!!
+        mMeasurementViewmodel = ViewModelProvider(this).get(MeasurementViewmodel::class.java)
+
 
         //activate the magnet
-        val button = view.findViewById<Button>(R.id.activate_btn)
+        val magnetButton = view.findViewById<Button>(R.id.activate_btn)
 
         //Save results
+        val saveButton = view.findViewById<Button>(R.id.speichern_btn)
+
+        saveButton.setOnClickListener(){
+            finishMeasurement()
+        }
 
         //Show targetVelocity and maxAttemptTime
         val targetVelocity = view.findViewById<TextView>(R.id.targetVelocity_view)
         val maxAttemptTime = view.findViewById<TextView>(R.id.maxAttemptTime_view)
         val timer = view.findViewById<TextView>(R.id.timer_view)
+        val currentVelocity = view.findViewById<TextView>(R.id.actV_view)
 
-        targetVelocity.text = args.targetVelocity.toString()
-        maxAttemptTime.text = args.maxAttemptTime.toString()
-        //timer.text =
+        targetVelocity.text = args.measurement.targetVelocity.toString()
+        maxAttemptTime.text = args.measurement.maxAttemptTime.toString()
 
-        //time count down for 30 seconds
+        //time count down for "maxAttemptTime" seconds
         //with 1 second as countDown interval
-        object : CountDownTimer(args.maxAttemptTime.toLong()*1000, 1000){
-
+        object : CountDownTimer(args.measurement.maxAttemptTime*1000, 1000){
             override fun onTick(millisUntilFinished: Long) {
                 timer.setText("sec.: " + millisUntilFinished / 1000)
+                currentVelocity.setText((mCanvasPendulum.getVelocity().toString()) + "cm/s")
             }
-
             override fun onFinish() {
                 timer.setText("done!")
             }
         }.start()
 
-        button.setOnTouchListener(object : View.OnTouchListener{
+        magnetButton.setOnTouchListener(object : View.OnTouchListener{
             override fun onTouch(v: View?, event: MotionEvent?): Boolean {
                 if (event?.action == MotionEvent.ACTION_DOWN){
                     println("button action DOWN")
@@ -77,4 +86,13 @@ class PendulumFragment : Fragment() {
         })
         return view
     }
+
+    private fun finishMeasurement(){
+        val endTime = System.currentTimeMillis()
+        val measuredTime = endTime - args.measurement.startTime
+        val measurement = Measurement(args.measurement.id,args.measurement.targetVelocity,args.measurement.maxAttemptTime,args.measurement.measuredVelocity,measuredTime,args.measurement.startTime,endTime, args.measurement.owner)
+        mMeasurementViewmodel.finishMeasurement(measurement)
+        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/pendulum/StartPendulumFragment.kt b/app/src/main/java/com/example/acapendulum20/fragments/pendulum/StartPendulumFragment.kt
index 936ab61..abd31fe 100644
--- a/app/src/main/java/com/example/acapendulum20/fragments/pendulum/StartPendulumFragment.kt
+++ b/app/src/main/java/com/example/acapendulum20/fragments/pendulum/StartPendulumFragment.kt
@@ -21,7 +21,9 @@ import com.example.acapendulum20.viewmodel.MeasurementViewmodel
 import com.example.acapendulum20.viewmodel.UserViewmodel
 import kotlinx.android.synthetic.main.fragment_start_pendulum.*
 import kotlinx.android.synthetic.main.fragment_start_pendulum.view.*
+import java.time.Instant
 import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 import java.util.*
 
 class StartPendulumFragment: Fragment() {
@@ -40,23 +42,27 @@ class StartPendulumFragment: Fragment() {
 
         //navigate to pendulumFragment
         view.startPendulum_btn.setOnClickListener{
-            insertDataToDatabase()
+            startMeasurement()
         }
         return view
     }
-    private fun insertDataToDatabase() {
+    private fun startMeasurement() {
         val targetVelocity = (targetVelocity_et.text).toString()
         val maxAttemptTime = (maxAttemptTime_et.text).toString()
         val owner = args.owner
+        //val startTime = DateTimeFormatter.ISO_INSTANT.format(Instant.now())
+        val startTime = System.currentTimeMillis()
+
+        //println("${number::class.qualifiedName}") // "kotlin.Int"
 
         if(inputCheck(targetVelocity, maxAttemptTime)){
             //Create Measurement Object
-            val measurement = Measurement(UUID.randomUUID().toString(), targetVelocity.toFloat(),maxAttemptTime.toFloat(),0.0f,0.00f,0.00f,owner)
+            val measurement = Measurement(UUID.randomUUID().toString(), targetVelocity.toFloat(),maxAttemptTime.toLong(),0.00f,0,startTime,0,owner)
             //Add Data to Database
             mMeasurementViewmodel.addMeasurement(measurement)
             Toast.makeText(requireContext(),"Successfully added!", Toast.LENGTH_LONG).show()
             //Navigate Back
-            val action = StartPendulumFragmentDirections.actionStartPendulumFragmentToPendulumFragment(targetVelocity.toFloat(),maxAttemptTime.toFloat(),owner)
+            val action = StartPendulumFragmentDirections.actionStartPendulumFragmentToPendulumFragment(measurement, args.currentUser)
             findNavController().navigate(action)
         }else{
            Toast.makeText(requireContext(),"Please fill out all fields.", Toast.LENGTH_LONG).show()
diff --git a/app/src/main/java/com/example/acapendulum20/fragments/update/SessionList.kt b/app/src/main/java/com/example/acapendulum20/fragments/update/SessionList.kt
new file mode 100644
index 0000000..8f439a9
--- /dev/null
+++ b/app/src/main/java/com/example/acapendulum20/fragments/update/SessionList.kt
@@ -0,0 +1,49 @@
+package com.example.acapendulum20.fragments.list
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.navigation.findNavController
+import androidx.recyclerview.widget.RecyclerView
+import com.example.acapendulum20.R
+import com.example.acapendulum20.fragments.pendulum.PendulumFragmentDirections
+import com.example.acapendulum20.model.Measurement
+import com.example.acapendulum20.model.User
+import kotlinx.android.synthetic.main.custom_row.view.*
+import kotlinx.android.synthetic.main.custom_row_measurement.view.*
+import java.util.*
+
+class SessionList: RecyclerView.Adapter<SessionList.MyViewHolder>() {
+
+    private var sessionList = emptyList<Measurement>()
+
+    class MyViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
+        return MyViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.custom_row_measurement, parent, false))
+    }
+
+    override fun getItemCount(): Int {
+        return sessionList.size
+    }
+
+    override fun onBindViewHolder(holder: MyViewHolder, position: Int) {
+        val currentItem = sessionList[position]
+        holder.itemView.nr_txt.text = (position+1).toString()
+        holder.itemView.dateStart_txt.text = Date(currentItem.startTime).toString()
+        holder.itemView.dateEnd_txt.text = Date(currentItem.endTime).toString()
+        holder.itemView.targetVelocity_txt.text = currentItem.targetVelocity.toString()
+        holder.itemView.velocity_txt.text = currentItem.measuredVelocity.toString()
+        holder.itemView.maxTime_txt.text = currentItem.maxAttemptTime.toString()
+        holder.itemView.time_txt.text = currentItem.measuredTime.toString()
+    }
+
+    fun setData(measurement: List<Measurement>){
+        this.sessionList = measurement
+        notifyDataSetChanged()
+    }
+
+}
+
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 8fefa46..ad8146b 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
@@ -7,12 +7,18 @@ import android.text.TextUtils
 import android.view.*
 import androidx.fragment.app.Fragment
 import android.widget.Toast
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.acapendulum20.R
+import com.example.acapendulum20.fragments.list.SessionList
 import com.example.acapendulum20.model.User
+import com.example.acapendulum20.viewmodel.MeasurementViewmodel
 import com.example.acapendulum20.viewmodel.UserViewmodel
+import kotlinx.android.synthetic.main.fragment_list.view.*
 import kotlinx.android.synthetic.main.fragment_update.*
 import kotlinx.android.synthetic.main.fragment_update.view.*
 
@@ -21,6 +27,7 @@ class UpdateFragment : Fragment() {
     private val args by navArgs<UpdateFragmentArgs>()
 
     private lateinit var mUserViewModel: UserViewmodel
+    private lateinit var mMeasurementViewmodel: MeasurementViewmodel
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -29,7 +36,18 @@ class UpdateFragment : Fragment() {
         // Inflate the layout for this fragment
         val view = inflater.inflate(R.layout.fragment_update, container, false)
 
-        mUserViewModel = ViewModelProvider(this)[UserViewmodel::class.java]
+        //Recylerview
+        val adapter = SessionList()
+        val recyclerView = view.SessionRecyclerview
+        recyclerView.adapter = adapter
+        recyclerView.layoutManager = LinearLayoutManager(requireContext())
+
+        mUserViewModel = ViewModelProvider(this).get(UserViewmodel::class.java)
+        mMeasurementViewmodel = ViewModelProvider(this).get(MeasurementViewmodel::class.java)
+        //val measurmentAnzeigen = MeasurementViewmodel(this,args.currentUser.id)
+        mMeasurementViewmodel.readAllData.observe(viewLifecycleOwner, Observer { measurement ->
+            adapter.setData(measurement)
+        })
 
         view.updateFirstName_et.setText(args.currentUser.firstName)
         view.updateLastName_et.setText(args.currentUser.lastName)
@@ -40,7 +58,7 @@ class UpdateFragment : Fragment() {
         //navigate to fragment_start_pendulum
         view.startTest_btn.setOnClickListener{
             val owner = args.currentUser.id
-            val action = UpdateFragmentDirections.actionUpdateFragmentToStartPendulumFragment(owner)
+            val action = UpdateFragmentDirections.actionUpdateFragmentToStartPendulumFragment(owner, args.currentUser)
             findNavController().navigate(action)
         }
 
@@ -50,7 +68,7 @@ class UpdateFragment : Fragment() {
         }
 
         //Add menu
-        setHasOptionsMenu(true)
+        //setHasOptionsMenu(true)
 
         return view
     }
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 e59f540..4053cb7 100644
--- a/app/src/main/java/com/example/acapendulum20/model/Measurement.kt
+++ b/app/src/main/java/com/example/acapendulum20/model/Measurement.kt
@@ -11,21 +11,14 @@ import java.time.LocalDateTime
 
 @Parcelize
 @Entity(tableName = "measurement_table")
-/*, foreignKeys = [ForeignKey(entity = Session::class,
-    parentColumns = arrayOf("id"),
-    childColumns = arrayOf("sessionRef"),
-    onDelete = ForeignKey.CASCADE)]
-)
-
- */
 data class Measurement(
     @PrimaryKey
     val id: String,
     val targetVelocity: Float,
-    val maxAttemptTime: Float,
-    val attemptTime: Float,
-    val startTime: Float,
-    val endTime: Float,
+    val maxAttemptTime: Long,
+    val measuredVelocity: Float,
+    val measuredTime: Long,
+    val startTime: Long,
+    val endTime: Long,
     val owner: String,
-
-    ): Parcelable
+): 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 9f681a0..1791c4d 100644
--- a/app/src/main/java/com/example/acapendulum20/model/User.kt
+++ b/app/src/main/java/com/example/acapendulum20/model/User.kt
@@ -15,5 +15,4 @@ data class User (
     val age: Int,
     val sex: String,
     val handiness: String,
-
 ): Parcelable
\ No newline at end of file
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 5792a7a..3b7da9c 100644
--- a/app/src/main/java/com/example/acapendulum20/repository/MeasurementRepository.kt
+++ b/app/src/main/java/com/example/acapendulum20/repository/MeasurementRepository.kt
@@ -8,8 +8,18 @@ import com.example.acapendulum20.model.User
 
 class MeasurementRepository(private val measurementDao: MeasurementDao) {
 
+    val readAllData: LiveData<List<Measurement>> = measurementDao.readAllData()
+
     suspend fun addMeasurement(measurement: Measurement){
         measurementDao.addMeasurement(measurement)
     }
 
+    suspend fun finishMeasurement(measurement: Measurement){
+        measurementDao.finishMeasurement(measurement)
+    }
+
+    suspend fun readAllDataMeasurement(id: String){
+        var readAllData = measurementDao.readAllData(id)
+    }
+
 }
\ 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 97ff679..dad82c9 100644
--- a/app/src/main/java/com/example/acapendulum20/viewmodel/MeasurementViewmodel.kt
+++ b/app/src/main/java/com/example/acapendulum20/viewmodel/MeasurementViewmodel.kt
@@ -1,27 +1,26 @@
 package com.example.acapendulum20.viewmodel
 
 import android.app.Application
+import android.content.Context
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.acapendulum20.data.MeasurementDao
-import com.example.acapendulum20.data.MeasurementDatabase
-import com.example.acapendulum20.data.UserDatabase
-import com.example.acapendulum20.data.UserDatabase.Companion.getDatabase
+import com.example.acapendulum20.data.PendulumDatabase
 import com.example.acapendulum20.model.Measurement
-import com.example.acapendulum20.model.User
 import com.example.acapendulum20.repository.MeasurementRepository
-import com.example.acapendulum20.repository.UserRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class MeasurementViewmodel(application: Application): AndroidViewModel(application) {
 
-    private val repository: MeasurementRepository
+    val readAllData: LiveData<List<Measurement>>
+    private  val repository: MeasurementRepository
 
     init{
-        val measurementDao = MeasurementDatabase.getDatabase(application).measurementDao()
+        val measurementDao = PendulumDatabase.getDatabase(application).measurementDao()
         repository = MeasurementRepository(measurementDao)
+        readAllData = repository.readAllData
     }
 
     fun addMeasurement(measurement: Measurement){
@@ -30,5 +29,15 @@ class MeasurementViewmodel(application: Application): AndroidViewModel(applicati
         }
     }
 
+    fun finishMeasurement(measurement: Measurement){
+        viewModelScope.launch(Dispatchers.IO) {
+            repository.finishMeasurement(measurement)
+        }
+    }
 
+    fun readAllDataMeasurement(id: String){
+        viewModelScope.launch(Dispatchers.IO) {
+            repository.readAllDataMeasurement(id)
+        }
+    }
 }
\ 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 418e719..b41243f 100644
--- a/app/src/main/java/com/example/acapendulum20/viewmodel/UserViewmodel.kt
+++ b/app/src/main/java/com/example/acapendulum20/viewmodel/UserViewmodel.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
-import com.example.acapendulum20.data.UserDatabase
+import com.example.acapendulum20.data.PendulumDatabase
 import com.example.acapendulum20.repository.UserRepository
 import com.example.acapendulum20.model.User
 import kotlinx.coroutines.Dispatchers
@@ -16,7 +16,7 @@ class UserViewmodel(application: Application): AndroidViewModel(application) {
     private val repository: UserRepository
 
     init{
-        val userDao = UserDatabase.getDatabase(application).userDao()
+        val userDao = PendulumDatabase.getDatabase(application).userDao()
         repository = UserRepository(userDao)
         readAllData = repository.readAllData
     }
diff --git a/app/src/main/res/layout/custom_row_measurement.xml b/app/src/main/res/layout/custom_row_measurement.xml
new file mode 100644
index 0000000..423fe5a
--- /dev/null
+++ b/app/src/main/res/layout/custom_row_measurement.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/nr_txt"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="16dp"
+        android:text="Nr"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/dateStart_txt"
+        app:layout_constraintHorizontal_bias="0.571"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.022" />
+
+    <TextView
+        android:id="@+id/dateStart_txt"
+        android:layout_width="135dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="4dp"
+        android:text="Datum und Uhrzeit"
+        app:layout_constraintEnd_toStartOf="@+id/dateEnd_txt"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/targetVelocity_txt"
+        android:layout_width="135dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="60dp"
+        android:layout_marginTop="8dp"
+        android:text="targetVelocity"
+        app:layout_constraintEnd_toStartOf="@id/velocity_txt"
+        app:layout_constraintHorizontal_bias="0.2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/dateStart_txt" />
+
+    <TextView
+        android:id="@+id/velocity_txt"
+        android:layout_width="135dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="76dp"
+        android:text="velocity"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/dateEnd_txt" />
+
+    <TextView
+        android:id="@+id/maxTime_txt"
+        android:layout_width="135dp"
+        android:layout_height="24dp"
+        android:text="maxTime"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/time_txt"
+        app:layout_constraintHorizontal_bias="0.938"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/targetVelocity_txt"
+        app:layout_constraintVertical_bias="0.012" />
+
+    <TextView
+        android:id="@+id/time_txt"
+        android:layout_width="135dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="76dp"
+        android:text="time"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/velocity_txt" />
+
+    <TextView
+        android:id="@+id/dateEnd_txt"
+        android:layout_width="135dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="76dp"
+        android:text="DatumUhrzeitEnde"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 6b1d6f1..047da9d 100644
--- a/app/src/main/res/layout/fragment_pendulum.xml
+++ b/app/src/main/res/layout/fragment_pendulum.xml
@@ -85,8 +85,8 @@
 
     <com.example.acapendulum20.canvas.CanvasPendulum
         android:id="@+id/canvasContainer"
-        android:layout_width="407dp"
-        android:layout_height="462dp"
+        android:layout_width="62mm"
+        android:layout_height="70mm"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/navigation/my_nav.xml b/app/src/main/res/navigation/my_nav.xml
index 4a0a35b..660c6c4 100644
--- a/app/src/main/res/navigation/my_nav.xml
+++ b/app/src/main/res/navigation/my_nav.xml
@@ -52,6 +52,9 @@
         <argument
             android:name="owner"
             app:argType="string" />
+        <argument
+            android:name="currentUser"
+            app:argType="com.example.acapendulum20.model.User" />
     </fragment>
     <fragment
         android:id="@+id/pendulumFragment"
@@ -62,13 +65,10 @@
             android:id="@+id/action_pendulumFragment_to_updateFragment"
             app:destination="@id/updateFragment" />
         <argument
-            android:name="targetVelocity"
-            app:argType="float" />
-        <argument
-            android:name="maxAttemptTime"
-            app:argType="float" />
+            android:name="measurement"
+            app:argType="com.example.acapendulum20.model.Measurement" />
         <argument
-            android:name="owner"
-            app:argType="string" />
+            android:name="currentUser"
+            app:argType="com.example.acapendulum20.model.User" />
     </fragment>
 </navigation>
\ No newline at end of file