forked from upstream-mirrors/quik
Fix rebase errors
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
|
||||
+2
-1
@@ -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(
|
||||
|
||||
@@ -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" />
|
||||
|
||||
<com.moez.QKSMS.common.widget.QkEditText
|
||||
@@ -39,8 +39,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@null"
|
||||
android:hint="@string/blocked_numbers_dialog_hint"
|
||||
android:paddingStart="24dp"
|
||||
android:inputType="phone"
|
||||
android:paddingStart="24dp"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingEnd="24dp"
|
||||
android:paddingBottom="16dp"
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:text="@string/blocked_numbers_empty"
|
||||
app:textColor="tertiary" />
|
||||
android:textColor="?android:attr/textColorTertiary" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/add"
|
||||
|
||||
@@ -67,9 +67,9 @@
|
||||
android:paddingTop="16dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:text="@string/blocking_conversations"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintTop_toBottomOf="@id/conversationsDivider"
|
||||
app:textColor="secondary"
|
||||
app:textSize="secondary" />
|
||||
|
||||
<com.moez.QKSMS.common.widget.QkTextView
|
||||
|
||||
Reference in New Issue
Block a user