mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Refactor blocked to blocking
This commit is contained in:
@@ -29,7 +29,7 @@ import android.provider.Telephony
|
||||
import com.moez.QKSMS.BuildConfig
|
||||
import com.moez.QKSMS.common.util.BillingManager
|
||||
import com.moez.QKSMS.feature.backup.BackupActivity
|
||||
import com.moez.QKSMS.feature.blocked.BlockedActivity
|
||||
import com.moez.QKSMS.feature.blocking.BlockingActivity
|
||||
import com.moez.QKSMS.feature.compose.ComposeActivity
|
||||
import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
|
||||
import com.moez.QKSMS.feature.gallery.GalleryActivity
|
||||
@@ -151,7 +151,7 @@ class Navigator @Inject constructor(
|
||||
}
|
||||
|
||||
fun showBlockedConversations() {
|
||||
val intent = Intent(context, BlockedActivity::class.java)
|
||||
val intent = Intent(context, BlockingActivity::class.java)
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
|
||||
+12
-12
@@ -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 com.moez.QKSMS.feature.blocked
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
@@ -25,40 +25,40 @@ import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkThemedActivity
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.blocked_activity.*
|
||||
import kotlinx.android.synthetic.main.blocking_activity.*
|
||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockedActivity : QkThemedActivity(), BlockedView {
|
||||
class BlockingActivity : QkThemedActivity(), BlockingView {
|
||||
|
||||
@Inject lateinit var blockedAdapter: BlockedAdapter
|
||||
@Inject lateinit var blockingAdapter: BlockingAdapter
|
||||
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
|
||||
|
||||
override val ccClickedIntent by lazy { callControl.clicks() }
|
||||
override val siaClickedIntent by lazy { shouldIAnswer.clicks() }
|
||||
override val dropClickedIntent by lazy { drop.clicks() }
|
||||
override val conversationClicks by lazy { blockedAdapter.clicks }
|
||||
override val conversationClicks by lazy { blockingAdapter.clicks }
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[BlockedViewModel::class.java] }
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[BlockingViewModel::class.java] }
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.blocked_activity)
|
||||
setTitle(R.string.blocked_title)
|
||||
setContentView(R.layout.blocking_activity)
|
||||
setTitle(R.string.blocking_title)
|
||||
showBackButton(true)
|
||||
viewModel.bindView(this)
|
||||
|
||||
blockedAdapter.emptyView = empty
|
||||
conversations.adapter = blockedAdapter
|
||||
blockingAdapter.emptyView = empty
|
||||
conversations.adapter = blockingAdapter
|
||||
}
|
||||
|
||||
override fun render(state: BlockedState) {
|
||||
override fun render(state: BlockingState) {
|
||||
callControl.checkbox.isChecked = state.ccEnabled
|
||||
shouldIAnswer.checkbox.isChecked = state.siaEnabled
|
||||
drop.checkbox.isChecked = state.dropEnabled
|
||||
|
||||
blockedAdapter.updateData(state.data)
|
||||
blockingAdapter.updateData(state.data)
|
||||
}
|
||||
|
||||
}
|
||||
+4
-4
@@ -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 com.moez.QKSMS.feature.blocked
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.moez.QKSMS.injection.ViewModelKey
|
||||
@@ -25,11 +25,11 @@ import dagger.Provides
|
||||
import dagger.multibindings.IntoMap
|
||||
|
||||
@Module
|
||||
class BlockedActivityModule {
|
||||
class BlockingActivityModule {
|
||||
|
||||
@Provides
|
||||
@IntoMap
|
||||
@ViewModelKey(BlockedViewModel::class)
|
||||
fun provideBlockedViewModel(viewModel: BlockedViewModel): ViewModel = viewModel
|
||||
@ViewModelKey(BlockingViewModel::class)
|
||||
fun provideBlockingViewModel(viewModel: BlockingViewModel): ViewModel = viewModel
|
||||
|
||||
}
|
||||
+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 com.moez.QKSMS.feature.blocked
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
@@ -28,7 +28,7 @@ import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.blocked_list_item.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockedAdapter @Inject constructor() : QkRealmAdapter<Conversation>() {
|
||||
class BlockingAdapter @Inject constructor() : QkRealmAdapter<Conversation>() {
|
||||
|
||||
val clicks: PublishSubject<Long> = PublishSubject.create()
|
||||
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
package com.moez.QKSMS.feature.blocked
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.AlertDialog
|
||||
@@ -44,14 +44,14 @@ class BlockingDialog @Inject constructor(
|
||||
}
|
||||
|
||||
val res = when (block) {
|
||||
true -> R.plurals.settings_blocking_block_external
|
||||
false -> R.plurals.settings_blocking_unblock_external
|
||||
true -> R.plurals.blocking_block_external
|
||||
false -> R.plurals.blocking_unblock_external
|
||||
}
|
||||
|
||||
val manager = context.getString(when (prefs.blockingManager.get()) {
|
||||
Preferences.BLOCKING_MANAGER_SIA -> R.string.settings_should_i_answer_title
|
||||
Preferences.BLOCKING_MANAGER_CC -> R.string.settings_call_control_title
|
||||
else -> R.string.settings_blocking_manager_android
|
||||
Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
|
||||
Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
|
||||
else -> R.string.blocking_manager_android
|
||||
})
|
||||
|
||||
val message = context.resources.getQuantityString(res, addresses.size, manager)
|
||||
+2
-2
@@ -16,12 +16,12 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.moez.QKSMS.feature.blocked
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import com.moez.QKSMS.model.Conversation
|
||||
import io.realm.RealmResults
|
||||
|
||||
data class BlockedState(
|
||||
data class BlockingState(
|
||||
val ccEnabled: Boolean = false,
|
||||
val siaEnabled: Boolean = false,
|
||||
val dropEnabled: Boolean = false,
|
||||
+2
-2
@@ -16,12 +16,12 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.moez.QKSMS.feature.blocked
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import com.moez.QKSMS.common.base.QkView
|
||||
import io.reactivex.Observable
|
||||
|
||||
interface BlockedView : QkView<BlockedState> {
|
||||
interface BlockingView : QkView<BlockingState> {
|
||||
|
||||
val ccClickedIntent: Observable<*>
|
||||
val siaClickedIntent: Observable<*>
|
||||
+4
-4
@@ -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 com.moez.QKSMS.feature.blocked
|
||||
package com.moez.QKSMS.feature.blocking
|
||||
|
||||
import android.content.Context
|
||||
import com.moez.QKSMS.common.Navigator
|
||||
@@ -30,13 +30,13 @@ import com.uber.autodispose.autoDisposable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockedViewModel @Inject constructor(
|
||||
class BlockingViewModel @Inject constructor(
|
||||
private val context: Context,
|
||||
private val analytics: AnalyticsManager,
|
||||
private val conversationRepo: ConversationRepository,
|
||||
private val navigator: Navigator,
|
||||
private val prefs: Preferences
|
||||
) : QkViewModel<BlockedView, BlockedState>(BlockedState()) {
|
||||
) : QkViewModel<BlockingView, BlockingState>(BlockingState()) {
|
||||
|
||||
init {
|
||||
newState { copy(data = conversationRepo.getBlockedConversations()) }
|
||||
@@ -51,7 +51,7 @@ class BlockedViewModel @Inject constructor(
|
||||
.subscribe { enabled -> newState { copy(dropEnabled = enabled) } }
|
||||
}
|
||||
|
||||
override fun bindView(view: BlockedView) {
|
||||
override fun bindView(view: BlockingView) {
|
||||
super.bindView(view)
|
||||
|
||||
view.ccClickedIntent
|
||||
+1
-1
@@ -30,7 +30,7 @@ import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
|
||||
import com.moez.QKSMS.common.util.extensions.scrapViews
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.common.widget.FieldDialog
|
||||
import com.moez.QKSMS.feature.blocked.BlockingDialog
|
||||
import com.moez.QKSMS.feature.blocking.BlockingDialog
|
||||
import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoModule
|
||||
import com.moez.QKSMS.feature.themepicker.ThemePickerController
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
|
||||
@@ -51,7 +51,7 @@ import com.moez.QKSMS.common.util.extensions.scrapViews
|
||||
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.feature.blocked.BlockingDialog
|
||||
import com.moez.QKSMS.feature.blocking.BlockingDialog
|
||||
import com.moez.QKSMS.feature.changelog.ChangelogDialog
|
||||
import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback
|
||||
import com.moez.QKSMS.feature.conversations.ConversationsAdapter
|
||||
|
||||
+4
-4
@@ -19,8 +19,8 @@
|
||||
package com.moez.QKSMS.injection.android
|
||||
|
||||
import com.moez.QKSMS.feature.backup.BackupActivity
|
||||
import com.moez.QKSMS.feature.blocked.BlockedActivity
|
||||
import com.moez.QKSMS.feature.blocked.BlockedActivityModule
|
||||
import com.moez.QKSMS.feature.blocking.BlockingActivity
|
||||
import com.moez.QKSMS.feature.blocking.BlockingActivityModule
|
||||
import com.moez.QKSMS.feature.compose.ComposeActivity
|
||||
import com.moez.QKSMS.feature.compose.ComposeActivityModule
|
||||
import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
|
||||
@@ -85,7 +85,7 @@ abstract class ActivityBuilderModule {
|
||||
abstract fun bindSettingsActivity(): SettingsActivity
|
||||
|
||||
@ActivityScope
|
||||
@ContributesAndroidInjector(modules = [BlockedActivityModule::class])
|
||||
abstract fun bindBlockedActivity(): BlockedActivity
|
||||
@ContributesAndroidInjector(modules = [BlockingActivityModule::class])
|
||||
abstract fun bindBlockingActivity(): BlockingActivity
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user