Upgrade gradle and kotlin versions

This commit is contained in:
moezbhatti
2018-11-17 18:06:30 -05:00
parent 6bbe8a0260
commit bbecd69ad9
10 changed files with 20 additions and 22 deletions
+2 -2
View File
@@ -24,7 +24,7 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 28
buildToolsVersion "28.0.0"
buildToolsVersion "28.0.3"
flavorDimensions "analytics"
defaultConfig {
@@ -112,6 +112,7 @@ dependencies {
// androidx
implementation "androidx.appcompat:appcompat:$androidx_version"
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
implementation "androidx.core:core-ktx:$androidx_version"
implementation "com.google.android.material:material:$androidx_version"
implementation "androidx.emoji:emoji-appcompat:$androidx_version"
@@ -173,7 +174,6 @@ dependencies {
testImplementation "junit:junit:$junit_version"
testImplementation "org.mockito:mockito-core:$mockito_version"
implementation "androidx.core:core-ktx:$ktx_version"
implementation "com.android.billingclient:billing:1.0"
implementation "com.bugsnag:bugsnag-android:4.1.1"
implementation "com.github.chrisbanes:PhotoView:2.0.0"
@@ -19,12 +19,12 @@
package com.moez.QKSMS.feature.backup
import android.content.Context
import androidx.core.widget.toast
import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.interactor.PerformBackup
import com.moez.QKSMS.manager.PermissionManager
import com.moez.QKSMS.repository.BackupRepository
@@ -92,9 +92,9 @@ class BackupPresenter @Inject constructor(
billingManager.upgradeStatus)
{ _, backupProgress, restoreProgress, upgraded ->
when {
!upgraded -> context.toast(R.string.backup_restore_error_plus)
backupProgress.running -> context.toast(R.string.backup_restore_error_backup)
restoreProgress.running -> context.toast(R.string.backup_restore_error_restore)
!upgraded -> context.makeToast(R.string.backup_restore_error_plus)
backupProgress.running -> context.makeToast(R.string.backup_restore_error_backup)
restoreProgress.running -> context.makeToast(R.string.backup_restore_error_restore)
!permissionManager.hasStorage() -> view.requestStoragePermission()
else -> view.selectFile()
}
@@ -22,7 +22,6 @@ import android.content.Context
import android.telephony.PhoneNumberUtils
import android.telephony.SmsMessage
import android.view.inputmethod.EditorInfo
import androidx.core.widget.toast
import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.androidxcompat.scope
@@ -503,7 +502,7 @@ class ComposeViewModel @Inject constructor(
view.scheduleSelectedIntent
.filter { scheduled ->
(scheduled > System.currentTimeMillis()).also { future ->
if (!future) context.toast(R.string.compose_scheduled_future)
if (!future) context.makeToast(R.string.compose_scheduled_future)
}
}
.autoDisposable(view.scope())
@@ -607,7 +606,7 @@ class ComposeViewModel @Inject constructor(
val uris = attachments.map { it.getUri() }.map { it.toString() }
val params = AddScheduledMessage.Params(state.scheduled, subId, addresses, state.sendAsGroup, body, uris)
addScheduledMessage.execute(params)
context.toast(R.string.compose_scheduled_toast)
context.makeToast(R.string.compose_scheduled_toast)
}
state.sendAsGroup -> {
@@ -19,13 +19,13 @@
package com.moez.QKSMS.feature.settings
import android.content.Context
import androidx.core.widget.toast
import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.interactor.SyncMessages
import com.moez.QKSMS.repository.SyncRepository
import com.moez.QKSMS.util.NightModeManager
@@ -174,7 +174,7 @@ class SettingsPresenter @Inject constructor(
.doOnNext { enabled -> prefs.logging.set(enabled) }
.autoDisposable(view.scope())
.subscribe { enabled ->
context.toast(when (enabled) {
context.makeToast(when (enabled) {
true -> R.string.settings_logging_enabled
false -> R.string.settings_logging_disabled
})