Fix code reviews

Still have some automatically generated unused code blocks and comments. Will delete them in the future, in case they will be used.

Author: butterflyforever

android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MainActivity.kt

@@ -7,16 +7,11 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
 
 class MainActivity : AppCompatActivity() {
 
-  private lateinit var runFragment: RunFragment
-  private lateinit var mapsFragment: MapsFragment
-  private lateinit var meFragment: MeFragment
-
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
 
-    runFragment = RunFragment()
+    val runFragment = RunFragment()
     supportFragmentManager
       .beginTransaction()
       .replace(R.id.fragment_container, runFragment)
@@ -28,7 +23,7 @@ class MainActivity : AppCompatActivity() {
       when (item.itemId) {
 
         R.id.bottom_navigation_item_run -> {
-          runFragment = RunFragment()
+          val runFragment = RunFragment()
           supportFragmentManager
             .beginTransaction()
             .replace(R.id.fragment_container, runFragment)
@@ -38,7 +33,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         R.id.bottom_navigation_item_map -> {
-          mapsFragment = MapsFragment()
+          val mapsFragment = MapsFragment()
           supportFragmentManager
             .beginTransaction()
             .replace(R.id.fragment_container, mapsFragment)
@@ -48,7 +43,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         R.id.bottom_navigation_item_profile -> {
-          meFragment = MeFragment()
+          val meFragment = MeFragment()
           supportFragmentManager
             .beginTransaction()
             .replace(R.id.fragment_container, meFragment)

android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/RunFragment.kt

@@ -2,15 +2,13 @@ package com.google.samples.quickstart.canonical
 
 import android.os.Bundle
 import android.os.SystemClock
-import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Chronometer
 import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
 import androidx.lifecycle.ViewModelProviders
 import com.google.samples.quickstart.canonical.databinding.FragmentRunBinding
 import kotlinx.android.synthetic.main.fragment_run.*
@@ -30,24 +28,19 @@ class RunFragment : Fragment() {
     private var param1: String? = null
     private var param2: String? = null
 
-    private lateinit var stopwatchViewModel: StopwatchView
-    private var pauseOffset = 0L
-    private var isWorking = false
-    private var fragmentPauseStartTime = 0L
+    private lateinit var stopwatchVM: StopwatchViewModel
+    private lateinit var binding : FragmentRunBinding
 
     private fun startStopTimer(chronometer : Chronometer) {
-        isWorking = if (!isWorking) {
-            chronometer.base = SystemClock.elapsedRealtime() - pauseOffset
+        if (!stopwatchVM.isWorking.value!!) {
+            chronometer.base = SystemClock.elapsedRealtime() - stopwatchVM.pauseOffset.value!!
             chronometer.start()
             chronometer.showContextMenu()
-            stopwatchViewModel.setWorkingStatus(true)
-            true
+            stopwatchVM.setWorkingStatus(true)
         } else {
-            pauseOffset = SystemClock.elapsedRealtime() - chronometer.base
             chronometer.stop()
-            stopwatchViewModel.setPauseOffset(SystemClock.elapsedRealtime() - chronometer.base)
-            stopwatchViewModel.setWorkingStatus(false)
-            false
+            stopwatchVM.setPauseOffset(SystemClock.elapsedRealtime() - chronometer.base)
+            stopwatchVM.setWorkingStatus(false)
         }
     }
 
@@ -58,22 +51,18 @@ class RunFragment : Fragment() {
             param2 = it.getString(ARG_PARAM2)
         }
 
-        stopwatchViewModel = activity?.run {
-            ViewModelProviders.of(this)[StopwatchView::class.java]
+        stopwatchVM = activity?.run {
+            ViewModelProviders.of(this)[StopwatchViewModel::class.java]
         } ?: throw Exception("Null Activity")
-
-        pauseOffset = stopwatchViewModel.pauseOffset.value!!
-        isWorking = stopwatchViewModel.isWorking.value!!
-        fragmentPauseStartTime = stopwatchViewModel.fragmentPauseStartTime.value!!
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        val binding : FragmentRunBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_run, container, false)
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_run, container, false)
         binding.lifecycleOwner = this
-        binding.stopwatchViewModel = stopwatchViewModel
+        binding.stopwatchViewModel = stopwatchVM
         return binding.root
     }
 
@@ -99,33 +88,29 @@ class RunFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val chronometer = view.findViewById<Chronometer>(R.id.chronometer)
-        val runBtn = view.findViewById<Button>(R.id.run_btn)
 
-        runBtn.setOnClickListener {
-            startStopTimer(chronometer)
+        binding.runBtn.setOnClickListener {
+            startStopTimer(binding.chronometer)
         }
 
     }
 
     override fun onResume() {
         super.onResume()
-        if (isWorking) {
-            chronometer?.base = fragmentPauseStartTime - pauseOffset
+        if (stopwatchVM.isWorking.value!!) {
+            chronometer?.base = stopwatchVM.fragmentPauseStartTime.value!! - stopwatchVM.pauseOffset.value!!
             chronometer?.start()
         } else {
-            chronometer?.base = SystemClock.elapsedRealtime() - pauseOffset
+            chronometer?.base = SystemClock.elapsedRealtime() - stopwatchVM.pauseOffset.value!!
             chronometer?.stop()
         }
     }
 
     override fun onPause() {
         super.onPause()
-        if (isWorking) {
-            pauseOffset = SystemClock.elapsedRealtime() - chronometer.base
-            fragmentPauseStartTime = SystemClock.elapsedRealtime()
-            stopwatchViewModel.setPauseOffset(pauseOffset)
-            stopwatchViewModel.setFragmentPauseStartTime(fragmentPauseStartTime)
+        if (stopwatchVM.isWorking.value!!) {
+            stopwatchVM.setPauseOffset(SystemClock.elapsedRealtime() - chronometer.base)
+            stopwatchVM.setFragmentPauseStartTime(SystemClock.elapsedRealtime())
         }
     }
 }

android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/StopwatchView.kt renamed to android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/StopwatchViewModel.kt

@@ -3,7 +3,7 @@ package com.google.samples.quickstart.canonical
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 
-class StopwatchView : ViewModel() {
+class StopwatchViewModel : ViewModel() {
 
     var pauseOffset = MutableLiveData<Long>(0L)
     var isWorking = MutableLiveData<Boolean>(false)

android/canonical/app/src/main/res/layout/fragment_run.xml

@@ -6,7 +6,7 @@
     <data>
         <variable
             name="stopwatchViewModel"
-            type="com.google.samples.quickstart.canonical.StopwatchView" />
+            type="com.google.samples.quickstart.canonical.StopwatchViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

android/canonical/app/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="color_primary">#6200EE</color>
-  <color name="color_primary_dark">#3700B3</color>
-  <color name="color_accent">#03DAC5</color>
+  <color name="colorPrimary">#6200EE</color>
+  <color name="colorPrimaryDark">#3700B3</color>
+  <color name="colorAccent">#03DAC5</color>
 </resources>

android/canonical/app/src/main/res/values/styles.xml

@@ -1,10 +1,7 @@
 <resources>
-  <!-- Base application theme. -->
   <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-    <!-- Customize your theme here. -->
-    <item name="colorPrimary">@color/color_primary</item>
-    <item name="colorPrimaryDark">@color/color_primary_dark</item>
-    <item name="colorAccent">@color/color_accent</item>
+    <item name="colorPrimary">@color/colorPrimary</item>
+    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+    <item name="colorAccent">@color/colorAccent</item>
   </style>
-
 </resources>