forked from upstream-mirrors/quik
Reorganize presentation package
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
android:theme="@style/AppThemeLight">
|
||||
|
||||
<activity
|
||||
android:name="presentation.main.MainActivity"
|
||||
android:name="presentation.feature.main.MainActivity"
|
||||
android:launchMode="singleTask">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
@@ -45,39 +45,39 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name="presentation.compose.ComposeActivity"
|
||||
android:parentActivityName="presentation.main.MainActivity" />
|
||||
<activity android:name="presentation.settings.SettingsActivity" />
|
||||
<activity android:name="presentation.setup.SetupActivity" />
|
||||
android:name="presentation.feature.compose.ComposeActivity"
|
||||
android:parentActivityName="presentation.feature.main.MainActivity" />
|
||||
<activity android:name="presentation.feature.settings.SettingsActivity" />
|
||||
<activity android:name="presentation.feature.setup.SetupActivity" />
|
||||
|
||||
<receiver android:name="receiver.DefaultSmsChangedReceiver">
|
||||
<receiver android:name="presentation.receiver.DefaultSmsChangedReceiver">
|
||||
<intent-filter>
|
||||
<action android:name="android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<receiver
|
||||
android:name="receiver.SmsReceiver"
|
||||
android:name="presentation.receiver.SmsReceiver"
|
||||
android:permission="android.permission.BROADCAST_SMS">
|
||||
<intent-filter>
|
||||
<action android:name="android.provider.Telephony.SMS_DELIVER" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<receiver
|
||||
android:name="receiver.MmsReceiver"
|
||||
android:name="presentation.receiver.MmsReceiver"
|
||||
android:permission="android.permission.BROADCAST_WAP_PUSH">
|
||||
<intent-filter>
|
||||
<action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
|
||||
<data android:mimeType="application/vnd.wap.mms-message" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<receiver android:name="receiver.MessageSentReceiver" />
|
||||
<receiver android:name="receiver.MessageDeliveredReceiver" />
|
||||
<receiver android:name="receiver.MarkSeenReceiver" />
|
||||
<receiver android:name="receiver.MarkReadReceiver" />
|
||||
<receiver android:name="receiver.RemoteMessagingReceiver" />
|
||||
<receiver android:name="presentation.receiver.MessageSentReceiver" />
|
||||
<receiver android:name="presentation.receiver.MessageDeliveredReceiver" />
|
||||
<receiver android:name="presentation.receiver.MarkSeenReceiver" />
|
||||
<receiver android:name="presentation.receiver.MarkReadReceiver" />
|
||||
<receiver android:name="presentation.receiver.RemoteMessagingReceiver" />
|
||||
|
||||
<service
|
||||
android:name="service.HeadlessSmsSendService"
|
||||
android:name="presentation.service.HeadlessSmsSendService"
|
||||
android:exported="true"
|
||||
android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
|
||||
<intent-filter>
|
||||
|
||||
@@ -21,16 +21,16 @@ package common.di
|
||||
import common.QKApplication
|
||||
import common.util.ContactImageLoader
|
||||
import presentation.common.widget.*
|
||||
import presentation.compose.ComposeActivity
|
||||
import presentation.compose.ComposeViewModel
|
||||
import presentation.compose.DetailedChipView
|
||||
import presentation.main.MainActivity
|
||||
import presentation.main.MainViewModel
|
||||
import presentation.settings.SettingsActivity
|
||||
import presentation.settings.SettingsViewModel
|
||||
import presentation.setup.SetupActivity
|
||||
import presentation.setup.SetupViewModel
|
||||
import receiver.*
|
||||
import presentation.feature.compose.ComposeActivity
|
||||
import presentation.feature.compose.ComposeViewModel
|
||||
import presentation.feature.compose.DetailedChipView
|
||||
import presentation.feature.main.MainActivity
|
||||
import presentation.feature.main.MainViewModel
|
||||
import presentation.feature.settings.SettingsActivity
|
||||
import presentation.feature.settings.SettingsViewModel
|
||||
import presentation.feature.setup.SetupActivity
|
||||
import presentation.feature.setup.SetupViewModel
|
||||
import presentation.receiver.*
|
||||
import dagger.Component
|
||||
import javax.inject.Singleton
|
||||
|
||||
|
||||
@@ -33,10 +33,10 @@ import android.support.v4.app.TaskStackBuilder
|
||||
import com.moez.QKSMS.R
|
||||
import data.repository.MessageRepository
|
||||
import interactor.MarkUnarchived
|
||||
import presentation.compose.ComposeActivity
|
||||
import receiver.MarkReadReceiver
|
||||
import receiver.MarkSeenReceiver
|
||||
import receiver.RemoteMessagingReceiver
|
||||
import presentation.feature.compose.ComposeActivity
|
||||
import presentation.receiver.MarkReadReceiver
|
||||
import presentation.receiver.MarkSeenReceiver
|
||||
import presentation.receiver.RemoteMessagingReceiver
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
|
||||
@@ -24,8 +24,8 @@ import android.content.Intent
|
||||
import android.telephony.SmsManager
|
||||
import common.util.Preferences
|
||||
import data.repository.MessageRepository
|
||||
import receiver.MessageDeliveredReceiver
|
||||
import receiver.MessageSentReceiver
|
||||
import presentation.receiver.MessageDeliveredReceiver
|
||||
import presentation.receiver.MessageSentReceiver
|
||||
import io.reactivex.Flowable
|
||||
import io.reactivex.rxkotlin.toFlowable
|
||||
import javax.inject.Inject
|
||||
|
||||
+8
-8
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation
|
||||
package presentation.common
|
||||
|
||||
import android.annotation.TargetApi
|
||||
import android.arch.lifecycle.ViewModel
|
||||
@@ -28,13 +28,13 @@ import android.os.Build
|
||||
import android.provider.Settings
|
||||
import android.provider.Telephony
|
||||
import common.util.NotificationManager
|
||||
import presentation.compose.ComposeActivity
|
||||
import presentation.compose.ComposeViewModel
|
||||
import presentation.main.MainViewModel
|
||||
import presentation.settings.SettingsActivity
|
||||
import presentation.settings.SettingsViewModel
|
||||
import presentation.setup.SetupActivity
|
||||
import presentation.setup.SetupViewModel
|
||||
import presentation.feature.compose.ComposeActivity
|
||||
import presentation.feature.compose.ComposeViewModel
|
||||
import presentation.feature.main.MainViewModel
|
||||
import presentation.feature.settings.SettingsActivity
|
||||
import presentation.feature.settings.SettingsViewModel
|
||||
import presentation.feature.setup.SetupActivity
|
||||
import presentation.feature.setup.SetupViewModel
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@@ -25,7 +25,7 @@ import android.support.v7.app.AppCompatActivity
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
import common.util.Colors
|
||||
import presentation.Navigator
|
||||
import presentation.common.Navigator
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.rxkotlin.Observables
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
|
||||
@@ -32,7 +32,7 @@ import common.util.Colors
|
||||
import common.util.GlideApp
|
||||
import common.util.extensions.setTint
|
||||
import data.model.Contact
|
||||
import presentation.Navigator
|
||||
import presentation.common.Navigator
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import kotlinx.android.synthetic.main.avatar_view.view.*
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import android.content.Context
|
||||
import android.support.v7.widget.RecyclerView
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import android.app.AlertDialog
|
||||
import android.content.res.ColorStateList
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import data.model.Contact
|
||||
import data.model.Message
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import data.model.Contact
|
||||
import data.model.Message
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import android.content.Context
|
||||
import com.moez.QKSMS.R
|
||||
@@ -30,7 +30,7 @@ import data.model.Conversation
|
||||
import data.repository.ContactRepository
|
||||
import data.repository.MessageRepository
|
||||
import interactor.*
|
||||
import presentation.Navigator
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkViewModel
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import android.app.Activity
|
||||
import android.graphics.Rect
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import android.content.Context
|
||||
import android.view.View
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.compose
|
||||
package presentation.feature.compose
|
||||
|
||||
import android.content.Context
|
||||
import android.support.v7.widget.RecyclerView
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.main
|
||||
package presentation.feature.conversations
|
||||
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import android.support.v7.widget.helper.ItemTouchHelper
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.main
|
||||
package presentation.feature.conversations
|
||||
|
||||
import android.content.Context
|
||||
import android.support.v7.widget.RecyclerView
|
||||
@@ -31,7 +31,7 @@ import data.model.Contact
|
||||
import data.model.InboxItem
|
||||
import data.model.PhoneNumber
|
||||
import data.repository.MessageRepository
|
||||
import presentation.Navigator
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.FlowableAdapter
|
||||
import presentation.common.base.QkViewHolder
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
+4
-2
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.main
|
||||
package presentation.feature.main
|
||||
|
||||
import android.app.AlertDialog
|
||||
import android.content.Intent
|
||||
@@ -48,9 +48,11 @@ import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.drawer_view.*
|
||||
import kotlinx.android.synthetic.main.main_activity.*
|
||||
import kotlinx.android.synthetic.main.toolbar_search.*
|
||||
import presentation.Navigator
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.MenuItemAdapter
|
||||
import presentation.common.base.QkActivity
|
||||
import presentation.feature.conversations.ConversationItemTouchCallback
|
||||
import presentation.feature.conversations.ConversationsAdapter
|
||||
import javax.inject.Inject
|
||||
|
||||
class MainActivity : QkActivity<MainViewModel>(), MainView {
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.main
|
||||
package presentation.feature.main
|
||||
|
||||
import data.model.InboxItem
|
||||
import data.model.MenuItem
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.main
|
||||
package presentation.feature.main
|
||||
|
||||
import presentation.common.base.QkView
|
||||
import io.reactivex.Observable
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.main
|
||||
package presentation.feature.main
|
||||
|
||||
import android.Manifest
|
||||
import android.content.Context
|
||||
@@ -34,7 +34,7 @@ import io.reactivex.Observable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.realm.Realm
|
||||
import presentation.Navigator
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkViewModel
|
||||
import java.util.concurrent.TimeUnit
|
||||
import javax.inject.Inject
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.settings
|
||||
package presentation.feature.settings
|
||||
|
||||
import android.app.AlertDialog
|
||||
import android.app.ProgressDialog
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.settings
|
||||
package presentation.feature.settings
|
||||
|
||||
data class SettingsState(
|
||||
val selectingTheme: Boolean = false,
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.settings
|
||||
package presentation.feature.settings
|
||||
|
||||
import presentation.common.base.QkView
|
||||
import presentation.common.widget.PreferenceView
|
||||
+2
-2
@@ -16,14 +16,14 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.settings
|
||||
package presentation.feature.settings
|
||||
|
||||
import android.content.Context
|
||||
import com.moez.QKSMS.R
|
||||
import common.di.appComponent
|
||||
import common.util.Preferences
|
||||
import interactor.FullSync
|
||||
import presentation.Navigator
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkViewModel
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import timber.log.Timber
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.settings
|
||||
package presentation.feature.settings
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.setup
|
||||
package presentation.feature.setup
|
||||
|
||||
import android.Manifest
|
||||
import android.os.Bundle
|
||||
@@ -24,7 +24,7 @@ import android.support.v4.app.ActivityCompat
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import common.di.appComponent
|
||||
import presentation.Navigator
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkActivity
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
+1
-1
@@ -16,6 +16,6 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.setup
|
||||
package presentation.feature.setup
|
||||
|
||||
class SetupState
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.setup
|
||||
package presentation.feature.setup
|
||||
|
||||
import presentation.common.base.QkView
|
||||
import io.reactivex.Observable
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package presentation.setup
|
||||
package presentation.feature.setup
|
||||
|
||||
import android.content.Context
|
||||
import android.provider.Telephony
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package receiver
|
||||
package presentation.receiver
|
||||
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package receiver
|
||||
package presentation.receiver
|
||||
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package receiver
|
||||
package presentation.receiver
|
||||
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package receiver
|
||||
package presentation.receiver
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.BroadcastReceiver
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package receiver
|
||||
package presentation.receiver
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.BroadcastReceiver
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package receiver
|
||||
package presentation.receiver
|
||||
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package receiver
|
||||
package presentation.receiver
|
||||
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package receiver
|
||||
package presentation.receiver
|
||||
|
||||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package service
|
||||
package presentation.service
|
||||
|
||||
import android.app.IntentService
|
||||
import android.content.Intent
|
||||
Reference in New Issue
Block a user