gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3378 from nextcloud/bugfix/3377/fixEmojiSizeInMarkdownHeaders

Browse Source 
fix emoji size in markdown headlines
This commit is contained in:
Marcel Hibbe 2023-10-12 13:55:17 +02:00 committed by GitHub
commit 01925dae71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -35,7 +35,7 @@ apply plugin: "org.jlleitschuh.gradle.ktlint"
apply plugin: 'kotlinx-serialization' apply plugin: 'kotlinx-serialization'
android { android {
compileSdk 33 compileSdk 34
namespace 'com.nextcloud.talk' namespace 'com.nextcloud.talk'
@ -141,7 +141,7 @@ ext {
androidxCameraVersion = "1.2.3" androidxCameraVersion = "1.2.3"
coilKtVersion = "2.4.0" coilKtVersion = "2.4.0"
daggerVersion = "2.48.1" daggerVersion = "2.48.1"
emojiVersion = "1.3.0" emojiVersion = "1.4.0"
lifecycleVersion = '2.6.2' lifecycleVersion = '2.6.2'
okhttpVersion = "4.11.0" okhttpVersion = "4.11.0"
markwonVersion = "4.6.2" markwonVersion = "4.6.2"

2
app/src/main/java/com/nextcloud/talk/ui/MicInputCloud.kt
View File

@ -176,7 +176,7 @@ class MicInputCloud(context: Context, attrs: AttributeSet) : View(context, attrs
private val ovalTwoPath: Path = Path() private val ovalTwoPath: Path = Path()
private val ovalThreePath: Path = Path() private val ovalThreePath: Path = Path()
override fun onDraw(canvas: Canvas?) { override fun onDraw(canvas: Canvas) {
super.onDraw(canvas) super.onDraw(canvas)
circlePath.apply { circlePath.apply {
addCircle(centerX, centerY, DEFAULT_RADIUS, Path.Direction.CCW) addCircle(centerX, centerY, DEFAULT_RADIUS, Path.Direction.CCW)

2
app/src/main/java/com/nextcloud/talk/ui/WaveformSeekBar.kt
View File

@ -83,7 +83,7 @@ class WaveformSeekBar : AppCompatSeekBar {
} }
} }
override fun onDraw(canvas: Canvas?) { override fun onDraw(canvas: Canvas) {
if (waveData.isEmpty() || waveData[0].toString() == "NaN") { if (waveData.isEmpty() || waveData[0].toString() == "NaN") {
super.onDraw(canvas) super.onDraw(canvas)
} else { } else {