Resolve conflics

openMF · Jun 2, 2020 · 54f24cd · 54f24cd
1 parent 10b27a5
commit 54f24cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
@@ -34,11 +34,6 @@ class ClientProfileActivity : AppCompatActivity() , ClientProfileMVPView {
             val intent= Intent(applicationContext, NewPPISurveyActivity::class.java)
             startActivity(intent)
         }
-
-        setSupportActionBar(appToolbar)
-        val actionBar = supportActionBar
-        actionBar?.title = "Client Profile"
-
     }
     override fun setClientDetails(client : Client) {
         binding.clientIdValue.text = client.entityId.toString()

diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
@@ -1,5 +1,6 @@
 package org.mifos.visionppi.ui.home
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.ConnectivityManager
@@ -57,8 +58,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 search_query.onEditorAction(EditorInfo.IME_ACTION_DONE)
                 if (search_query.text.toString().length == 0)
                     searchError()
-                else
+                else {
+                    val inputMethodManager = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+                    inputMethodManager.hideSoftInputFromWindow(search_btn.windowToken, 0)
                     search(search_query.text.toString())
+                }
             } else {
                 showToastMessage("Internet connection not available. Please check network settings")
             }