From 4d4202e2b70ebb2e15e9a1eadc5b1ef61ef3014c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 11 Dec 2017 13:06:44 -0500 Subject: [PATCH] Refactor presentation packages --- .../com/moez/QKSMS/common/di/AppComponent.kt | 2 +- .../com/moez/QKSMS/presentation/Navigator.kt | 4 --- .../{ => common}/base/QkActivity.kt | 2 +- .../{ => common}/base/QkAdapter.kt | 2 +- .../presentation/{ => common}/base/QkView.kt | 2 +- .../{ => common}/base/QkViewHolder.kt | 2 +- .../{ => common}/base/QkViewModel.kt | 2 +- .../{view => common/widget}/AvatarView.kt | 2 +- .../widget}/GroupAvatarView.kt | 2 +- .../{view => common/widget}/PreferenceView.kt | 2 +- .../{view => common/widget}/QkEditText.kt | 2 +- .../{view => common/widget}/QkSwitch.kt | 2 +- .../{view => common/widget}/QkTextView.kt | 2 +- .../{view => common/widget}/Separator.kt | 2 +- .../{view => common/widget}/TightTextView.kt | 2 +- .../presentation/compose/ChipsAdapter.kt | 4 +-- .../presentation/compose/ComposeActivity.kt | 2 +- .../QKSMS/presentation/compose/ComposeView.kt | 2 +- .../presentation/compose/ComposeViewModel.kt | 2 +- .../presentation/compose/ContactAdapter.kt | 4 +-- .../presentation/compose/MessagesAdapter.kt | 2 +- .../presentation/main/ConversationsAdapter.kt | 4 +-- .../QKSMS/presentation/main/MainActivity.kt | 2 +- .../moez/QKSMS/presentation/main/MainView.kt | 2 +- .../QKSMS/presentation/main/MainViewModel.kt | 2 +- .../presentation/settings/SettingsActivity.kt | 4 +-- .../presentation/settings/SettingsView.kt | 4 +-- .../settings/SettingsViewModel.kt | 2 +- .../presentation/settings/ThemeAdapter.kt | 4 +-- qksms/src/main/res/layout/avatar_view.xml | 4 +-- .../main/res/layout/chip_input_list_item.xml | 2 +- .../src/main/res/layout/compose_activity.xml | 4 +-- qksms/src/main/res/layout/contact_chip.xml | 4 +-- .../main/res/layout/contact_chip_detailed.xml | 6 ++--- .../src/main/res/layout/contact_list_item.xml | 6 ++--- .../res/layout/conversation_list_item.xml | 8 +++--- .../layout/conversation_list_item_unread.xml | 8 +++--- qksms/src/main/res/layout/drawer_view.xml | 12 ++++----- .../src/main/res/layout/group_avatar_view.xml | 8 +++--- .../main/res/layout/message_list_item_in.xml | 8 +++--- .../main/res/layout/message_list_item_out.xml | 6 ++--- qksms/src/main/res/layout/preference_view.xml | 6 ++--- .../src/main/res/layout/settings_activity.xml | 26 +++++++++---------- .../res/layout/settings_switch_widget.xml | 2 +- qksms/src/main/res/layout/toolbar.xml | 2 +- qksms/src/main/res/layout/toolbar_chips.xml | 2 +- qksms/src/main/res/layout/toolbar_search.xml | 2 +- 47 files changed, 92 insertions(+), 96 deletions(-) rename qksms/src/main/java/com/moez/QKSMS/presentation/{ => common}/base/QkActivity.kt (98%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{ => common}/base/QkAdapter.kt (97%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{ => common}/base/QkView.kt (56%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{ => common}/base/QkViewHolder.kt (73%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{ => common}/base/QkViewModel.kt (94%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{view => common/widget}/AvatarView.kt (98%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{view => common/widget}/GroupAvatarView.kt (96%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{view => common/widget}/PreferenceView.kt (96%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{view => common/widget}/QkEditText.kt (97%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{view => common/widget}/QkSwitch.kt (97%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{view => common/widget}/QkTextView.kt (96%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{view => common/widget}/Separator.kt (94%) rename qksms/src/main/java/com/moez/QKSMS/presentation/{view => common/widget}/TightTextView.kt (93%) 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 ed1ba6f3..d850a229 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,6 +1,7 @@ package com.moez.QKSMS.common.di import com.moez.QKSMS.common.util.ContactImageLoader +import com.moez.QKSMS.presentation.common.widget.* import com.moez.QKSMS.presentation.compose.ComposeActivity import com.moez.QKSMS.presentation.compose.ComposeViewModel import com.moez.QKSMS.presentation.compose.DetailedChipView @@ -8,7 +9,6 @@ import com.moez.QKSMS.presentation.main.MainActivity import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.settings.SettingsActivity import com.moez.QKSMS.presentation.settings.SettingsViewModel -import com.moez.QKSMS.presentation.view.* import com.moez.QKSMS.receiver.* import dagger.Component import javax.inject.Singleton 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 454756cc..81e9b93f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt @@ -5,7 +5,6 @@ import android.arch.lifecycle.ViewModelProvider import android.content.Context import android.content.Intent import android.net.Uri -import android.provider.ContactsContract import com.moez.QKSMS.presentation.compose.ComposeActivity import com.moez.QKSMS.presentation.compose.ComposeViewModel import com.moez.QKSMS.presentation.main.MainViewModel @@ -15,9 +14,6 @@ import javax.inject.Inject import javax.inject.Singleton - - - @Singleton class Navigator @Inject constructor(val context: Context) { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt similarity index 98% rename from qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt index 6ee0e493..fc063419 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.base +package com.moez.QKSMS.presentation.common.base import android.annotation.SuppressLint import android.arch.lifecycle.ViewModelProviders diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkAdapter.kt similarity index 97% rename from qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkAdapter.kt index 6c4478c3..aa55e631 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkAdapter.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.base +package com.moez.QKSMS.presentation.common.base import android.support.v7.util.DiffUtil import android.support.v7.widget.RecyclerView diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkView.kt similarity index 56% rename from qksms/src/main/java/com/moez/QKSMS/presentation/base/QkView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkView.kt index 3cf6ec9c..31432951 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkView.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.base +package com.moez.QKSMS.presentation.common.base interface QkView { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewHolder.kt similarity index 73% rename from qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewHolder.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewHolder.kt index 08d81f4c..e9728b5a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewHolder.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewHolder.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.base +package com.moez.QKSMS.presentation.common.base import android.support.v7.widget.RecyclerView import android.view.View diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewModel.kt similarity index 94% rename from qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewModel.kt index 1df0aa2c..ba4a70d4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewModel.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.base +package com.moez.QKSMS.presentation.common.base import android.arch.lifecycle.ViewModel import android.support.annotation.CallSuper diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt similarity index 98% rename from qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt index ac5b135c..2e285009 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.view +package com.moez.QKSMS.presentation.common.widget import android.content.Context import android.net.Uri diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt similarity index 96% rename from qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt index e4402bdc..42f9dc1a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.view +package com.moez.QKSMS.presentation.common.widget import android.content.Context import android.support.constraint.ConstraintLayout diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/PreferenceView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/PreferenceView.kt similarity index 96% rename from qksms/src/main/java/com/moez/QKSMS/presentation/view/PreferenceView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/PreferenceView.kt index dccdb3df..cc55b079 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/PreferenceView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/PreferenceView.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.view +package com.moez.QKSMS.presentation.common.widget import android.content.Context import android.support.v7.widget.LinearLayoutCompat diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkEditText.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkEditText.kt similarity index 97% rename from qksms/src/main/java/com/moez/QKSMS/presentation/view/QkEditText.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkEditText.kt index 4950a5bc..781dfdad 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkEditText.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkEditText.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.view +package com.moez.QKSMS.presentation.common.widget import android.content.Context import android.util.AttributeSet diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkSwitch.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkSwitch.kt similarity index 97% rename from qksms/src/main/java/com/moez/QKSMS/presentation/view/QkSwitch.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkSwitch.kt index d373d6b1..7b424979 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkSwitch.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkSwitch.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.view +package com.moez.QKSMS.presentation.common.widget import android.content.Context import android.content.res.ColorStateList diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkTextView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkTextView.kt similarity index 96% rename from qksms/src/main/java/com/moez/QKSMS/presentation/view/QkTextView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkTextView.kt index cb9206a6..554f9074 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/QkTextView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkTextView.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.view +package com.moez.QKSMS.presentation.common.widget import android.content.Context import android.util.AttributeSet diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/Separator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/Separator.kt similarity index 94% rename from qksms/src/main/java/com/moez/QKSMS/presentation/view/Separator.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/Separator.kt index 35cf8199..cb354491 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/Separator.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/Separator.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.view +package com.moez.QKSMS.presentation.common.widget import android.content.Context import android.util.AttributeSet diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/TightTextView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/TightTextView.kt similarity index 93% rename from qksms/src/main/java/com/moez/QKSMS/presentation/view/TightTextView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/TightTextView.kt index e5abd5f7..51e8c09d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/TightTextView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/TightTextView.kt @@ -1,4 +1,4 @@ -package com.moez.QKSMS.presentation.view +package com.moez.QKSMS.presentation.common.widget import android.content.Context import android.util.AttributeSet diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt index f172c68b..6fb737e1 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -17,8 +17,8 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.common.util.extensions.showKeyboard import com.moez.QKSMS.data.model.Contact -import com.moez.QKSMS.presentation.base.QkAdapter -import com.moez.QKSMS.presentation.base.QkViewHolder +import com.moez.QKSMS.presentation.common.base.QkAdapter +import com.moez.QKSMS.presentation.common.base.QkViewHolder import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.contact_chip.view.* import javax.inject.Inject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index c9e1e31a..ea668ae4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -18,7 +18,7 @@ import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.common.util.extensions.showKeyboard import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message -import com.moez.QKSMS.presentation.base.QkActivity +import com.moez.QKSMS.presentation.common.base.QkActivity import io.reactivex.Observable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt index a666d82c..84b41b37 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt @@ -2,7 +2,7 @@ package com.moez.QKSMS.presentation.compose import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message -import com.moez.QKSMS.presentation.base.QkView +import com.moez.QKSMS.presentation.common.base.QkView import io.reactivex.Observable import io.reactivex.subjects.Subject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index 48e60e35..1ca30359 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -13,7 +13,7 @@ import com.moez.QKSMS.data.repository.ContactRepository import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.* import com.moez.QKSMS.presentation.Navigator -import com.moez.QKSMS.presentation.base.QkViewModel +import com.moez.QKSMS.presentation.common.base.QkViewModel import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt index 0df83475..2314d31c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt @@ -6,8 +6,8 @@ import android.view.ViewGroup import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.data.model.Contact -import com.moez.QKSMS.presentation.base.QkAdapter -import com.moez.QKSMS.presentation.base.QkViewHolder +import com.moez.QKSMS.presentation.common.base.QkAdapter +import com.moez.QKSMS.presentation.common.base.QkViewHolder import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.contact_list_item.view.* diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt index 2b5f8d2a..1da5ea18 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt @@ -14,7 +14,7 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setPadding import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message -import com.moez.QKSMS.presentation.base.QkViewHolder +import com.moez.QKSMS.presentation.common.base.QkViewHolder import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index 4caae78e..6027e315 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -11,8 +11,8 @@ import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.data.model.ConversationMessagePair import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.presentation.Navigator -import com.moez.QKSMS.presentation.base.QkAdapter -import com.moez.QKSMS.presentation.base.QkViewHolder +import com.moez.QKSMS.presentation.common.base.QkAdapter +import com.moez.QKSMS.presentation.common.base.QkViewHolder import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 84dac51d..0a7e80b2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -22,7 +22,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.presentation.Navigator -import com.moez.QKSMS.presentation.base.QkActivity +import com.moez.QKSMS.presentation.common.base.QkActivity import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt index 20cf5ce9..0cc4189e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt @@ -1,6 +1,6 @@ package com.moez.QKSMS.presentation.main -import com.moez.QKSMS.presentation.base.QkView +import com.moez.QKSMS.presentation.common.base.QkView import io.reactivex.Observable import io.reactivex.subjects.Subject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index ce4b1d10..bc16fd7e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -9,7 +9,7 @@ import com.moez.QKSMS.domain.interactor.MarkAllSeen import com.moez.QKSMS.domain.interactor.MarkArchived import com.moez.QKSMS.domain.interactor.PartialSync import com.moez.QKSMS.presentation.Navigator -import com.moez.QKSMS.presentation.base.QkViewModel +import com.moez.QKSMS.presentation.common.base.QkViewModel import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index 59de879d..a890a190 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -8,8 +8,8 @@ import android.support.v7.widget.RecyclerView import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent -import com.moez.QKSMS.presentation.base.QkActivity -import com.moez.QKSMS.presentation.view.PreferenceView +import com.moez.QKSMS.presentation.common.base.QkActivity +import com.moez.QKSMS.presentation.common.widget.PreferenceView import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt index 880e364a..d6ee6120 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt @@ -1,7 +1,7 @@ package com.moez.QKSMS.presentation.settings -import com.moez.QKSMS.presentation.base.QkView -import com.moez.QKSMS.presentation.view.PreferenceView +import com.moez.QKSMS.presentation.common.base.QkView +import com.moez.QKSMS.presentation.common.widget.PreferenceView import io.reactivex.Observable import io.reactivex.subjects.Subject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt index 033cad08..059e257f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt @@ -7,7 +7,7 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent import com.moez.QKSMS.common.util.Preferences import com.moez.QKSMS.domain.interactor.FullSync -import com.moez.QKSMS.presentation.base.QkViewModel +import com.moez.QKSMS.presentation.common.base.QkViewModel import io.reactivex.rxkotlin.plusAssign import timber.log.Timber import javax.inject.Inject diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt index cbcdfb52..d8d323d4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt @@ -5,8 +5,8 @@ import android.view.LayoutInflater import android.view.ViewGroup import com.moez.QKSMS.R import com.moez.QKSMS.common.util.extensions.setBackgroundTint -import com.moez.QKSMS.presentation.base.QkAdapter -import com.moez.QKSMS.presentation.base.QkViewHolder +import com.moez.QKSMS.presentation.common.base.QkAdapter +import com.moez.QKSMS.presentation.common.base.QkViewHolder import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.theme_list_item.view.* diff --git a/qksms/src/main/res/layout/avatar_view.xml b/qksms/src/main/res/layout/avatar_view.xml index cfb3ac31..c458a959 100644 --- a/qksms/src/main/res/layout/avatar_view.xml +++ b/qksms/src/main/res/layout/avatar_view.xml @@ -6,9 +6,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:background="@color/tools_theme" - tools:parentTag="com.moez.QKSMS.presentation.view.AvatarView"> + tools:parentTag="com.moez.QKSMS.presentation.common.widget.AvatarView"> - - - @@ -61,7 +61,7 @@ android:padding="16dp" android:src="@drawable/ic_add_circle_black_24dp" /> - - - - - - - - - - - - - - - - - - @@ -30,7 +30,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_folder_black_24dp" /> - @@ -45,7 +45,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_event_black_24dp" /> - @@ -60,13 +60,13 @@ style="@style/DrawerIcon" android:src="@drawable/ic_block_black_24dp" /> - - - diff --git a/qksms/src/main/res/layout/group_avatar_view.xml b/qksms/src/main/res/layout/group_avatar_view.xml index 167bd9ce..8644c266 100644 --- a/qksms/src/main/res/layout/group_avatar_view.xml +++ b/qksms/src/main/res/layout/group_avatar_view.xml @@ -5,9 +5,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - tools:parentTag="com.moez.QKSMS.presentation.view.GroupAvatarView"> + tools:parentTag="com.moez.QKSMS.presentation.common.widget.GroupAvatarView"> - - - - - - - - - - + tools:parentTag="com.moez.QKSMS.presentation.common.widget.PreferenceView"> - - - - - - - - - - - - - - - - - - -