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

Commit 82fa9f28 authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch 'main' into '143-crash-no-of-days' 

# Conflicts:
#   presentation/src/main/res/values/strings.xml
parents 0f619fea f8cf66fc

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

+14 −5
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ package com.moez.QKSMS.feature.blocking.numbers 


import android.view.LayoutInflater

import android.view.View

import android.widget.Button

import android.widget.Toast

import androidx.appcompat.app.AlertDialog

import androidx.core.content.ContextCompat

import com.jakewharton.rxbinding2.view.clicks
@@ -40,9 +42,12 @@ import javax.inject.Inject 
class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbersState, BlockedNumbersPresenter>(),

        BlockedNumbersView {



    @Inject override lateinit var presenter: BlockedNumbersPresenter

    @Inject lateinit var colors: Colors

    @Inject lateinit var phoneNumberUtils: PhoneNumberUtils

    @Inject

    override lateinit var presenter: BlockedNumbersPresenter

    @Inject

    lateinit var colors: Colors

    @Inject

    lateinit var phoneNumberUtils: PhoneNumberUtils



    private val adapter = BlockedNumbersAdapter()

    private val saveAddressSubject: Subject<String> = PublishSubject.create()
@@ -80,7 +85,11 @@ class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbers 
        val dialog = AlertDialog.Builder(activity!!, R.style.customAlertDialog)

                .setView(layout)

                .setPositiveButton(R.string.blocked_numbers_dialog_block) { _, _ ->

                    if (!layout.input.text.toString().trim().isEmpty()) {

                        saveAddressSubject.onNext(layout.input.text.toString())

                    } else {

                        Toast.makeText(activity, R.string.not_able_to_add_empty_text, Toast.LENGTH_LONG).show()

                    }

                }

                .setNegativeButton(R.string.button_cancel) { _, _ -> }

                .setOnDismissListener { textWatcher.dispose() }

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
            android:id="@+id/qksms"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            app:icon="@drawable/ic_blocking_manager_qksms"

            app:icon="@mipmap/ic_launcher"

            app:summary="@string/blocking_manager_qksms_summary"

            app:title="@string/blocking_manager_qksms_title"

            app:widget="@layout/blocking_manager_list_option" />

presentation/src/main/res/values/strings.xml

+7 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 
    <string name="backup_restore_stop_title">Stop restore</string>

    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>

    <string name="backup_restore_dialog_title">Backups</string>

    <string name="backup_restore_dialog_summary" translatable="false">/QKSMS/Backups</string>

    <string name="backup_restore_dialog_summary" translatable="false">/MESSAGE/Backups</string>

    <string name="backup_restore_dialog_empty">No backups found</string>

    <plurals name="backup_message_count">

        <item quantity="zero">No messages</item>
@@ -279,8 +279,8 @@ 
    <string name="blocking_conversations">Blocked conversations</string>



    <string name="blocking_manager_title">Blocking Manager</string>

    <string name="blocking_manager_qksms_title">QKSMS</string>

    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>

    <string name="blocking_manager_qksms_title">MESSAGE</string>

    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in MESSAGE</string>

    <string name="blocking_manager_call_blocker_title" translatable="false">Call Blocker - Incoming/Outgoing</string>

    <string name="blocking_manager_call_blocker_summary">Block spam messages, numbers &amp; unknown calls with blacklist &amp; Schedule</string>

    <string name="blocking_manager_call_control_title" translatable="false">Call Control</string>
@@ -502,5 +502,9 @@ 
    <string name="rate_summary">Share some love and rate us on Google Play!</string>

    <string name="rate_okay">OKAY!</string>

    <string name="rate_dismiss">DISMISS</string>



    <string name="not_able_to_add_empty_number">Not able to add empty number ! please try again</string>



    <string name="not_able_to_add_empty_text">Not able to add empty text ! please try again</string>



</resources>