updated onVMMessage, removed reset to portraitOrientation

Luteoos · Mar 13, 2019 · ccb59f9 · ccb59f9
1 parent 139a3df
commit ccb59f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/mvvmBaseLib/src/main/java/com/luteoos/kotlin/mvvmbaselib/BaseActivityMVVM.kt b/mvvmBaseLib/src/main/java/com/luteoos/kotlin/mvvmbaselib/BaseActivityMVVM.kt
@@ -21,7 +21,6 @@ abstract class BaseActivityMVVM<T: BaseViewModel> : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         hideKeyboard()
-        setPortraitOrientation(true)
         setContentView(getLayoutID())
     }
 
@@ -35,7 +34,9 @@ abstract class BaseActivityMVVM<T: BaseViewModel> : AppCompatActivity() {
     /**
      * override it to handle message from ViewModel
      */
-    abstract fun onVMMessage(msg: String?)
+    open fun onVMMessage(msg: String?){
+
+    }
 
     override fun onBackPressed() {
         hideKeyboard()
@@ -51,14 +52,15 @@ abstract class BaseActivityMVVM<T: BaseViewModel> : AppCompatActivity() {
         viewModel.detachDisposable()
         super.onDestroy()
     }
-    protected fun setPortraitOrientation(isPortrait: Boolean) {
+
+    fun setPortraitOrientation(isPortrait: Boolean) {
         when(isPortrait){
             true -> requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
             false -> requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
         }
     }
 
-    protected fun hideKeyboard(){
+    fun hideKeyboard(){
         if(this.currentFocus != null){
             val inputMng = this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
             inputMng.hideSoftInputFromWindow(this.currentFocus!!.windowToken, 0)

diff --git a/mvvmBaseLib/src/main/java/com/luteoos/kotlin/mvvmbaselib/BaseFragmentMVVM.kt b/mvvmBaseLib/src/main/java/com/luteoos/kotlin/mvvmbaselib/BaseFragmentMVVM.kt
@@ -33,7 +33,9 @@ abstract class BaseFragmentMVVM<T: BaseViewModel> : Fragment(){
     /**
      * override it to handle message from ViewModel
      */
-    abstract fun onVMMessage(msg: String?)
+    open fun onVMMessage(msg: String?){
+
+    }
 
     override fun onStop() {
         super.onStop()
@@ -45,7 +47,7 @@ abstract class BaseFragmentMVVM<T: BaseViewModel> : Fragment(){
         viewModel.detachDisposable()
     }
 
-    protected fun hideKeyboard(){
+    fun hideKeyboard(){
         if(activity!!.currentFocus != null){
             val inputMng = activity!!.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
             inputMng.hideSoftInputFromWindow(activity!!.currentFocus!!.windowToken, 0)

diff --git a/mvvmBaseLib/src/main/java/com/luteoos/kotlin/mvvmbaselib/BaseFragmentMVVMWithoutVM.kt b/mvvmBaseLib/src/main/java/com/luteoos/kotlin/mvvmbaselib/BaseFragmentMVVMWithoutVM.kt
@@ -20,7 +20,7 @@ abstract class BaseFragmentMVVMWithoutVM : Fragment() {
         return inflater.inflate(getLayoutID(), container, false)
     }
 
-    protected fun hideKeyboard(){
+    fun hideKeyboard(){
         if(activity!!.currentFocus != null){
             val inputMng = activity!!.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
             inputMng.hideSoftInputFromWindow(activity!!.currentFocus!!.windowToken, 0)