Temporary branch

MLTestApplication/app/build.gradle

@@ -32,15 +32,15 @@ android {
         jvmTarget = '1.8'
 
     }
-    aaptOptions {
-        noCompress "tflite"
-    }
     buildFeatures{
         viewBinding = true
     }
     dataBinding{
         enabled = true
     }
+    androidResources {
+        noCompress 'tflite'
+    }
 }
 
 dependencies {

MLTestApplication/app/src/main/java/com/example/mltestapplication/MainActivity.kt

@@ -1,13 +1,20 @@
 package com.example.mltestapplication
 
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
 import android.annotation.SuppressLint
+import android.os.Bundle
+import android.os.CountDownTimer
 import android.util.Log
 import android.util.Size
-import androidx.core.content.ContextCompat
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import androidx.camera.core.*
 import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.LifecycleOwner
 import com.example.mltestapplication.databinding.ActivityMainBinding
@@ -20,26 +27,35 @@ import com.google.mlkit.vision.pose.Pose
 import com.google.mlkit.vision.pose.PoseDetection
 import com.google.mlkit.vision.pose.PoseDetector
 import com.google.mlkit.vision.pose.defaults.PoseDetectorOptions
+import kotlinx.android.synthetic.main.activity_main.*
+
 
 class MainActivity : AppCompatActivity(){
 
     private lateinit var binding: ActivityMainBinding
     private lateinit var poseDetector :  PoseDetector
     private lateinit var cameraProviderFuture: ListenableFuture<ProcessCameraProvider>
+    private lateinit var countdown_timer: CountDownTimer
+    private lateinit var start_button: Button
+    private var isActive : Boolean = false
+//    private lateinit var textView : TextView
+    private var isFinished : Boolean = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this,R.layout.activity_main)
 
-        //getSupportActionBar()?.hide()
+        supportActionBar?.hide()
 
         cameraProviderFuture = ProcessCameraProvider.getInstance(this)
 
         cameraProviderFuture.addListener({
-            Log.d("CALLED", "Called inside cameraProviderFuture.addListener")
             val cameraProvider = cameraProviderFuture.get()
             bindPreview(cameraProvider = cameraProvider)
         }, ContextCompat.getMainExecutor(this))
 
+
+
 //        val localModel = LocalModel.Builder()
 //            .setAbsoluteFilePath("pose_detection.tflite")
 //            .build()
@@ -49,16 +65,48 @@ class MainActivity : AppCompatActivity(){
             .build()
 
 
-
         poseDetector = PoseDetection.getClient(poseDetectorOptions)
 
+        start_button = findViewById(R.id.id_start_button) as Button
+        start_button.setOnClickListener{
+            startTimer(5)
+        }
+
+        id_stop_button.setOnClickListener{
+            isActive = false
+            isFinished = true
+            if (binding.parentLayout.childCount > 2) binding.parentLayout.removeViews(
+                2,
+                binding.parentLayout.childCount - 2
+            )
+        }
+        countdown.visibility = View.INVISIBLE
+        id_stop_button.visibility = View.INVISIBLE
+
+    }
+    private fun startTimer(time_in_seconds: Long) {
+        binding.parentLayout.removeView(start_button)
+        countdown.visibility = View.VISIBLE
+        countdown_timer = object : CountDownTimer(time_in_seconds*1000, 1000) {
+            override fun onFinish() {
+                isActive = true
+                binding.parentLayout.removeView(countdown)
+                id_stop_button.visibility = View.VISIBLE
+            }
+
+            override fun onTick(timeLeft: Long) {
+                countdown.text = (timeLeft/1000).toString()
+            }
+        }
+        countdown_timer.start()
+
+
     }
 
     @SuppressLint("UnsafeOptInUsageError")
     private fun bindPreview(cameraProvider: ProcessCameraProvider){
-        Log.d("CALLED", "Called Just inside Bind preview")
         val preview =  Preview.Builder().build()
-
+//        when true, analyses, displays and updates sets and reps of exercise
 
         //defining the camera, the prerequisites before opening the camera
         val cameraSelector = CameraSelector.Builder()
@@ -69,35 +117,42 @@ class MainActivity : AppCompatActivity(){
 
 
         val imageAnalysis = ImageAnalysis.Builder()
-            .setTargetResolution(Size(1280,720))
+            .setTargetResolution(Size(resources.displayMetrics.heightPixels / 2,resources.displayMetrics.widthPixels / 2 ))
             .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
             .build()
-        imageAnalysis.setAnalyzer(ContextCompat.getMainExecutor(this),{imageProxy ->
-            Log.d("CALLED", "Called inside imageAnalysis.setAnalyzer")
-            val rotationDegrees = imageProxy.imageInfo.rotationDegrees
 
-            val image = imageProxy.image
 
-            if(image != null){
-                val processImage = InputImage.fromMediaImage(image, rotationDegrees)
-                var element : DrawExercise
-                val result : Task<Pose> = poseDetector
-                        .process(processImage)
-                    .addOnSuccessListener { pose ->
-//                        val allPoseLandmarks = pose.allPoseLandmarks
-                        Log.d("CALLED", "Called inside poseDetector.onSuccessListener")
-                        if (binding.parentLayout.childCount > 1) binding.parentLayout.removeViews( 1,
-                            binding.parentLayout.childCount - 1)
-                            element =DrawExercise(ExerciseType.DumbellCurl_Type,context=this, pose)
-                            binding.parentLayout.addView(element)
-                        imageProxy.close()
-                    }.addOnFailureListener {
-                        Log.v("MainActivity", "Error - ${it.message}")
-                        imageProxy.close()
-                    }
-            }
-        })
+            imageAnalysis.setAnalyzer(ContextCompat.getMainExecutor(this), { imageProxy ->
+                val rotationDegrees = imageProxy.imageInfo.rotationDegrees
 
+                val image = imageProxy.image
+                if (image != null) {
+                    val processImage = InputImage.fromMediaImage(image, rotationDegrees)
+                    var element: DrawExercise
+                    val result: Task<Pose> = poseDetector
+                        .process(processImage)
+                        .addOnSuccessListener { pose ->
+                            if(isActive && !isFinished){
+                                if (binding.parentLayout.childCount > 2) binding.parentLayout.removeViews(
+                                    2,
+                                    binding.parentLayout.childCount - 2
+                                )
+                                element = DrawExercise(
+                                    ExerciseType.DumbellCurl_Type,
+                                    context = this,
+                                    pose,
+                                    isActive = true
+                                )
+                                isFinished = element.giveIsFinished()
+                                binding.parentLayout.addView(element)
+                            }
+                            imageProxy.close()
+                        }.addOnFailureListener {
+                            Log.v("MainActivity", "Error - ${it.message}")
+                            imageProxy.close()
+                        }
+                }
+            })
         cameraProvider.bindToLifecycle(this as LifecycleOwner, cameraSelector, imageAnalysis, preview)
     }
 }

MLTestApplication/app/src/main/java/com/example/mltestapplication/new/Draw.kt

@@ -1,13 +1,20 @@
 package com.example.mltestapplication.new
 
+import android.app.Activity
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.*
+import android.os.Build
+import android.util.DisplayMetrics
 import android.util.Log
 import android.view.View
 import android.widget.Toast
 import com.google.mlkit.vision.pose.Pose
 import java.lang.Exception
 
+
+
+
 class Draw(context: Context) : View(context) {
     //context: Context?, var pose : Pose, val jointsMap : Map<String, PointF>, val linesList : List<Pair<PointF?,PointF?>>, var errorText : MutableList<String>
     //, val redJointsMap : Map<String, PointF>,val sets: Int, val reps : Int
@@ -18,18 +25,21 @@ class Draw(context: Context) : View(context) {
     lateinit var linePaint: Paint
     lateinit var repBoxPaint: Paint
 
-    var xOffset = -275f
-    var yOffset = 250f
-    var scalex = 1.5f
-    var scaley = 1.5f
-
+    var xOffset = -525
+    var yOffset = 100
+    var scalex = 2f
+    var scaley = 2f
+    var widthPixels = resources.displayMetrics.widthPixels
     init {
         init()
     }
 
     val widthRatio = 1280f/480f
     val heightRatio = 720f/360f
-
+//    getWindowManager().getDefaultDisplay().getMetrics(metrics);
+//    width1 = metrics.widthPixels;
+//    height1 = metrics.heightPixels;
+//
     private fun init(){
         try {
             pointCorrectPaint = Paint()
@@ -43,7 +53,7 @@ class Draw(context: Context) : View(context) {
             textPaint = Paint()
             textPaint.color = Color.BLACK
             textPaint.style = Paint.Style.FILL
-            textPaint.textSize =50f
+            textPaint.textSize =100f
 
             linePaint = Paint()
             linePaint.color = Color.GREEN
@@ -71,13 +81,13 @@ class Draw(context: Context) : View(context) {
                 "widthPixels = ${resources.displayMetrics.widthPixels}\n")
         try{
             for (joint in jointsMap){
-                val x = joint.value.x * scalex + xOffset
-                val y = joint.value.y * scaley + yOffset
+                val x = adjustX(joint.value.x)
+                val y = adjustY(joint.value.y)
                 canvas.drawCircle(x,y,10f, pointCorrectPaint)
             }
             for (joint in redJointsMap){
-                val x = joint.value.x * scalex + xOffset
-                val y = joint.value.y * scaley + yOffset
+                val x = adjustX(joint.value.x)
+                val y = adjustY(joint.value.y)
                 canvas.drawCircle(x,y,10f, pointIncorrectPaint)
             }
         }catch (e: Exception){
@@ -89,24 +99,32 @@ class Draw(context: Context) : View(context) {
 
         try{
             for (line in linesList) {
-                var point1x = (line.first?.x ?: 5000f) * scalex + xOffset
-                var point1y = (line.first?.y ?: 5000f) * scaley + yOffset
-                var point2x = (line.second?.x ?: 5000f) * scalex + xOffset
-                var point2y = (line.second?.y ?: 5000f) * scaley + yOffset
+                var point1x = adjustX(line.first?.x ?: 5000f)
+                var point1y = adjustY(line.first?.y ?: 5000f)
+                var point2x = adjustX(line.second?.x ?: 5000f)
+                var point2y = adjustY(line.second?.y ?: 5000f)
                 if(point1x === 5000f || point1y === 5000f || point2x === 5000f || point2y === 5000f){
                     return
                 }
                 canvas.drawLine(point1x, point1y, point2x, point2y, linePaint)
             }
         }catch (e: Exception){
             Log.e("drawLines", "Problem in drawLines of Draw class , msg: $e")
-            Toast.makeText(context,"Error in drawLines, check logs", Toast.LENGTH_LONG)
+            Toast.makeText(context,"Error in drawLines,S check logs", Toast.LENGTH_LONG)
         }
     }
 
     public fun drawRepsAndSets(canvas: Canvas, reps : Int, sets: Int){
-        canvas.drawRect(700f,0f,1000f,200f,repBoxPaint )
-        canvas.drawText("Reps: $reps",710f,20f,textPaint)
-        canvas.drawText("Sets: $sets",710f,80f,textPaint)
+        canvas.drawRect(700f,100f,1200f,500f,repBoxPaint )
+        canvas.drawText("Reps: $reps",710f,200f,textPaint)
+        canvas.drawText("Sets: $sets",710f,300f,textPaint)
+    }
+
+    private fun adjustX(x: Float):Float{
+        return (x * scalex) + xOffset;
+    }
+    private fun adjustY(y: Float):Float{
+        return (y * scaley) + yOffset;
     }
 }
+

MLTestApplication/app/src/main/java/com/example/mltestapplication/new/DrawExercise.kt

@@ -3,13 +3,17 @@ package com.example.mltestapplication.new
 import android.content.Context
 import android.graphics.Canvas
 import android.view.View
+import android.view.ViewParent
 import com.google.mlkit.vision.pose.Pose
 
 //This is a custom view
-class DrawExercise(exerciseType: ExerciseType,context: Context,pose: Pose): View(context) {
-    var exercise = Factory().getExercise(ExerciseType.DumbellCurl_Type,context, pose)
+class DrawExercise(exerciseType: ExerciseType,context: Context,pose: Pose,isActive : Boolean): View(context) {
+    var exercise = Factory().getExercise(ExerciseType.DumbellCurl_Type,context, pose,isActive)
     override fun onDraw(canvas: Canvas?) {
         var newCanvas = exercise?.drawing(canvas)
         super.onDraw(newCanvas)
     }
+    fun giveIsFinished(): Boolean{
+        return exercise?.giveIsFinished() ?: false
+    }
 }