Code enhancement on code verification , closed #22

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="de.netalic.peacock">
+          xmlns:tools="http://schemas.android.com/tools" package="de.netalic.peacock">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
@@ -11,9 +11,9 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme"
-            android:name="de.netalic.MyApp">
-        <activity android:name=".MainActivity"
-                  android:windowSoftInputMode="adjustPan">
+            android:name="de.netalic.MyApp"
+            tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name=".MainActivity">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

app/src/main/java/de/netalic/peacock/MainActivity.kt

@@ -13,4 +13,5 @@ class MainActivity : AppCompatActivity() {
         supportFragmentManager.beginTransaction().add(R.id.frameLayout_mainActivity_fragmentContainer,
             CodeVerificationFragment()).commit()
     }
+
 }

app/src/main/java/de/netalic/peacock/ui/base/BaseFragment.kt

@@ -7,11 +7,13 @@ import androidx.fragment.app.Fragment
 abstract class BaseFragment : Fragment() {
 
     abstract fun initUiListener()
+    abstract fun initUiComponent()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         initUiListener()
+        initUiComponent()
     }
 
 }

app/src/main/java/de/netalic/peacock/ui/base/BaseViewModel.kt

@@ -5,10 +5,11 @@ import io.reactivex.disposables.CompositeDisposable
 
 open class BaseViewModel:ViewModel() {
 
-    var mCompositDisposable=CompositeDisposable()
+    var mCompositeDisposable=CompositeDisposable()
 
     override fun onCleared() {
         super.onCleared()
+        mCompositeDisposable.clear()
     }
 
 }

app/src/main/java/de/netalic/peacock/ui/registeration/codeverification/CodeVerificationFragment.kt

@@ -10,18 +10,17 @@ import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import de.netalic.peacock.R
-
 import de.netalic.peacock.data.model.Status
 import de.netalic.peacock.data.model.User
 import de.netalic.peacock.ui.base.BaseFragment
+import de.netalic.peacock.ui.util.CommonUtils
 import kotlinx.android.synthetic.main.fragment_codeverification.*
 import org.koin.android.viewmodel.ext.android.viewModel
 import java.util.concurrent.TimeUnit
 
 
 class CodeVerificationFragment : BaseFragment() {
 
-
     companion object {
 
         var sTimer = 30000
@@ -33,22 +32,20 @@ class CodeVerificationFragment : BaseFragment() {
 
     private val mCodeVerificationViewModel: CodeVerificationViewModel by viewModel()
 
-    private val mImageView by lazy { imageView_codeVerification_icon }
-    private val mTextViewPhoneNumber by lazy { textView_codeVerification_phoneNumber }
     private val mPinEntryEditText by lazy { pinEntryEditText_codeVerification_setPin }
     private val mButton by lazy { button_codeVerification_continue }
     private val mTextViewTimer by lazy { textView_codeVerification_resendTime }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 
-        mView = inflater.inflate(de.netalic.peacock.R.layout.fragment_codeverification, container, false)
+        mView = inflater.inflate(R.layout.fragment_codeverification, container, false)
         return mView
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        observeViewModel()
+
         setTimer()
         disableButton()
 
@@ -84,6 +81,7 @@ class CodeVerificationFragment : BaseFragment() {
                 if (p0!!.length == 6) {
 
                     enableButton()
+                    CommonUtils.hideSoftKeyboard(requireActivity())
                 } else {
                     disableButton()
                 }
@@ -92,6 +90,12 @@ class CodeVerificationFragment : BaseFragment() {
 
     }
 
+    override fun initUiComponent() {
+
+        observeViewModel()
+
+    }
+
     private fun bind() {
 
         mCodeVerificationViewModel.bind(

app/src/main/java/de/netalic/peacock/ui/registeration/codeverification/CodeVerificationViewModel.kt

@@ -56,7 +56,7 @@ class CodeVerificationViewModel(private val userRepository: UserRepository) : Ba
 
                 })
 
-        mCompositDisposable.add(disposable)
+        mCompositeDisposable.add(disposable)
     }
 
 }

app/src/main/java/de/netalic/peacock/ui/util/CommonUtil.kt

@@ -0,0 +1,17 @@
+package de.netalic.peacock.ui.util
+
+import android.app.Activity
+import android.view.inputmethod.InputMethodManager
+import androidx.fragment.app.FragmentActivity
+
+object CommonUtils {
+
+    fun hideSoftKeyboard(activity: FragmentActivity) {
+        val inputMethodManager = activity.getSystemService(
+            Activity.INPUT_METHOD_SERVICE
+        ) as InputMethodManager
+        inputMethodManager.hideSoftInputFromWindow(
+            activity.currentFocus!!.windowToken, 0
+        )
+    }
+}