Skip to content
Snippets Groups Projects
Commit cc809b80 authored by Taras's avatar Taras
Browse files

Fix emoji picker colors for dark mode

parent 33e37fe1
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ package org.futo.circles.extensions ...@@ -2,6 +2,7 @@ package org.futo.circles.extensions
import android.content.Context import android.content.Context
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.content.res.Configuration
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.Canvas import android.graphics.Canvas
import android.util.DisplayMetrics import android.util.DisplayMetrics
...@@ -45,4 +46,13 @@ fun Context.getApplicationLabel(packageName: String): String { ...@@ -45,4 +46,13 @@ fun Context.getApplicationLabel(packageName: String): String {
} catch (e: PackageManager.NameNotFoundException) { } catch (e: PackageManager.NameNotFoundException) {
packageName packageName
} }
}
fun Context.isNightMode(): Boolean {
return when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
Configuration.UI_MODE_NIGHT_YES -> true
Configuration.UI_MODE_NIGHT_NO -> false
Configuration.UI_MODE_NIGHT_UNDEFINED -> false
else -> false
}
} }
\ No newline at end of file
package org.futo.circles.feature.timeline.post.emoji package org.futo.circles.feature.timeline.post.emoji
import android.content.Context import android.content.Context
import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
...@@ -13,6 +12,7 @@ import com.vanniktech.emoji.EmojiTheming ...@@ -13,6 +12,7 @@ import com.vanniktech.emoji.EmojiTheming
import org.futo.circles.R import org.futo.circles.R
import org.futo.circles.core.base.fragment.TransparentBackgroundBottomSheetDialogFragment import org.futo.circles.core.base.fragment.TransparentBackgroundBottomSheetDialogFragment
import org.futo.circles.databinding.BottomSheetEmojiBinding import org.futo.circles.databinding.BottomSheetEmojiBinding
import org.futo.circles.extensions.isNightMode
interface EmojiPickerListener { interface EmojiPickerListener {
fun onEmojiSelected(roomId: String?, eventId: String?, emoji: String) fun onEmojiSelected(roomId: String?, eventId: String?, emoji: String)
...@@ -57,17 +57,20 @@ class EmojiBottomSheet : TransparentBackgroundBottomSheetDialogFragment() { ...@@ -57,17 +57,20 @@ class EmojiBottomSheet : TransparentBackgroundBottomSheetDialogFragment() {
org.futo.circles.core.R.color.post_card_background_color org.futo.circles.core.R.color.post_card_background_color
), ),
primaryColor = ContextCompat.getColor( primaryColor = ContextCompat.getColor(
requireContext(),
R.color.gray
),
secondaryColor = ContextCompat.getColor(
requireContext(), requireContext(),
R.color.blue R.color.blue
), ),
secondaryColor = Color.RED,
dividerColor = ContextCompat.getColor( dividerColor = ContextCompat.getColor(
requireContext(), requireContext(),
org.futo.circles.core.R.color.divider_color org.futo.circles.core.R.color.divider_color
), ),
textColor = ContextCompat.getColor( textColor = ContextCompat.getColor(
requireContext(), requireContext(),
R.color.black if (context.isNightMode()) R.color.white else R.color.black
), ),
textSecondaryColor = ContextCompat.getColor( textSecondaryColor = ContextCompat.getColor(
requireContext(), requireContext(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment