From d8fbb324a22f71ee216dfedf481416c6f0a3bcf4 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Wed, 21 Aug 2019 23:10:27 +0200 Subject: [PATCH] Fix rebase errors --- .../java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt | 3 ++- .../feature/blocking/manager/BlockingManagerPresenter.kt | 3 ++- .../QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt | 3 ++- .../src/main/res/layout/blocked_numbers_add_dialog.xml | 4 ++-- .../src/main/res/layout/blocked_numbers_controller.xml | 2 +- presentation/src/main/res/layout/blocking_controller.xml | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt index 47555cf9..dcbd8ab0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt @@ -24,7 +24,8 @@ import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.repository.ConversationRepository import com.moez.QKSMS.util.Preferences -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt index a50071be..05632201 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt @@ -8,7 +8,8 @@ import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.util.Preferences -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt index b7fbb3ac..0b6c9076 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt @@ -20,7 +20,8 @@ package com.moez.QKSMS.feature.blocking.numbers import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.repository.BlockingRepository -import com.uber.autodispose.kotlin.autoDisposable +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import javax.inject.Inject class BlockedNumbersPresenter @Inject constructor( diff --git a/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml b/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml index 87bae892..42d22860 100644 --- a/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml +++ b/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml @@ -30,7 +30,7 @@ android:layout_marginTop="16dp" android:layout_marginEnd="24dp" android:text="@string/blocked_numbers_dialog_title" - app:textColor="primary" + android:textColor="?android:attr/textColorPrimary" app:textSize="dialog" /> + android:textColor="?android:attr/textColorTertiary" />