Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8fbb324 authored by moezbhatti's avatar moezbhatti
Browse files

Fix rebase errors

parent cb0af935

presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt

+2 −1
Original line number Diff line number Diff line
@@ -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

presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt

+2 −1
Original line number Diff line number Diff line
@@ -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

presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt

+2 −1
Original line number Diff line number Diff line
@@ -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(

presentation/src/main/res/layout/blocked_numbers_add_dialog.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

presentation/src/main/res/layout/blocked_numbers_controller.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"