diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index e3761422..ad3696e1 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ android:theme="@style/AppTheme"> diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt index 5d014a7e..577c89b9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt @@ -1,9 +1,9 @@ package com.moez.QKSMS.common.di import com.moez.QKSMS.common.util.NotificationManager -import com.moez.QKSMS.presentation.conversations.ConversationsActivity -import com.moez.QKSMS.presentation.conversations.ConversationsAdapter -import com.moez.QKSMS.presentation.conversations.ConversationsViewModel +import com.moez.QKSMS.presentation.main.MainActivity +import com.moez.QKSMS.presentation.main.ConversationsAdapter +import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.messages.MessagesActivity import com.moez.QKSMS.presentation.messages.MessagesAdapter import com.moez.QKSMS.presentation.messages.MessagesViewModel @@ -17,7 +17,7 @@ import javax.inject.Singleton @Component(modules = arrayOf(AppModule::class)) interface AppComponent { - fun inject(activity: ConversationsActivity) + fun inject(activity: MainActivity) fun inject(activity: MessagesActivity) fun inject(adapter: ConversationsAdapter) @@ -34,7 +34,7 @@ interface AppComponent { fun inject(view: AvatarView) - fun inject(viewModel: ConversationsViewModel) + fun inject(viewModel: MainViewModel) fun inject(viewModel: MessagesViewModel) fun inject(viewModel: SettingsViewModel) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt index e7f48869..4abd3696 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt @@ -15,7 +15,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.receiver.MarkReadReceiver import com.moez.QKSMS.receiver.MarkSeenReceiver import com.moez.QKSMS.receiver.RemoteMessagingReceiver -import com.moez.QKSMS.presentation.conversations.ConversationsActivity +import com.moez.QKSMS.presentation.main.MainActivity import javax.inject.Inject import javax.inject.Singleton @@ -60,7 +60,7 @@ class NotificationManager @Inject constructor( style.addMessage(message.body, message.date, name) } - val contentIntent = Intent(context, ConversationsActivity::class.java).putExtra("threadId", threadId) + val contentIntent = Intent(context, MainActivity::class.java).putExtra("threadId", threadId) val contentPI = PendingIntent.getActivity(context, threadId.toInt() + 10000, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT) val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt index 79f390f8..5e318dc0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt @@ -4,7 +4,7 @@ import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModelProvider import android.content.Context import android.content.Intent -import com.moez.QKSMS.presentation.conversations.ConversationsViewModel +import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.messages.MessagesActivity import com.moez.QKSMS.presentation.messages.MessagesViewModel import com.moez.QKSMS.presentation.settings.SettingsActivity @@ -37,8 +37,8 @@ class Navigator @Inject constructor(val context: Context) { override fun create(modelClass: Class): T { return when (modelClass) { - ConversationsViewModel::class.java -> { - ConversationsViewModel() + MainViewModel::class.java -> { + MainViewModel() } MessagesViewModel::class.java -> { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt similarity index 97% rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsAdapter.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index 507938a8..15005404 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.conversations +package com.moez.QKSMS.presentation.main import android.content.Context import android.view.LayoutInflater diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt similarity index 92% rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 9f68823d..a4635035 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.conversations +package com.moez.QKSMS.presentation.main import android.Manifest import android.content.Intent @@ -23,11 +23,11 @@ import kotlinx.android.synthetic.main.toolbar.* import timber.log.Timber import javax.inject.Inject -class ConversationsActivity : QkActivity(), ConversationsView { +class MainActivity : QkActivity(), MainView { @Inject lateinit var navigator: Navigator - override val viewModelClass = ConversationsViewModel::class + override val viewModelClass = MainViewModel::class override val composeIntent by lazy { compose.clicks() } override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) } override val archivedIntent by lazy { archived.clicks() } @@ -56,7 +56,7 @@ class ConversationsActivity : QkActivity navigator.showConversation(threadId) } } - override fun render(state: ConversationsState) { + override fun render(state: MainState) { if (conversationList.adapter != state.adapter) { conversationList.adapter = state.adapter } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt similarity index 69% rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsState.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt index 283b3448..fec748f5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt @@ -1,8 +1,8 @@ -package com.moez.QKSMS.presentation.conversations +package com.moez.QKSMS.presentation.main import android.support.v7.widget.RecyclerView -data class ConversationsState( +data class MainState( val adapter: RecyclerView.Adapter<*>? = null, val refreshing: Boolean = false, val drawerOpen: Boolean = false diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt similarity index 75% rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt index 9df44a84..d5e095c2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt @@ -1,9 +1,9 @@ -package com.moez.QKSMS.presentation.conversations +package com.moez.QKSMS.presentation.main import com.moez.QKSMS.presentation.base.QkView import io.reactivex.Observable -interface ConversationsView : QkView { +interface MainView : QkView { val composeIntent: Observable val drawerOpenIntent: Observable diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt similarity index 87% rename from qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index 91d896fa..7852f99d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.conversations +package com.moez.QKSMS.presentation.main import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository @@ -8,7 +8,7 @@ import com.moez.QKSMS.presentation.base.QkViewModel import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject -class ConversationsViewModel : QkViewModel(ConversationsState()) { +class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var navigator: Navigator @Inject lateinit var messageRepo: MessageRepository @@ -24,7 +24,7 @@ class ConversationsViewModel : QkViewModel