diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt index 7ace0d3a..42070161 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkActivity.kt @@ -1,17 +1,9 @@ package com.moez.QKSMS.ui.base -import android.arch.lifecycle.LifecycleRegistry -import android.arch.lifecycle.LifecycleRegistryOwner import android.support.v7.app.AppCompatActivity import android.view.MenuItem -abstract class QkActivity : AppCompatActivity(), LifecycleRegistryOwner { - - private val mRegistry = LifecycleRegistry(this) - - override fun getLifecycle(): LifecycleRegistry { - return mRegistry - } +abstract class QkActivity : AppCompatActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { return when(item.itemId) { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt deleted file mode 100644 index e67a3498..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/ui/base/QkFragment.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.moez.QKSMS.ui.base - -import android.arch.lifecycle.LifecycleFragment -import android.os.Bundle -import android.view.* - -abstract class QkFragment : LifecycleFragment() { - - abstract fun provideLayoutRes(): Int - open fun provideMenuRes(): Int = 0 - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setHasOptionsMenu(provideMenuRes() != 0) - } - - final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { - return inflater.inflate(provideLayoutRes(), container, false) - } - - final override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - if (provideMenuRes() != 0) inflater.inflate(provideMenuRes(), menu) - super.onCreateOptionsMenu(menu, inflater) - } - - override fun getContext(): QkActivity { - return super.getContext() as QkActivity - } - -} \ No newline at end of file