diff --git a/build.gradle b/build.gradle index cb63138c..2b4c0fda 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,13 @@ buildscript { ext.autodispose_version = '0.5.1' + ext.constraintlayout_version = '1.1.0-beta5' ext.kotlin_version = '1.2.20' - ext.lifecycle_version = '1.0.0' + ext.lifecycle_version = '1.1.0' ext.realm_version = '4.3.1' ext.realm_adapters_version = '2.1.0' ext.rxbinding_version = '2.0.0' - ext.support_version = '27.0.2' + ext.support_version = '27.1.0' repositories { diff --git a/qksms/build.gradle b/qksms/build.gradle index fe6d17dc..eee130f1 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion 27 - buildToolsVersion "27.0.2" + buildToolsVersion "27.0.3" flavorDimensions "analytics" defaultConfig { @@ -52,6 +52,7 @@ dependencies { // support implementation "com.android.support:appcompat-v7:$support_version" + implementation "com.android.support.constraint:constraint-layout:$constraintlayout_version" implementation "com.android.support:design:$support_version" // rxbinding @@ -74,7 +75,6 @@ dependencies { }) implementation "androidx.core:core-ktx:0.1" implementation "com.android.billingclient:billing:1.0" - implementation "com.android.support.constraint:constraint-layout:1.1.0-beta4" implementation "com.bugsnag:bugsnag-android:4.1.1" implementation "com.github.chrisbanes:PhotoView:2.0.0" implementation "com.f2prateek.rx.preferences2:rx-preferences:2.0.0-RC3" diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt index 6b32e872..68e07383 100644 --- a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt @@ -35,7 +35,7 @@ class BlockedAdapter @Inject constructor(private val context: Context) : Flowabl val unblock: PublishSubject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { return QkViewHolder(LayoutInflater.from(context).inflate(R.layout.blocked_list_item, parent, false)) } diff --git a/qksms/src/main/java/presentation/feature/compose/AttachmentAdapter.kt b/qksms/src/main/java/presentation/feature/compose/AttachmentAdapter.kt index cb7554f4..3c11b403 100644 --- a/qksms/src/main/java/presentation/feature/compose/AttachmentAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/AttachmentAdapter.kt @@ -61,7 +61,7 @@ class AttachmentAdapter @Inject constructor( return QkViewHolder(view) } - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) { + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { super.onDetachedFromRecyclerView(recyclerView) disposables.clear() } diff --git a/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt b/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt index ab6f9e53..b4f6456a 100644 --- a/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt @@ -37,7 +37,7 @@ class ContactAdapter @Inject constructor(private val context: Context) : QkAdapt val contactSelected: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val layoutRes = R.layout.contact_list_item val layoutInflater = LayoutInflater.from(context) val view = layoutInflater.inflate(layoutRes, parent, false) diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index 4607981c..c05d470e 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -80,7 +80,7 @@ class MessagesAdapter @Inject constructor( * this a unique viewType even though it uses the same view, so that regular messages * don't need clipToOutline set to true, and they don't need to worry about images */ - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val layoutInflater = LayoutInflater.from(context) val view: View diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationMediaAdapter.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationMediaAdapter.kt index cae2e13f..97e1b971 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationMediaAdapter.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationMediaAdapter.kt @@ -44,7 +44,7 @@ class ConversationMediaAdapter @Inject constructor( private val disposables = CompositeDisposable() - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val view = LayoutInflater.from(context).inflate(R.layout.conversation_media_list_item, parent, false) disposables += colors.separator.subscribe { color -> view.setBackgroundColor(color) } @@ -65,7 +65,7 @@ class ConversationMediaAdapter @Inject constructor( view.thumbnail.setOnClickListener { thumbnailClicks.onNext(it) } } - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) { + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { disposables.clear() } diff --git a/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt b/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt index cc3b332b..fe2a61ed 100644 --- a/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt +++ b/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt @@ -54,7 +54,7 @@ class ConversationsAdapter @Inject constructor( private val disposables = CompositeDisposable() - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { val layoutRes = when (viewType) { 0 -> R.layout.conversation_list_item else -> R.layout.conversation_list_item_unread diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt index 641bb1c9..626bc09c 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt @@ -113,12 +113,12 @@ class ThemeAdapter @Inject constructor( .forEach { theme -> view.palette.addView(theme) } } - override fun onAttachedToRecyclerView(recyclerView: RecyclerView?) { + override fun onAttachedToRecyclerView(recyclerView: RecyclerView) { disposables += colors.textPrimaryOnTheme .subscribe { color -> iconTint = color } } - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) { + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { disposables.clear() }