From ecf2d0692863e6d08d2aaa27d296d3e98dd281aa Mon Sep 17 00:00:00 2001 From: David Langley Date: Thu, 31 Aug 2023 11:37:08 +0100 Subject: [PATCH] Fix colon aligment and load emojis lazily. - Fix colon aligment - Load emojis lazily. --- .../components/customreaction/CustomReactionPresenter.kt | 2 +- .../components/customreaction/DefaultEmojibaseProvider.kt | 8 +++++--- .../components/customreaction/EmojibaseProvider.kt | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenter.kt index 6831ca7dfa..b048383b1f 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenter.kt @@ -43,7 +43,7 @@ class CustomReactionPresenter @Inject constructor( localCoroutineScope.launch { target.value = CustomReactionState.Target.Success( event = event, - emojibaseStore = emojibaseProvider.loadEmojibase() + emojibaseStore = emojibaseProvider.emojibaseStore ) } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/DefaultEmojibaseProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/DefaultEmojibaseProvider.kt index 2e66ea381e..a68d6f0d4e 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/DefaultEmojibaseProvider.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/DefaultEmojibaseProvider.kt @@ -20,8 +20,10 @@ import android.content.Context import io.element.android.emojibasebindings.EmojibaseDatasource import io.element.android.emojibasebindings.EmojibaseStore -class DefaultEmojibaseProvider(val context: Context) :EmojibaseProvider { - override fun loadEmojibase(): EmojibaseStore { - return EmojibaseDatasource().load(context) +class DefaultEmojibaseProvider(val context: Context): EmojibaseProvider { + + override val emojibaseStore: EmojibaseStore by lazy { + EmojibaseDatasource().load(context) } + } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseProvider.kt index 39739538d2..6a4f48a806 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseProvider.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseProvider.kt @@ -19,5 +19,5 @@ package io.element.android.features.messages.impl.timeline.components.customreac import io.element.android.emojibasebindings.EmojibaseStore interface EmojibaseProvider { - fun loadEmojibase(): EmojibaseStore + val emojibaseStore: EmojibaseStore }