From 73a36740e024e0211ffc89942a0519410859115d Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sun, 27 Oct 2019 22:07:38 -0400 Subject: [PATCH] Organize compose package --- .../java/com/moez/QKSMS/feature/compose/ComposeActivity.kt | 3 +++ .../java/com/moez/QKSMS/feature/compose/ComposeState.kt | 1 + .../main/java/com/moez/QKSMS/feature/compose/ComposeView.kt | 1 + .../java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt | 3 ++- .../com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt | 6 +++++- .../QKSMS/feature/compose/{ => editing}/ChipsAdapter.kt | 4 ++-- .../moez/QKSMS/feature/compose/{ => editing}/ComposeItem.kt | 2 +- .../feature/compose/{ => editing}/ComposeItemAdapter.kt | 4 ++-- .../QKSMS/feature/compose/{ => editing}/DetailedChipView.kt | 5 ++--- .../feature/compose/{ => editing}/PhoneNumberAdapter.kt | 2 +- .../src/main/java/com/moez/QKSMS/injection/AppComponent.kt | 2 +- 11 files changed, 21 insertions(+), 12 deletions(-) rename presentation/src/main/java/com/moez/QKSMS/feature/compose/{ => editing}/ChipsAdapter.kt (98%) rename presentation/src/main/java/com/moez/QKSMS/feature/compose/{ => editing}/ComposeItem.kt (97%) rename presentation/src/main/java/com/moez/QKSMS/feature/compose/{ => editing}/ComposeItemAdapter.kt (98%) rename presentation/src/main/java/com/moez/QKSMS/feature/compose/{ => editing}/DetailedChipView.kt (95%) rename presentation/src/main/java/com/moez/QKSMS/feature/compose/{ => editing}/PhoneNumberAdapter.kt (97%) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 94706ccf..7f0f60bd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -53,6 +53,9 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setTint import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.common.util.extensions.showKeyboard +import com.moez.QKSMS.feature.compose.editing.ChipsAdapter +import com.moez.QKSMS.feature.compose.editing.ComposeItem +import com.moez.QKSMS.feature.compose.editing.ComposeItemAdapter import com.moez.QKSMS.model.Attachment import com.moez.QKSMS.model.Contact import com.uber.autodispose.android.lifecycle.scope diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt index 08312ef0..9b4b7e6c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt @@ -19,6 +19,7 @@ package com.moez.QKSMS.feature.compose import com.moez.QKSMS.compat.SubscriptionInfoCompat +import com.moez.QKSMS.feature.compose.editing.ComposeItem import com.moez.QKSMS.model.Attachment import com.moez.QKSMS.model.Contact import com.moez.QKSMS.model.Conversation diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt index e420dac5..7dd8cc5d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt @@ -22,6 +22,7 @@ import android.net.Uri import androidx.annotation.StringRes import androidx.core.view.inputmethod.InputContentInfoCompat import com.moez.QKSMS.common.base.QkView +import com.moez.QKSMS.feature.compose.editing.ComposeItem import com.moez.QKSMS.model.Attachment import com.moez.QKSMS.model.Contact import io.reactivex.Observable diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 9da74c03..fd0b6b18 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -37,7 +37,8 @@ import com.moez.QKSMS.extensions.isImage import com.moez.QKSMS.extensions.isVideo import com.moez.QKSMS.extensions.mapNotNull import com.moez.QKSMS.extensions.removeAccents -import com.moez.QKSMS.feature.compose.ComposeItem.* +import com.moez.QKSMS.feature.compose.editing.ComposeItem +import com.moez.QKSMS.feature.compose.editing.ComposeItem.* import com.moez.QKSMS.filter.ContactFilter import com.moez.QKSMS.filter.ContactGroupFilter import com.moez.QKSMS.interactor.AddScheduledMessage diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt index b3f8acbf..0ea9eab7 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt @@ -32,8 +32,12 @@ import android.view.Window import android.view.WindowManager import android.view.accessibility.AccessibilityEvent import androidx.annotation.RequiresApi +import com.moez.QKSMS.feature.compose.editing.DetailedChipView -class ComposeWindowCallback(private val localCallback: Window.Callback, private val activity: Activity) : Window.Callback { +class ComposeWindowCallback( + private val localCallback: Window.Callback, + private val activity: Activity +) : Window.Callback { override fun dispatchKeyEvent(keyEvent: KeyEvent): Boolean { return localCallback.dispatchKeyEvent(keyEvent) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt similarity index 98% rename from presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt index 2d7d7d50..5bd9f737 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Moez Bhatti + * Copyright (C) 2019 Moez Bhatti * * This file is part of QKSMS. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.feature.compose +package com.moez.QKSMS.feature.compose.editing import android.content.Context import android.view.LayoutInflater diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeItem.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItem.kt similarity index 97% rename from presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeItem.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItem.kt index e089b689..894daa1e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeItem.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItem.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.feature.compose +package com.moez.QKSMS.feature.compose.editing import com.moez.QKSMS.model.Contact import com.moez.QKSMS.model.ContactGroup diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt similarity index 98% rename from presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeItemAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt index 8294fea6..8a4a4dcb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeItemAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Moez Bhatti + * Copyright (C) 2019 Moez Bhatti * * This file is part of QKSMS. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.feature.compose +package com.moez.QKSMS.feature.compose.editing import android.view.LayoutInflater import android.view.View diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/DetailedChipView.kt similarity index 95% rename from presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/DetailedChipView.kt index 5bcca0da..731d9c9d 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/DetailedChipView.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Moez Bhatti + * Copyright (C) 2019 Moez Bhatti * * This file is part of QKSMS. * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.feature.compose +package com.moez.QKSMS.feature.compose.editing import android.content.Context import android.view.View @@ -31,7 +31,6 @@ import com.moez.QKSMS.model.Contact import kotlinx.android.synthetic.main.contact_chip_detailed.view.* import javax.inject.Inject - class DetailedChipView(context: Context) : RelativeLayout(context) { @Inject lateinit var colors: Colors diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/PhoneNumberAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt similarity index 97% rename from presentation/src/main/java/com/moez/QKSMS/feature/compose/PhoneNumberAdapter.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt index ca7df449..565bd1b9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/PhoneNumberAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.feature.compose +package com.moez.QKSMS.feature.compose.editing import android.view.LayoutInflater import android.view.ViewGroup diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index 75515214..ae548127 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -33,7 +33,7 @@ import com.moez.QKSMS.feature.blocking.BlockingController import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController -import com.moez.QKSMS.feature.compose.DetailedChipView +import com.moez.QKSMS.feature.compose.editing.DetailedChipView import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent import com.moez.QKSMS.feature.settings.SettingsController import com.moez.QKSMS.feature.settings.about.AboutController