fix conflicts after merging ubrir/master <- master

This commit is contained in:
grigorii 2021-09-15 13:04:35 +03:00
parent c9343855f7
commit 09161d3877
2 changed files with 5 additions and 10 deletions

View File

@ -1,10 +1,10 @@
apply plugin: 'kotlin-android'
rootProject.ext {
compileSdk = 30
compileSdk = 29
minSdk = 21
targetSdk = 30
targetSdk = 29
}
android {

View File

@ -1,19 +1,13 @@
package ru.touchin.extensions
import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import ru.touchin.roboswag.core.log.Lc
import android.provider.Browser
fun Context.safeStartActivity(intent: Intent, options: Bundle? = null) =
try {
startActivity(intent, options)
} catch (e: ActivityNotFoundException) {
Lc.e(e, "Couldn't find activity with this parameters")
}
fun Context.safeStartActivity(intent: Intent, options: Bundle? = null, resolveFlags: Int = 0): Boolean =
packageManager.resolveActivity(intent, resolveFlags)?.let { startActivity(intent, options) } != null
fun Context.openBrowser(url: String) = Intent(Intent.ACTION_VIEW)
.setData(Uri.parse(url))
@ -34,3 +28,4 @@ fun Context.openBrowserWithHeaders(url: String, headersMap: Map<String, String>)
fun Context.callToPhoneNumber(phoneNumber: String) = Intent(Intent.ACTION_VIEW)
.setData(Uri.parse("tel:$phoneNumber"))
.let { intent -> safeStartActivity(intent) }