Add new colors

2025-01-05 14:05:30 +01:00 · 2023-08-04 21:34:07 +02:00 · 2023-08-04 21:34:07 +02:00 · 8d9c855c08
commit 8d9c855c08
parent 837998b049
36 changed files with 110 additions and 152 deletions
--- a/core/designsystem/src/main/java/com/twofasapp/designsystem/internal/ThemeColors.kt
+++ b/core/designsystem/src/main/java/com/twofasapp/designsystem/internal/ThemeColors.kt
@ -31,12 +31,14 @@ abstract class ThemeColors {

    val accentLightBlue: Color = Color(0xFF7F9CFF)
    val accentIndigo: Color = Color(0xFF5E5CE6)
-    val accentPurple: Color = Color(0xFFD95DDC)
+    val accentPurple: Color = Color(0xFF8C49DE)
    val accentTurquoise: Color = Color(0xFF2FCFBC)
    val accentGreen: Color = Color(0xFF03BF38)
    val accentRed: Color = Color(0xFFED1C24)
    val accentOrange: Color = Color(0xFFFF7A00)
    val accentYellow: Color = Color(0xFFFFBA0A)
+    val accentPink: Color = Color(0xFFca49de)
+    val accentBrown: Color = Color(0xFFbd8857)
 }

 val LocalThemeColors = staticCompositionLocalOf<ThemeColors> {
--- a/core/locale/src/main/res/values-de-rDE/strings.xml
+++ b/core/locale/src/main/res/values-de-rDE/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: de-DE, German (Germany)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/core/locale/src/main/res/values-es-rES/strings.xml
+++ b/core/locale/src/main/res/values-es-rES/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: es-ES, Spanish (Spain)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/core/locale/src/main/res/values-fr-rFR/strings.xml
+++ b/core/locale/src/main/res/values-fr-rFR/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: fr-FR, French (France)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/core/locale/src/main/res/values-it-rIT/strings.xml
+++ b/core/locale/src/main/res/values-it-rIT/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: it-IT, Italian (Italy)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/core/locale/src/main/res/values-pl-rPL/strings.xml
+++ b/core/locale/src/main/res/values-pl-rPL/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: pl-PL, Polish (Poland)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -796,4 +796,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/core/locale/src/main/res/values-pt-rBR/strings.xml
+++ b/core/locale/src/main/res/values-pt-rBR/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: pt-BR, Brazilian Portuguese
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -785,9 +785,11 @@
    <string name="fingerprint__biometric_invalidated">O login biométrico está desativado, você pode mudar essa configuração nas configurações do sistema de biometria\u0020</string>
    <string name="tokens__last_pass_import">Importar código 2FA do aplicativo LastPass</string>
    <string name="tokens__last_pass_import_subtitle">Este código QR permite importar Códigos do LastPass</string>
-    <string name="tokens__add_with_guide">Guide me</string>
-    <string name="guides__select_title">Browse services</string>
-    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
-    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
-    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="tokens__add_with_guide">Guia me</string>
+    <string name="guides__select_title">Serviços do Navegador</string>
+    <string name="guides__select_description">Selecione um serviço para parear com o 2FAS app</string>
+    <string name="guides__select_provide_guide">Você quer providenciar guias do 2FA para o seu serviço</string>
+    <string name="guides__select_provide_guide_cta">Aplicar agora</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/core/locale/src/main/res/values-pt-rPT/strings.xml
+++ b/core/locale/src/main/res/values-pt-rPT/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: pt-PT, Portuguese (Portugal)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/core/locale/src/main/res/values-uk-rUA/strings.xml
+++ b/core/locale/src/main/res/values-uk-rUA/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: uk-UA, Ukrainian (Ukraine)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -791,9 +791,11 @@
    <string name="fingerprint__biometric_invalidated">Біометричний вхід вимкнено через зміни системних налаштувань відбитків пальців</string>
    <string name="tokens__last_pass_import">Імпортувати токени із додатку LastPass</string>
    <string name="tokens__last_pass_import_subtitle">Цей QR-код дозволяє імпортувати токени з LastPass</string>
-    <string name="tokens__add_with_guide">Guide me</string>
-    <string name="guides__select_title">Browse services</string>
-    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
-    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
-    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="tokens__add_with_guide">Покажіть мені</string>
+    <string name="guides__select_title">Перегляд сервісів</string>
+    <string name="guides__select_description">Обрати сервіс для підключення до додатку 2FAS</string>
+    <string name="guides__select_provide_guide">Чи хочете ви надати 2FA інструкції для вашого сервісу?</string>
+    <string name="guides__select_provide_guide_cta">Застосувати зараз</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/core/locale/src/main/res/values/strings.xml
+++ b/core/locale/src/main/res/values/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: en, English
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/data/services/src/main/java/com/twofasapp/data/services/domain/Service.kt
+++ b/data/services/src/main/java/com/twofasapp/data/services/domain/Service.kt
@ -46,14 +46,17 @@ data class Service(
    enum class Source { Link, Manual }
    enum class Tint {
        Default,
-        LightBlue,
-        Indigo,
-        Purple,
-        Turquoise,
-        Green,
        Red,
        Orange,
-        Yellow;
+        Yellow,
+        Green,
+        Turquoise,
+        LightBlue,
+        Indigo,
+        Pink,
+        Purple,
+        Brown,
+        ;
    }

    companion object {
--- a/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/StateMapper.kt
+++ b/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/StateMapper.kt
@ -48,6 +48,8 @@ private fun Service.Tint?.asState(): Color {
        Service.Tint.Red -> TwTheme.color.accentRed
        Service.Tint.Orange -> TwTheme.color.accentOrange
        Service.Tint.Yellow -> TwTheme.color.accentYellow
+        Service.Tint.Pink -> TwTheme.color.accentPink
+        Service.Tint.Brown -> TwTheme.color.accentBrown
        null -> TwTheme.color.surfaceVariant
    }
 }
--- a/feature/trash/src/main/java/com/twofasapp/feature/trash/ui/trash/TrashScreen.kt
+++ b/feature/trash/src/main/java/com/twofasapp/feature/trash/ui/trash/TrashScreen.kt
@ -130,6 +130,8 @@ private fun Service.Tint?.asState(): Color {
        Service.Tint.Red -> TwTheme.color.accentRed
        Service.Tint.Orange -> TwTheme.color.accentOrange
        Service.Tint.Yellow -> TwTheme.color.accentYellow
+        Service.Tint.Pink -> TwTheme.color.accentPink
+        Service.Tint.Brown -> TwTheme.color.accentBrown
        null -> TwTheme.color.surfaceVariant
    }
 }
--- a/prefs/src/main/java/com/twofasapp/prefs/model/Tint.kt
+++ b/prefs/src/main/java/com/twofasapp/prefs/model/Tint.kt
@ -2,19 +2,21 @@ package com.twofasapp.prefs.model

 import android.content.Context
 import android.graphics.Color
-import com.twofasapp.prefs.R
 import com.twofasapp.prefs.isNight

-enum class Tint(val displayName: String, val hex: String, val hexDark: String = hex) {
-    Default("Default", "#ebebeb", "#232428"),
-    LightBlue("Light blue", "#7F9CFF"),
-    Indigo("Indigo", "#5E5CE6"),
-    Purple("Purple", "#D95DDC"),
-    Turquoise("Turquoise", "#2FCFBC"),
-    Green("Green", "#03BF38"),
-    Red("Red", "#ED1C24"),
-    Orange("Orange", "#FF7A00"),
-    Yellow("Yellow", "#FFBA0A");
+enum class Tint(val hex: String, val hexDark: String = hex) {
+    Default("#ebebeb", "#232428"),
+    Red("#ED1C24"),
+    Orange("#FF7A00"),
+    Yellow("#FFBA0A"),
+    Green("#03BF38"),
+    Turquoise("#2FCFBC"),
+    LightBlue("#7F9CFF"),
+    Indigo("#5E5CE6"),
+    Pink("#ca49de"),
+    Purple("#8C49DE"),
+    Brown("#bd8857"),
+    ;
 }

 fun Tint?.toColor(context: Context, default: Tint = Tint.Default): Int {
@ -22,19 +24,4 @@ fun Tint?.toColor(context: Context, default: Tint = Tint.Default): Int {
        if (context.isNight()) (this ?: default).hexDark else (this
            ?: default).hex
    )
-}
-
-fun Tint?.toBackgroundResource(context: Context, default: Tint = Tint.Default): Int {
-    return when (this) {
-        Tint.LightBlue -> R.drawable.circle_lightblue
-        Tint.Indigo -> R.drawable.circle_indigo
-        Tint.Purple -> R.drawable.circle_purple
-        Tint.Turquoise -> R.drawable.circle_turquoise
-        Tint.Green -> R.drawable.circle_green
-        Tint.Red -> R.drawable.circle_red
-        Tint.Orange -> R.drawable.circle_orange
-        Tint.Yellow -> R.drawable.circle_yellow
-        Tint.Default,
-        null -> if (context.isNight()) R.drawable.circle_default_night else R.drawable.circle_default
-    }
 }
--- a/prefs/src/main/res/drawable/circle_default.xml
+++ b/prefs/src/main/res/drawable/circle_default.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#ebebeb" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_default_night.xml
+++ b/prefs/src/main/res/drawable/circle_default_night.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#232428" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_green.xml
+++ b/prefs/src/main/res/drawable/circle_green.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#03BF38" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_indigo.xml
+++ b/prefs/src/main/res/drawable/circle_indigo.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#5E5CE6" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_lightblue.xml
+++ b/prefs/src/main/res/drawable/circle_lightblue.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#7F9CFF" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_orange.xml
+++ b/prefs/src/main/res/drawable/circle_orange.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#FF7A00" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_purple.xml
+++ b/prefs/src/main/res/drawable/circle_purple.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#D95DDC" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_red.xml
+++ b/prefs/src/main/res/drawable/circle_red.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#ED1C24" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_turquoise.xml
+++ b/prefs/src/main/res/drawable/circle_turquoise.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#2FCFBC" />
-        </shape>
-    </item>
-</selector>
--- a/prefs/src/main/res/drawable/circle_yellow.xml
+++ b/prefs/src/main/res/drawable/circle_yellow.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#FFBA0A" />
-        </shape>
-    </item>
-</selector>
--- a/resources/src/main/res/values-de-rDE/strings.xml
+++ b/resources/src/main/res/values-de-rDE/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: de-DE, German (Germany)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/resources/src/main/res/values-es-rES/strings.xml
+++ b/resources/src/main/res/values-es-rES/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: es-ES, Spanish (Spain)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/resources/src/main/res/values-fr-rFR/strings.xml
+++ b/resources/src/main/res/values-fr-rFR/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: fr-FR, French (France)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/resources/src/main/res/values-it-rIT/strings.xml
+++ b/resources/src/main/res/values-it-rIT/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: it-IT, Italian (Italy)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/resources/src/main/res/values-pl-rPL/strings.xml
+++ b/resources/src/main/res/values-pl-rPL/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: pl-PL, Polish (Poland)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -796,4 +796,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/resources/src/main/res/values-pt-rBR/strings.xml
+++ b/resources/src/main/res/values-pt-rBR/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: pt-BR, Brazilian Portuguese
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -785,9 +785,11 @@
    <string name="fingerprint__biometric_invalidated">O login biométrico está desativado, você pode mudar essa configuração nas configurações do sistema de biometria\u0020</string>
    <string name="tokens__last_pass_import">Importar código 2FA do aplicativo LastPass</string>
    <string name="tokens__last_pass_import_subtitle">Este código QR permite importar Códigos do LastPass</string>
-    <string name="tokens__add_with_guide">Guide me</string>
-    <string name="guides__select_title">Browse services</string>
-    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
-    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
-    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="tokens__add_with_guide">Guia me</string>
+    <string name="guides__select_title">Serviços do Navegador</string>
+    <string name="guides__select_description">Selecione um serviço para parear com o 2FAS app</string>
+    <string name="guides__select_provide_guide">Você quer providenciar guias do 2FA para o seu serviço</string>
+    <string name="guides__select_provide_guide_cta">Aplicar agora</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/resources/src/main/res/values-pt-rPT/strings.xml
+++ b/resources/src/main/res/values-pt-rPT/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: pt-PT, Portuguese (Portugal)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/resources/src/main/res/values-uk-rUA/strings.xml
+++ b/resources/src/main/res/values-uk-rUA/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: uk-UA, Ukrainian (Ukraine)
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -791,9 +791,11 @@
    <string name="fingerprint__biometric_invalidated">Біометричний вхід вимкнено через зміни системних налаштувань відбитків пальців</string>
    <string name="tokens__last_pass_import">Імпортувати токени із додатку LastPass</string>
    <string name="tokens__last_pass_import_subtitle">Цей QR-код дозволяє імпортувати токени з LastPass</string>
-    <string name="tokens__add_with_guide">Guide me</string>
-    <string name="guides__select_title">Browse services</string>
-    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
-    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
-    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="tokens__add_with_guide">Покажіть мені</string>
+    <string name="guides__select_title">Перегляд сервісів</string>
+    <string name="guides__select_description">Обрати сервіс для підключення до додатку 2FAS</string>
+    <string name="guides__select_provide_guide">Чи хочете ви надати 2FA інструкції для вашого сервісу?</string>
+    <string name="guides__select_provide_guide_cta">Застосувати зараз</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/resources/src/main/res/values/strings.xml
+++ b/resources/src/main/res/values/strings.xml
@ -5,7 +5,7 @@
 Release: Working copy
 Locale: en, English
 Exported by: rafakob
- Exported at: Fri, 21 Jul 2023 07:33:24 -0700
+ Exported at: Fri, 04 Aug 2023 12:29:35 -0700
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- InfoPlist.strings
@ -215,7 +215,7 @@
    <string name="tokens__check_app_permissions">Check if the app has proper permissions in the System Settings</string>
    <string name="tokens__no_qr_codes_found">No QR codes found</string>
    <!-- tokens__no_correct_qr_code_had_been_found
-        
+
        No correct QR codes had been found in the selected image. Please try a different image. -->
    <string name="tokens__no_correct_qr_code_found_title">There is no correct QR code in the selected image. Please try a different image.</string>
    <string name="tokens__select_service">Select Service</string>
@ -790,4 +790,6 @@
    <string name="guides__select_description">Select service to pair with the 2FAS app</string>
    <string name="guides__select_provide_guide">Do you want to provide 2FA guides for your service?</string>
    <string name="guides__select_provide_guide_cta">Apply now</string>
+    <string name="color__pink">Pink</string>
+    <string name="color__brown">Brown</string>
 </resources>
--- a/services/src/main/java/com/twofasapp/services/ui/EditServiceScreen.kt
+++ b/services/src/main/java/com/twofasapp/services/ui/EditServiceScreen.kt
@ -459,6 +459,8 @@ fun Service.Tint?.asColor(): Color {
        Service.Tint.Red -> TwTheme.color.accentRed
        Service.Tint.Orange -> TwTheme.color.accentOrange
        Service.Tint.Yellow -> TwTheme.color.accentYellow
+        Service.Tint.Pink -> TwTheme.color.accentPink
+        Service.Tint.Brown -> TwTheme.color.accentBrown
        null -> TwTheme.color.surfaceVariant
    }
 }
--- a/services/src/main/java/com/twofasapp/services/ui/badge/ColorBadgeDialog.kt
+++ b/services/src/main/java/com/twofasapp/services/ui/badge/ColorBadgeDialog.kt
@ -78,6 +78,8 @@ internal fun ColorBadgeDialog(
                                Service.Tint.Red -> com.twofasapp.resources.R.string.color__red
                                Service.Tint.Orange -> com.twofasapp.resources.R.string.color__orange
                                Service.Tint.Yellow -> com.twofasapp.resources.R.string.color__yellow
+                                Service.Tint.Pink -> com.twofasapp.resources.R.string.color__pink
+                                Service.Tint.Brown -> com.twofasapp.resources.R.string.color__brown
                            }
                        ),
                        style = MaterialTheme.typography.bodyLarge.copy(color = TwTheme.color.onSurfacePrimary),
--- a/services/src/main/java/com/twofasapp/services/ui/changelabel/ChangeLabelScreen.kt
+++ b/services/src/main/java/com/twofasapp/services/ui/changelabel/ChangeLabelScreen.kt
@ -142,6 +142,8 @@ internal fun ChangeLabelScreen(
                                    Service.Tint.Red -> R.string.color__red
                                    Service.Tint.Orange -> R.string.color__orange
                                    Service.Tint.Yellow -> R.string.color__yellow
+                                    Service.Tint.Pink -> R.string.color__pink
+                                    Service.Tint.Brown -> R.string.color__brown
                                }
                            ),
                            style = MaterialTheme.typography.bodySmall.copy(color = TwTheme.color.onSurfacePrimary),