From 2ed255ae5d5af4cd39f17f62314380f922eec06d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 4 Apr 2020 13:19:36 +0200
Subject: [PATCH] improving the B&W theme

---
 app/build.gradle                              |  2 +-
 .../smsmessenger/adapters/MessagesAdapter.kt  |  2 +-
 .../smsmessenger/adapters/ThreadAdapter.kt    | 10 ++---
 .../smsmessenger/extensions/Int.kt            | 39 -------------------
 4 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Int.kt

diff --git a/app/build.gradle b/app/build.gradle
index ac904ef2..b7701785 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,6 +36,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.24.11'
+    implementation 'com.simplemobiletools:commons:5.24.15'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt
index b01ad2cf..c303ea5e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/MessagesAdapter.kt
@@ -6,11 +6,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
+import com.simplemobiletools.commons.extensions.formatDateOrTime
 import com.simplemobiletools.commons.views.FastScroller
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.activities.SimpleActivity
-import com.simplemobiletools.smsmessenger.extensions.formatDateOrTime
 import com.simplemobiletools.smsmessenger.models.Message
 import kotlinx.android.synthetic.main.item_message.view.*
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
index 987cb88b..678416ae 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
@@ -4,14 +4,11 @@ import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
-import com.simplemobiletools.commons.extensions.adjustAlpha
-import com.simplemobiletools.commons.extensions.applyColorFilter
-import com.simplemobiletools.commons.extensions.getContrastColor
+import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.views.FastScroller
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.activities.SimpleActivity
-import com.simplemobiletools.smsmessenger.extensions.formatDateOrTime
 import com.simplemobiletools.smsmessenger.helpers.THREAD_DATE_TIME
 import com.simplemobiletools.smsmessenger.helpers.THREAD_RECEIVED_MESSAGE
 import com.simplemobiletools.smsmessenger.helpers.THREAD_SENT_MESSAGE
@@ -99,8 +96,9 @@ class ThreadAdapter(
             if (message.isReceivedMessage()) {
                 thread_message_body.setTextColor(textColor)
             } else {
-                thread_message_wrapper.background.applyColorFilter(primaryColor.adjustAlpha(0.8f))
-                thread_message_body.setTextColor(primaryColor.getContrastColor())
+                val background = context.getAdjustedPrimaryColor()
+                thread_message_wrapper.background.applyColorFilter(background.adjustAlpha(0.8f))
+                thread_message_body.setTextColor(background.getContrastColor())
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Int.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Int.kt
deleted file mode 100644
index 9e6258c7..00000000
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Int.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.simplemobiletools.smsmessenger.extensions
-
-import android.content.Context
-import android.text.format.DateFormat
-import android.text.format.DateUtils
-import android.text.format.Time
-import com.simplemobiletools.commons.extensions.getTimeFormat
-import java.util.*
-
-// if the given date is today, we show only the time. Else we show only the date
-fun Int.formatDateOrTime(context: Context, hideTimeAtOtherDays: Boolean): String {
-    val cal = Calendar.getInstance(Locale.ENGLISH)
-    cal.timeInMillis = this * 1000L
-
-    return if (DateUtils.isToday(this * 1000L)) {
-        DateFormat.format(context.getTimeFormat(), cal).toString()
-    } else {
-        var format = context.config.dateFormat
-        if (isThisYear()) {
-            format = format.replace("y", "").trim().trim('-').trim('.').trim('/')
-        }
-
-        if (!hideTimeAtOtherDays) {
-            format += ", ${context.getTimeFormat()}"
-        }
-
-        DateFormat.format(format, cal).toString()
-    }
-}
-
-fun Int.isThisYear(): Boolean {
-    val time = Time()
-    time.set(this * 1000L)
-
-    val thenYear = time.year
-    time.set(System.currentTimeMillis())
-
-    return (thenYear == time.year)
-}