store of weight corrections

senpl · Oct 24, 2020 · a7071db · a7071db
1 parent 9a93a73
commit a7071db
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/app/src/main/java/com/csvreader/CsvReader.kt b/app/src/main/java/com/csvreader/CsvReader.kt
@@ -896,7 +896,6 @@ class CsvReader {
         }
         values[columnCount] = currentValue
         isQualified!![columnCount] = startedWithQualifier
-        currentValue = ""
         columnCount++
     }
 

diff --git a/app/src/main/java/com/easyfitness/programs/ProgramRunner.kt b/app/src/main/java/com/easyfitness/programs/ProgramRunner.kt
@@ -110,12 +110,11 @@ class ProgramRunner : Fragment(R.layout.tab_program_runner) {
                             exercisesFromProgram = daoExerciseInProgram.getAllExerciseInProgram(programId)
                             if(exercisesFromProgram.isEmpty()){
                                 Toast.makeText(context, R.string.add_program_first, Toast.LENGTH_LONG).show()
-                                requireActivity().supportFragmentManager.commit {
-                                    addToBackStack(null)
-                                    val profileId: Int = (requireActivity() as MainActivity).currentProfile?.id?.toInt()!!
-                                    val programsFragment = ExercisesInProgramFragment.newInstance("", profileId)
-                                    add(R.id.fragment_container, programsFragment)
-                                }
+                                val transaction= requireActivity().supportFragmentManager.beginTransaction()
+                                val profileId: Int = (requireActivity() as MainActivity).currentProfile?.id?.toInt()!!
+                                val programsFragment = ExercisesInProgramFragment.newInstance("", profileId)
+                                transaction.replace(R.id.fragment_container,programsFragment)
+                                transaction.commit()
                             }
                             exerciseIndicator.initDots(exercisesFromProgram.size)
                             exerciseInProgramNumber.text = exercisesFromProgram.size.toString()
@@ -147,7 +146,6 @@ class ProgramRunner : Fragment(R.layout.tab_program_runner) {
                 }
             }
         }
-
         nextExerciseArrow.setOnClickListener(clickArrows)
         previousExerciseArrow.setOnClickListener(clickArrows)
         addButton.setOnClickListener(clickAddButton)
@@ -943,6 +941,8 @@ class ProgramRunner : Fragment(R.layout.tab_program_runner) {
     }
 
     private fun changeExerciseTypeUI(pType: Int) {
+        saveWeight.visibility = GONE
+        saveReps.visibility = GONE
         when (pType) {
             TYPE_CARDIO -> {
                 serieCardView.visibility = GONE

diff --git a/app/src/main/java/gr/antoniom/chronometer/Chronometer.kt b/app/src/main/java/gr/antoniom/chronometer/Chronometer.kt
@@ -7,6 +7,7 @@ import android.os.SystemClock
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatTextView
 import java.text.DecimalFormat
+import kotlin.math.abs
 
 /*
 * The Android chronometer widget revised so as to count milliseconds
@@ -59,10 +60,10 @@ import java.text.DecimalFormat
         updateRunning()
     }
 
-    fun setStarted(started: Boolean) {
-        mStarted = started
-        updateRunning()
-    }
+//    fun setStarted(started: Boolean) {
+//        mStarted = started
+//        updateRunning()
+//    }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
@@ -83,19 +84,19 @@ import java.text.DecimalFormat
         val hours = (timeElapsed / (3600 * 1000)).toInt()
         var remaining = (timeElapsed % (3600 * 1000)).toInt()
         val minutes = remaining / (60 * 1000)
-        remaining = remaining % (60 * 1000)
+        remaining %= (60 * 1000)
         val seconds = remaining / 1000
-        remaining = remaining % 1000
+//        remaining = remaining % 1000
         var milliseconds = 0
         if (mPreciseClock) {
             milliseconds = timeElapsed.toInt() % 1000 / 100
         }
         var text: String? = ""
         if (hours > 0) {
-            text += df.format(Math.abs(hours).toLong()) + ":"
+            text += df.format(abs(hours).toLong()) + ":"
         }
-        text += df.format(Math.abs(minutes).toLong()) + ":"
-        text += df.format(Math.abs(seconds).toLong())
+        text += df.format(abs(minutes).toLong()) + ":"
+        text += df.format(abs(seconds).toLong())
         if (mPreciseClock) text += ":$milliseconds"
         setText(text)
     }
@@ -131,7 +132,7 @@ import java.text.DecimalFormat
     }
 
     companion object {
-        private const val TAG = "Chronometer"
+//        private const val TAG = "Chronometer"
         private const val TICK_WHAT = 2
     }