diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index dceaf5ee..ec4a0449 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt index e25d23ea..bd1a7d2b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -1,8 +1,8 @@ package com.moez.QKSMS.dagger import android.content.Context +import com.moez.QKSMS.ui.conversations.ConversationListActivity import com.moez.QKSMS.data.repository.ConversationRepository -import com.moez.QKSMS.ui.conversations.ConversationListFragment import dagger.Component import javax.inject.Singleton @@ -10,7 +10,7 @@ import javax.inject.Singleton @Component(modules = arrayOf(AppModule::class, ContactModule::class, ConversationsModule::class)) interface AppComponent { - fun inject(fragment: ConversationListFragment) + fun inject(activity: ConversationListActivity) fun provideContext(): Context fun provideConversationRepository(): ConversationRepository diff --git a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt similarity index 61% rename from qksms/src/main/java/com/moez/QKSMS/MainActivity.kt rename to qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index 5d743bb5..d7672e5c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -1,7 +1,8 @@ -package com.moez.QKSMS +package com.moez.QKSMS.ui.conversations import android.Manifest import android.os.Bundle +import android.support.v7.widget.LinearLayoutManager import android.util.Log import com.karumi.dexter.Dexter import com.karumi.dexter.PermissionToken @@ -9,16 +10,32 @@ import com.karumi.dexter.listener.PermissionDeniedResponse import com.karumi.dexter.listener.PermissionGrantedResponse import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.single.PermissionListener +import com.moez.QKSMS.R import com.moez.QKSMS.ui.base.QkActivity -import com.moez.QKSMS.ui.conversations.ConversationListFragment +import kotlinx.android.synthetic.main.conversation_list_activity.* +import javax.inject.Inject -class MainActivity : QkActivity() { +class ConversationListActivity : QkActivity() { val TAG = "MainActivity" + @Inject lateinit var viewModel: ConversationListViewModel + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.conversation_list_fragment) + setContentView(R.layout.conversation_list_activity) + getAppComponent()?.inject(this) + conversationList.layoutManager = LinearLayoutManager(this) + conversationList.adapter = ConversationAdapter(this, viewModel.conversations) + + swipeRefresh.setOnRefreshListener { + viewModel.onRefresh { swipeRefresh.isRefreshing = false } + } + + requestSmsPermission() + } + + private fun requestSmsPermission() { Dexter.withActivity(this) .withPermission(Manifest.permission.READ_SMS) .withListener(object : PermissionListener { @@ -34,7 +51,5 @@ class MainActivity : QkActivity() { } }) .check() - - supportFragmentManager.beginTransaction().replace(R.id.contentFrame, ConversationListFragment()).commit() } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt deleted file mode 100644 index b1ddd396..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.moez.QKSMS.ui.conversations - -import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import android.view.View -import com.moez.QKSMS.R -import com.moez.QKSMS.ui.base.QkFragment -import kotlinx.android.synthetic.main.conversation_list_fragment.* -import javax.inject.Inject - -class ConversationListFragment : QkFragment() { - - @Inject lateinit var viewModel: ConversationListViewModel - - override fun provideLayoutRes(): Int = R.layout.conversation_list_fragment - override fun provideMenuRes(): Int = R.menu.conversations - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - context.getAppComponent()?.inject(this) - } - - override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { - conversationList.layoutManager = LinearLayoutManager(context) - conversationList.adapter = ConversationAdapter(context, viewModel.conversations) - - swipeRefresh.setOnRefreshListener { - viewModel.onRefresh { swipeRefresh.isRefreshing = false } - } - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt index 972b3fda..a1665694 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt @@ -12,4 +12,9 @@ class ConversationListViewModel(val syncManager: SyncManager, repository: Conver syncManager.copyToRealm(completionListener::invoke) } + override fun onCleared() { + super.onCleared() + conversations.removeAllChangeListeners() + } + } \ No newline at end of file diff --git a/qksms/src/main/res/layout/base_activity.xml b/qksms/src/main/res/layout/base_activity.xml deleted file mode 100644 index f5c67aac..00000000 --- a/qksms/src/main/res/layout/base_activity.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/qksms/src/main/res/layout/conversation_list_fragment.xml b/qksms/src/main/res/layout/conversation_list_activity.xml similarity index 100% rename from qksms/src/main/res/layout/conversation_list_fragment.xml rename to qksms/src/main/res/layout/conversation_list_activity.xml diff --git a/qksms/src/main/res/menu/conversations.xml b/qksms/src/main/res/menu/conversations.xml deleted file mode 100644 index e73b6af7..00000000 --- a/qksms/src/main/res/menu/conversations.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file