Fix themes colors and CLEVER_DIALER_CSS_SELECTOR

Author: adamff-dev

app/src/main/java/com/addev/listaspam/adapter/CallLogAdapter.kt

@@ -9,6 +9,7 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.provider.CallLog
 import android.provider.ContactsContract
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -45,7 +46,7 @@ class CallLogAdapter(
         const val REPORT_URL_TEMPLATE = "https://www.listaspam.com/busca.php?Telefono=%s#denuncia"
     }
 
-    private val formatter = SimpleDateFormat("dd/MM/yyyy HH:ss")
+    private val formatter = SimpleDateFormat("dd/MM/yyyy HH:mm:ss")
     private var onItemChangedListener: OnItemChangedListener? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CallLogViewHolder {
@@ -101,7 +102,7 @@ class CallLogAdapter(
                 isBlocked -> numberTextView.setTextColor(ContextCompat.getColor(context, android.R.color.holo_red_light))
                 isWhitelisted -> numberTextView.setTextColor(ContextCompat.getColor(context, android.R.color.holo_blue_dark))
                 else -> {
-                    numberTextView.setTextColor(ContextCompat.getColor(context, android.R.color.darker_gray))
+                    numberTextView.setTextColor(ContextCompat.getColor(context, R.color.textColor))
                 }
             }
 

app/src/main/java/com/addev/listaspam/util/NotificationUtils.kt

@@ -13,7 +13,13 @@ import com.addev.listaspam.R
 private const val NOTIFICATION_CHANNEL_ID = "NOTIFICATION_CHANNEL"
 private const val NOTIFICATION_ID = 1
 
-fun sendNotification(context: Context, number: String, reason: String) {
+fun sendBlockedCallNotification(context: Context, number: String, reason: String) {
+    sendNotification(context,
+        context.getString(R.string.notification_title_spam_blocked, number),
+        context.getString(R.string.block_reason) + " " + reason)
+}
+
+fun sendNotification(context: Context, title: String, message: String) {
     createNotificationChannel(context)
 
     if (ActivityCompat.checkSelfPermission(
@@ -27,8 +33,8 @@ fun sendNotification(context: Context, number: String, reason: String) {
 
     val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
         .setSmallIcon(R.mipmap.ic_launcher)
-        .setContentTitle(context.getString(R.string.notification_title_spam_blocked, number))
-        .setContentText(context.getString(R.string.block_reason) + " " + reason)
+        .setContentTitle(title)
+        .setContentText(message)
         .setPriority(NotificationCompat.PRIORITY_HIGH)
         .build()
 

app/src/main/java/com/addev/listaspam/util/SharedPreferencesUtils.kt

@@ -29,7 +29,7 @@ fun shouldFilterWithListaSpam(context: Context): Boolean {
 
 fun shouldFilterWithResponderONo(context: Context): Boolean {
     val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-    return sharedPreferences.getBoolean("pref_filter_responder_o_no", true)
+    return sharedPreferences.getBoolean("pref_filter_responder_o_no", false)
 }
 
 fun shouldFilterWithCleverdialer(context: Context): Boolean {

app/src/main/java/com/addev/listaspam/util/SpamUtils.kt

@@ -36,7 +36,7 @@ class SpamUtils {
             "https://www.responderono.es/numero-de-telefono/%s"
         private const val RESPONDERONO_CSS_SELECTOR = ".scoreContainer .score.negative"
         private const val CLEVER_DIALER_URL_TEMPLATE = "https://www.cleverdialer.es/numero/%s"
-        private const val CLEVER_DIALER_CSS_SELECTOR = ".front-stars:not(.star-rating .stars-4, .star-rating .stars-5):not(.page_speed_767712278), .circle-spam"
+        private const val CLEVER_DIALER_CSS_SELECTOR = "body:has(#comments):has(.front-stars:not(.star-rating .stars-4, .star-rating .stars-5)), .circle-spam"
 
         private const val USER_AGENT =
             "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36"
@@ -80,7 +80,8 @@ class SpamUtils {
             if (isSpam) {
                 handleSpamNumber(context, number, context.getString(R.string.block_spam_number), callback)
             } else {
-                handleNonSpamNumber(context, number, callback)
+                handleNonSpamNumber(context, number)
+                return@launch
             }
         }
     }
@@ -268,7 +269,7 @@ class SpamUtils {
         if (saveNumber) {
             saveSpamNumber(context, number)
         }
-        sendNotification(context, number, reason)
+        sendBlockedCallNotification(context, number, reason)
         callback(true)
     }
 
@@ -280,14 +281,15 @@ class SpamUtils {
      */
     private fun handleNonSpamNumber(
         context: Context,
-        number: String,
-        callback: (isSpam: Boolean) -> Unit
+        number: String
     ) {
-        Handler(Looper.getMainLooper()).post {
-            showToast(context, context.getString(R.string.incoming_call_not_spam), Toast.LENGTH_LONG)
+        CoroutineScope(Dispatchers.Main).launch {
+            sendNotification(
+                context,
+                context.getString(R.string.call_incoming),
+                context.getString(R.string.incoming_call_not_spam))
+            removeSpamNumber(context, number)
         }
-        removeSpamNumber(context, number)
-        callback(false)
     }
 
     /**

app/src/main/res/drawable/item_border_rounded.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#f0f0f0" />
+    <solid android:color="@color/cardBackgroundColor" />
     <corners android:radius="8dp" />
 </shape>

app/src/main/res/layout/item_call_log.xml

@@ -12,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="18sp"
-        android:textColor="?attr/colorPrimary"
         android:layout_alignParentStart="true" />
 
     <TextView

app/src/main/res/values-es/strings.xml

@@ -36,7 +36,7 @@
     <string name="pref_enable_blocking_summary">Habilita o deshabilita el sistema de bloqueo de llamadas en toda la aplicación</string>
 
     <string name="pref_filter_lista_spam_title">Filtrar con listaspam.com</string>
-    <string name="pref_filter_lista_spam_summary">Bloquea llamadas de números de spam incluidos en la base de datos de listaspam.com</string>
+    <string name="pref_filter_lista_spam_summary">(Recomendado) Bloquea llamadas de números de spam incluidos en la base de datos de listaspam.com</string>
 
     <string name="pref_filter_responder_o_no_title">Filtrar con responderono.es</string>
     <string name="pref_filter_responder_o_no_summary">Bloquea llamadas de números de spam incluidos en la base de datos de responderono.es</string>

app/src/main/res/values-night/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="textColor">#e6e6e6</color>
+    <color name="cardBackgroundColor">#303030</color>
+</resources>

app/src/main/res/values/colors.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="textColor">#404040</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="darkBackground">#212121</color>
+    <color name="cardBackgroundColor">#f0f0f0</color>
 </resources>

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

@@ -35,7 +35,7 @@
     <string name="pref_enable_blocking_summary">Enables or disables the call blocking system across the entire application</string>
 
     <string name="pref_filter_lista_spam_title">Filter with listaspam.com</string>
-    <string name="pref_filter_lista_spam_summary">Blocks calls from spam numbers included in the listaspam.com database</string>
+    <string name="pref_filter_lista_spam_summary">(Recommended) Blocks calls from spam numbers included in the listaspam.com database</string>
 
     <string name="pref_filter_responder_o_no_title">Filter with responderono.es</string>
     <string name="pref_filter_responder_o_no_summary">Blocks calls from spam numbers included in the responderono.es database</string>