From cbef8f7cdfbb94b08fa6020aa662f2d30e14479d Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 12 Oct 2023 13:30:51 +0200
Subject: [PATCH] fix emoji size in markdown headlines

androidx.emoji2:emoji2:1.4.0 seems to fix the bug that emojis in markdown headlines are rendered too large.

To use v1.4.0 of emoji2 it was necessary to bump compileSdk to v34, which in turn required the minor changes to the overwritten
onDraw of View class.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/build.gradle                                           | 4 ++--
 app/src/main/java/com/nextcloud/talk/ui/MicInputCloud.kt   | 2 +-
 app/src/main/java/com/nextcloud/talk/ui/WaveformSeekBar.kt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fd8a62468..b5f08da02 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ apply plugin: "org.jlleitschuh.gradle.ktlint"
 apply plugin: 'kotlinx-serialization'
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     namespace 'com.nextcloud.talk'
 
@@ -141,7 +141,7 @@ ext {
     androidxCameraVersion = "1.2.3"
     coilKtVersion = "2.4.0"
     daggerVersion = "2.48.1"
-    emojiVersion = "1.3.0"
+    emojiVersion = "1.4.0"
     lifecycleVersion = '2.6.2'
     okhttpVersion = "4.11.0"
     markwonVersion = "4.6.2"
diff --git a/app/src/main/java/com/nextcloud/talk/ui/MicInputCloud.kt b/app/src/main/java/com/nextcloud/talk/ui/MicInputCloud.kt
index 50e3c9ada..4311583ef 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/MicInputCloud.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/MicInputCloud.kt
@@ -176,7 +176,7 @@ class MicInputCloud(context: Context, attrs: AttributeSet) : View(context, attrs
     private val ovalTwoPath: Path = Path()
     private val ovalThreePath: Path = Path()
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         circlePath.apply {
             addCircle(centerX, centerY, DEFAULT_RADIUS, Path.Direction.CCW)
diff --git a/app/src/main/java/com/nextcloud/talk/ui/WaveformSeekBar.kt b/app/src/main/java/com/nextcloud/talk/ui/WaveformSeekBar.kt
index 2e861277b..4a208324b 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/WaveformSeekBar.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/WaveformSeekBar.kt
@@ -83,7 +83,7 @@ class WaveformSeekBar : AppCompatSeekBar {
         }
     }
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         if (waveData.isEmpty() || waveData[0].toString() == "NaN") {
             super.onDraw(canvas)
         } else {