diff --git a/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt b/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt index be9d67407..661676958 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt @@ -8,6 +8,8 @@ import androidx.compose.runtime.Immutable import com.fasterxml.jackson.module.kotlin.readValue import com.vitorpamplona.amethyst.model.Account import com.vitorpamplona.amethyst.model.ConnectivityType +import com.vitorpamplona.amethyst.model.DefaultReactions +import com.vitorpamplona.amethyst.model.DefaultZapAmounts import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS import com.vitorpamplona.amethyst.model.Nip47URI @@ -323,11 +325,11 @@ object LocalPreferences { val zapAmountChoices = getString(PrefKeys.ZAP_AMOUNTS, "[]")?.let { Event.mapper.readValue?>(it) - }?.ifEmpty { listOf(500L, 1000L, 5000L) } ?: listOf(500L, 1000L, 5000L) + }?.ifEmpty { DefaultZapAmounts } ?: DefaultZapAmounts val reactionChoices = getString(PrefKeys.REACTION_CHOICES, "[]")?.let { Event.mapper.readValue?>(it) - }?.ifEmpty { listOf("+") } ?: listOf("+") + }?.ifEmpty { DefaultReactions } ?: DefaultReactions val defaultZapType = getString(PrefKeys.DEFAULT_ZAPTYPE, "")?.let { serverName -> LnZapEvent.ZapType.values().firstOrNull() { it.name == serverName } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt index 15ca50074..ce14f770e 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt @@ -42,6 +42,10 @@ val DefaultChannels = setOf( "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5" // -> Amethyst's Group ) +val DefaultReactions = listOf("\uD83D\uDE80", "\uD83E\uDEC2", "\uD83D\uDC40", "\uD83D\uDE02") + +val DefaultZapAmounts = listOf(500L, 1000L, 5000L) + fun getLanguagesSpokenByUser(): Set { val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration()) val codedList = mutableSetOf() @@ -67,8 +71,8 @@ class Account( var dontTranslateFrom: Set = getLanguagesSpokenByUser(), var languagePreferences: Map = mapOf(), var translateTo: String = Locale.getDefault().language, - var zapAmountChoices: List = listOf(500L, 1000L, 5000L), - var reactionChoices: List = listOf("+"), + var zapAmountChoices: List = DefaultZapAmounts, + var reactionChoices: List = DefaultReactions, var defaultZapType: LnZapEvent.ZapType = LnZapEvent.ZapType.PRIVATE, var defaultFileServer: ServersAvailable = ServersAvailable.NOSTR_BUILD, var defaultHomeFollowList: String = KIND3_FOLLOWS,