Updated libraries, fixed dates divider

glodanif · glodanif · commit ad600a25bc32 · 2018-12-08T16:49:23.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
-def final VERSION_CODE = 34
-def final VERSION_NAME = '1.3.0'
+def final VERSION_CODE = 35
+def final VERSION_NAME = '1.3.1'
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -29,12 +29,6 @@ android {
         it.java.srcDirs += "src/$it.name/kotlin"
     }
 
-    kotlin {
-        experimental {
-            coroutines 'enable'
-        }
-    }
-
     signingConfigs {
 
         release {
@@ -89,18 +83,17 @@ android {
 
 dependencies {
 
-    def final SUPPORT_VERSION = '1.0.0'
     def final ROOM_VERSION = '2.0.0'
     def final LIFECYCLE_VERSION = '2.0.0'
     def final LEAK_CANARY_VERSION = '1.6.2'
     def final ESPRESSO_VERSION = '3.1.0-alpha4'
-    def final COROUTINES_VERSION = '0.30.2'
+    def final COROUTINES_VERSION = '1.0.1'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "androidx.appcompat:appcompat:$SUPPORT_VERSION"
-    implementation "androidx.recyclerview:recyclerview:$SUPPORT_VERSION"
-    implementation "androidx.cardview:cardview:$SUPPORT_VERSION"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
     implementation 'com.google.android.material:material:1.0.0'
 
@@ -136,10 +129,10 @@ dependencies {
 
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION"
-    testImplementation 'io.mockk:mockk:1.8.9'
+    testImplementation 'io.mockk:mockk:1.8.12'
     testImplementation 'junit:junit:4.12'
 
-    androidTestImplementation "androidx.annotation:annotation:$SUPPORT_VERSION"
+    androidTestImplementation "androidx.annotation:annotation:1.0.1"
     androidTestImplementation "androidx.test.espresso:espresso-core:$ESPRESSO_VERSION"
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$ESPRESSO_VERSION"
 }
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/data/service/connection/ConnectionController.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/data/service/connection/ConnectionController.kt
@@ -24,11 +24,11 @@ import com.glodanif.bluetoothchat.ui.view.NotificationView
 import com.glodanif.bluetoothchat.ui.widget.ShortcutManager
 import com.glodanif.bluetoothchat.utils.LimitedQueue
 import com.glodanif.bluetoothchat.utils.Size
-import kotlinx.coroutines.experimental.*
+import kotlinx.coroutines.*
 import java.io.File
 import java.io.IOException
 import java.util.*
-import kotlin.coroutines.experimental.CoroutineContext
+import kotlin.coroutines.CoroutineContext
 
 class ConnectionController(private val application: ChatApplication,
                            private val subject: ConnectionSubject,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ChatAdapter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/adapter/ChatAdapter.kt
@@ -120,9 +120,7 @@ class ChatAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), StickyRecyc
         }
     }
 
-    override fun getHeaderId(position: Int): Long {
-        return messages[position].dayOfYear.hashCode().toLong()
-    }
+    override fun getHeaderId(position: Int) = messages[position].dayOfYearRaw
 
     override fun onCreateHeaderViewHolder(parent: ViewGroup): RecyclerView.ViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(R.layout.item_date_divider, parent, false)
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/BasePresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/BasePresenter.kt
@@ -4,11 +4,11 @@ import androidx.annotation.CallSuper
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import kotlinx.coroutines.experimental.CoroutineDispatcher
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.Dispatchers
-import kotlinx.coroutines.experimental.Job
-import kotlin.coroutines.experimental.CoroutineContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlin.coroutines.CoroutineContext
 
 open class BasePresenter(private val uiDispatcher: CoroutineDispatcher = Dispatchers.Main): CoroutineScope, LifecycleObserver {
 
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ChatPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ChatPresenter.kt
@@ -11,7 +11,7 @@ import com.glodanif.bluetoothchat.data.service.message.PayloadType
 import com.glodanif.bluetoothchat.data.service.message.TransferringFile
 import com.glodanif.bluetoothchat.ui.view.ChatView
 import com.glodanif.bluetoothchat.ui.viewmodel.converter.ChatMessageConverter
-import kotlinx.coroutines.experimental.*
+import kotlinx.coroutines.*
 import java.io.File
 
 class ChatPresenter(private val deviceAddress: String,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ContactChooserPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ContactChooserPresenter.kt
@@ -5,10 +5,10 @@ import androidx.lifecycle.OnLifecycleEvent
 import com.glodanif.bluetoothchat.data.model.ConversationsStorage
 import com.glodanif.bluetoothchat.ui.view.ContactChooserView
 import com.glodanif.bluetoothchat.ui.viewmodel.converter.ContactConverter
-import kotlinx.coroutines.experimental.CoroutineDispatcher
-import kotlinx.coroutines.experimental.Dispatchers
-import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.withContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class ContactChooserPresenter(private val view: ContactChooserView,
                               private val model: ConversationsStorage,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ConversationsPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ConversationsPresenter.kt
@@ -9,10 +9,10 @@ import com.glodanif.bluetoothchat.data.model.*
 import com.glodanif.bluetoothchat.ui.view.ConversationsView
 import com.glodanif.bluetoothchat.ui.viewmodel.ConversationViewModel
 import com.glodanif.bluetoothchat.ui.viewmodel.converter.ConversationConverter
-import kotlinx.coroutines.experimental.CoroutineDispatcher
-import kotlinx.coroutines.experimental.Dispatchers
-import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.withContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class ConversationsPresenter(private val view: ConversationsView,
                              private val connection: BluetoothConnector,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ImagePreviewPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ImagePreviewPresenter.kt
@@ -3,9 +3,9 @@ package com.glodanif.bluetoothchat.ui.presenter
 import com.glodanif.bluetoothchat.data.model.MessagesStorage
 import com.glodanif.bluetoothchat.ui.view.ImagePreviewView
 import com.glodanif.bluetoothchat.utils.toReadableFileSize
-import kotlinx.coroutines.experimental.CoroutineDispatcher
-import kotlinx.coroutines.experimental.Dispatchers
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.io.File
 
 class ImagePreviewPresenter(private val messageId: Long,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ProfilePresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ProfilePresenter.kt
@@ -7,7 +7,10 @@ import com.glodanif.bluetoothchat.data.model.BluetoothScanner
 import com.glodanif.bluetoothchat.data.model.ProfileManager
 import com.glodanif.bluetoothchat.data.service.message.Contract
 import com.glodanif.bluetoothchat.ui.view.ProfileView
-import kotlinx.coroutines.experimental.*
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class ProfilePresenter(private val view: ProfileView,
                        private val settings: ProfileManager,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ReceivedImagesPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ReceivedImagesPresenter.kt
@@ -2,10 +2,10 @@ package com.glodanif.bluetoothchat.ui.presenter
 
 import com.glodanif.bluetoothchat.data.model.MessagesStorage
 import com.glodanif.bluetoothchat.ui.view.ReceivedImagesView
-import kotlinx.coroutines.experimental.CoroutineDispatcher
-import kotlinx.coroutines.experimental.Dispatchers
-import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.withContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class ReceivedImagesPresenter(private val address: String,
                               private val view: ReceivedImagesView,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ScanPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/ScanPresenter.kt
@@ -6,10 +6,10 @@ import androidx.lifecycle.OnLifecycleEvent
 import com.glodanif.bluetoothchat.data.model.*
 import com.glodanif.bluetoothchat.ui.view.ScanView
 import com.glodanif.bluetoothchat.utils.withPotentiallyInstalledApplication
-import kotlinx.coroutines.experimental.CoroutineDispatcher
-import kotlinx.coroutines.experimental.Dispatchers
-import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.withContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class ScanPresenter(private val view: ScanView,
                     private val scanner: BluetoothScanner,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/SettingsPresenter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/presenter/SettingsPresenter.kt
@@ -3,7 +3,10 @@ package com.glodanif.bluetoothchat.ui.presenter
 import androidx.annotation.ColorInt
 import com.glodanif.bluetoothchat.data.model.UserPreferences
 import com.glodanif.bluetoothchat.ui.view.SettingsView
-import kotlinx.coroutines.experimental.*
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class SettingsPresenter(private val view: SettingsView,
                         private val preferences: UserPreferences,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/ChatMessageViewModel.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/ChatMessageViewModel.kt
@@ -7,6 +7,7 @@ import com.glodanif.bluetoothchat.utils.Size
 data class ChatMessageViewModel(
         val uid: Long,
         val dayOfYear: String,
+        val dayOfYearRaw: Long,
         val time: String,
         val text: String?,
         val own: Boolean,
diff --git a/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/converter/ChatMessageConverter.kt b/app/src/main/kotlin/com/glodanif/bluetoothchat/ui/viewmodel/converter/ChatMessageConverter.kt
@@ -12,6 +12,7 @@ import java.util.*
 class ChatMessageConverter(context: Context) {
 
     private val dayOfYearFormat = SimpleDateFormat(context.getString(R.string.chat__date_format_day_of_year), Locale.getDefault())
+    private val dayOfYearRawFormat = SimpleDateFormat("MMdd", Locale.getDefault())
     private val timeFormat = SimpleDateFormat(context.getString(R.string.chat__date_format_time), Locale.getDefault())
     private val displayMetrics = context.getDisplayMetrics()
 
@@ -40,6 +41,7 @@ class ChatMessageConverter(context: Context) {
         return ChatMessageViewModel(
                 message.uid,
                 dayOfYearFormat.format(message.date),
+                dayOfYearRawFormat.format(message.date).toLong(),
                 timeFormat.format(message.date),
                 message.text,
                 message.own,
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 
-    ext.KOTLIN_VERSION = '1.2.71'
+    ext.KOTLIN_VERSION = '1.3.11'
 
     repositories {
         google()

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,7 @@ class ChatAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), StickyRecyc`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`- override fun getHeaderId(position: Int): Long {`
`124`		`- return messages[position].dayOfYear.hashCode().toLong()`
`125`		`- }`
	`123`	`+ override fun getHeaderId(position: Int) = messages[position].dayOfYearRaw`
`126`	`124`
`127`	`125`	`override fun onCreateHeaderViewHolder(parent: ViewGroup): RecyclerView.ViewHolder {`
`128`	`126`	`val view = LayoutInflater.from(parent.context).inflate(R.layout.item_date_divider, parent, false)`