From d99a10fd3e8cd77fba4278d23c993919dee08b31 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 28 Nov 2021 08:48:36 +0100 Subject: [PATCH] updating kotlin, commons --- app/build.gradle | 4 ++-- .../simplemobiletools/dialer/adapters/ContactsAdapter.kt | 8 +++++--- .../dialer/adapters/RecentCallsAdapter.kt | 2 +- .../simplemobiletools/dialer/adapters/SpeedDialAdapter.kt | 7 ++++--- build.gradle | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e635550a..c20fb57b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,6 +55,6 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:c184f98ca8' - implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a' + implementation 'com.github.SimpleMobileTools:Simple-Commons:d62d81ca97' + implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt index d2f086ff..291cf9b9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt @@ -31,9 +31,11 @@ import com.simplemobiletools.dialer.extensions.config import com.simplemobiletools.dialer.extensions.startContactDetailsIntent import com.simplemobiletools.dialer.interfaces.RefreshItemsListener -class ContactsAdapter(activity: SimpleActivity, var contacts: ArrayList, recyclerView: MyRecyclerView, val refreshItemsListener: RefreshItemsListener? = null, - highlightText: String = "", val showDeleteButton: Boolean = true, itemClick: (Any) -> Unit) : - MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { +class ContactsAdapter( + activity: SimpleActivity, var contacts: ArrayList, recyclerView: MyRecyclerView, val refreshItemsListener: RefreshItemsListener? = null, + highlightText: String = "", val showDeleteButton: Boolean = true, itemClick: (Any) -> Unit +) : + MyRecyclerViewAdapter(activity, recyclerView, itemClick) { private var textToHighlight = highlightText private var fontSize = activity.getTextSize() diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt index e9222da9..a935fb69 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt @@ -30,7 +30,7 @@ import java.util.* class RecentCallsAdapter( activity: SimpleActivity, var recentCalls: ArrayList, recyclerView: MyRecyclerView, val refreshItemsListener: RefreshItemsListener?, itemClick: (Any) -> Unit -) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { +) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { private lateinit var outgoingCallIcon: Drawable private lateinit var incomingCallIcon: Drawable diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/SpeedDialAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/SpeedDialAdapter.kt index f19f84bd..7fed9b01 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/SpeedDialAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/SpeedDialAdapter.kt @@ -12,9 +12,10 @@ import com.simplemobiletools.dialer.models.SpeedDial import kotlinx.android.synthetic.main.item_speed_dial.view.* import java.util.* -class SpeedDialAdapter(activity: SimpleActivity, var speedDialValues: ArrayList, private val removeListener: RemoveSpeedDialListener, - recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { - +class SpeedDialAdapter( + activity: SimpleActivity, var speedDialValues: ArrayList, private val removeListener: RemoveSpeedDialListener, + recyclerView: MyRecyclerView, itemClick: (Any) -> Unit +) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { init { setupDragListener(true) } diff --git a/build.gradle b/build.gradle index 6129fadb..3d128e44 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.31' + ext.kotlin_version = '1.6.0' repositories { google() jcenter()