diff --git a/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt b/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt index e0039a67bb..5d71b4f17b 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt @@ -90,6 +90,7 @@ class MainActivity: FragmentActivity(), LifecycleEventObserver { runAuthenticate() } } + else -> {} } } } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt index 65e85e0b75..75799c6818 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt @@ -40,6 +40,7 @@ fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, durat Icon(Icons.Outlined.CallEnd, stringResource(R.string.icon_descr_call_ended), tint = HighOrLowlight, modifier = Modifier.padding(end = 4.dp)) Text(status.duration(duration), color = HighOrLowlight) } + CICallStatus.Error -> {} } Text( diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt index d8f6a04432..7216716031 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt @@ -68,8 +68,9 @@ fun MarkdownText ( val link = ft.link if (link != null) { hasLinks = true + val ftStyle = ft.format.style withAnnotation(tag = "URL", annotation = link) { - withStyle(ft.format.style) { append(ft.text) } + withStyle(ftStyle) { append(ft.text) } } } else { withStyle(ft.format.style) { append(ft.text) } diff --git a/apps/android/build.gradle b/apps/android/build.gradle index 3e95260fac..88f2d35f7e 100644 --- a/apps/android/build.gradle +++ b/apps/android/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - compose_version = '1.1.1' + compose_version = '1.2.0-beta02' } repositories { google() @@ -8,7 +8,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.2.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" classpath "org.jetbrains.kotlin:kotlin-serialization:1.3.2" // NOTE: Do not place your application dependencies here; they belong @@ -18,8 +18,8 @@ buildscript { plugins { id 'com.android.application' version '7.2.0' apply false id 'com.android.library' version '7.2.0' apply false - id 'org.jetbrains.kotlin.android' version '1.6.10' apply false - id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.10' + id 'org.jetbrains.kotlin.android' version '1.6.21' apply false + id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.21' } task clean(type: Delete) {