mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-16 19:18:52 +01:00
Refactor presentation packages
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.moez.QKSMS.presentation.base
|
||||
package com.moez.QKSMS.presentation.common.base
|
||||
|
||||
interface QkView<in State> {
|
||||
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.*
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.*
|
||||
|
||||
Reference in New Issue
Block a user