Set timer with RX java , closed #39

Carrene · Jul 30, 2019 · 76b9fe7 · 76b9fe7
1 parent cb528c5
commit 76b9fe7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 27 deletions.
diff --git a/...ain/java/de/netalic/peacock/ui/registeration/codeverification/CodeVerificationFragment.kt b/...ain/java/de/netalic/peacock/ui/registeration/codeverification/CodeVerificationFragment.kt
@@ -153,7 +153,7 @@ class CodeVerificationFragment : BaseFragment() {
 
             when (it.data) {
 
-                "RESEND" -> {
+                getString(R.string.codeVerification_resendCode) -> {
 
                     onFinish()
                 }
@@ -190,10 +190,8 @@ class CodeVerificationFragment : BaseFragment() {
         }
     }
 
-
     private fun setTimer() {
 
-
     }
 
     private fun disableButton() {
@@ -204,6 +202,6 @@ class CodeVerificationFragment : BaseFragment() {
     private fun enableButton() {
 
         mButton.isEnabled = true
-        mButton.setTextColor(ContextCompat.getColor(requireContext(),R.color.colorPrimaryLight))
+        mButton.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorPrimaryLight))
     }
 }
diff --git a/...in/java/de/netalic/peacock/ui/registeration/codeverification/CodeVerificationViewModel.kt b/...in/java/de/netalic/peacock/ui/registeration/codeverification/CodeVerificationViewModel.kt
@@ -1,6 +1,5 @@
 package de.netalic.peacock.ui.registeration.codeverification
 
-import android.os.CountDownTimer
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import de.netalic.peacock.data.exception.ActivationCodeIsNotValid
@@ -11,21 +10,21 @@ import de.netalic.peacock.data.model.MyResponse
 import de.netalic.peacock.data.model.User
 import de.netalic.peacock.data.repository.UserRepository
 import de.netalic.peacock.ui.base.BaseViewModel
+import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
 import java.util.concurrent.TimeUnit
 
+
 class CodeVerificationViewModel(private val userRepository: UserRepository) : BaseViewModel() {
 
 
     companion object {
 
-        var sTimer = 30000
-        const val sResend="RESEND"
+        const val sResend = "RESEND"
     }
 
-    private lateinit var mCountDownTimer: CountDownTimer
     private val mBindResponseLiveData = MutableLiveData<MyResponse<ResponseBody>>()
     private val mTimerLiveData = MutableLiveData<MyResponse<String>>()
 
@@ -39,26 +38,30 @@ class CodeVerificationViewModel(private val userRepository: UserRepository) : Ba
         return mBindResponseLiveData
     }
 
-    fun setTimer() {
-
-
-        mCountDownTimer = object : CountDownTimer(sTimer.toLong(), 1000) {
-            override fun onTick(millisUntilFinished: Long) {
+    fun setTimer(time: Long = 30) {
 
-                val minuteTimer = TimeUnit.MILLISECONDS.toMinutes(millisUntilFinished)
-                val secondTimer = TimeUnit.MILLISECONDS.toSeconds(millisUntilFinished) - TimeUnit.MINUTES.toSeconds(
-                    TimeUnit.MILLISECONDS.toMinutes(millisUntilFinished)
-                )
-                mTimerLiveData.value = MyResponse.success(String.format("%02d:%02d ", minuteTimer, secondTimer))
-            }
-
-            override fun onFinish() {
+        val timerDisposable = Observable.interval(1, TimeUnit.SECONDS)
+            .take(time)
+            .map { 30 - it }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(
+                {
 
-                mTimerLiveData.value = MyResponse.success(sResend)
+                    val minuteTimer = TimeUnit.SECONDS.toMinutes(it)
+                    val secondTimer = TimeUnit.SECONDS.toSeconds(it) -
+                            TimeUnit.MINUTES.toSeconds(TimeUnit.SECONDS.toMinutes(it))
+                    mTimerLiveData.value = MyResponse.success(String.format("%02d:%02d ", minuteTimer, secondTimer))
+                },
+                {
 
-            }
+                },
+                {
+                    mTimerLiveData.value = MyResponse.success(sResend)
+                }
+              )
 
-        }.start()
+        mCompositeDisposable.add(timerDisposable)
     }
 
     fun bind(user: User) {

diff --git a/app/src/main/res/layout/fragment_codeverification.xml b/app/src/main/res/layout/fragment_codeverification.xml
@@ -17,9 +17,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/textView_codeVerification_codeVerification"
-            android:layout_marginBottom="@dimen/margin_all_20dp"
-
-    />
+            android:layout_marginBottom="@dimen/margin_all_20dp"/>
 
     <TextView
             android:id="@+id/textView_codeVerification_codeVerification"

diff --git a/...java/de/netalic/peacock/ui/registration/codeverification/CodeVerificationViewModelTest.kt b/...java/de/netalic/peacock/ui/registration/codeverification/CodeVerificationViewModelTest.kt
@@ -230,4 +230,13 @@ class CodeVerificationViewModelTest : BaseTest() {
         )
     }
 
+    @Test
+    fun setTimer() {
+
+        mCodeVerificationViewModel.setTimer(3)
+
+        Assert.assertEquals(LiveDataTestUtil.getValue(mCodeVerificationViewModel.getTimerLiveData()), 3)
+
+    }
+
 }