Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0d9b58a authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Merge branch '3195-fix_copy_popup_colors' into 'main' 

fix:3195: bad colors on selected text popup

See merge request !29
parents bd88ebbe 9f42703f

gradle/libs.versions.toml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ kotlin = "2.2.0" 
kotlinx-coroutines = "1.10.2"

kotlinx-serialization-json = "1.9.0"

markwon = "4.6.2"

markwon-compose = "0.5.7"

markwon-compose = "0.5.8"



# Tests

junit = "4.13.2"

notificationsreceiver/src/main/res/values-fr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ 
<resources>

    <string name="eos_settings_title">Notifications Murena</string>

    <string name="eos_settings_summary">Consultez l’historique de toutes les notifications de Murena et e Foundation.</string>

    <string name="history_list_empty">Notifications MurenaAucune notification reçue</string>

    <string name="history_list_empty">Aucune notification reçue</string>

    <string name="foreground_service_notification_title">Démarrage du distributeur UnifiedPush</string>

</resources>
 
 No newline at end of file

notificationsreceiver/src/main/res/values/themes.xml

+7 −2
Original line number Diff line number Diff line
@@ -17,12 +17,17 @@ 
  -->



<resources>

    <style name="Theme.EOSNotificationsReceiver" parent="android:Theme.Material.Light.NoActionBar" />

    <style name="Theme.EOSNotificationsReceiver" parent="Theme.MaterialComponents.DayNight.NoActionBar" >

        <item name="colorPrimary">@color/e_accent</item>

        <item name="colorAccent">@color/e_accent</item>

    </style>



    <style name="Theme.EOSNotificationsReceiver.Dialog" parent="android:Theme.Material.Light.Dialog">

    <style name="Theme.EOSNotificationsReceiver.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">

        <item name="android:windowNoTitle">true</item>

        <item name="android:dialogCornerRadius">28dp</item>

        <item name="android:windowCloseOnTouchOutside">true</item>

        <item name="colorPrimary">@color/e_accent</item>

        <item name="colorAccent">@color/e_accent</item>

    </style>



</resources>