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

Commit 4f4a2baf authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '311-Encrpytion_notifier_not_visible_in_dark_mode_issue' into 'main' 

311-Encrpytion_notifier_in_recipient_token_not_visible_in_dark_mode_issue

See merge request !75
parents 9f4faa48 34a0ffe7

app/k9mail/src/main/res/values/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
        <item name="iconAboutTwitter">@drawable/ic_twitter</item>



        <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>

        <item name="openpgp_black">#000</item>

        <item name="openpgp_black">@color/default_icon_color</item>

        <item name="openpgp_orange">#FF8800</item>

        <item name="openpgp_red">#CC0000</item>

        <item name="openpgp_green">#669900</item>
@@ -265,7 +265,7 @@ 
        <item name="iconAboutTwitter">@drawable/ic_twitter</item>



        <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>

        <item name="openpgp_black">#000</item>

        <item name="openpgp_black">@color/default_icon_color</item>

        <item name="openpgp_orange">#FF8800</item>

        <item name="openpgp_red">#CC0000</item>

        <item name="openpgp_green">#669900</item>

app/ui/legacy/src/main/res/layout/recipient_token_item.xml

+36 −34
Original line number Diff line number Diff line
@@ -5,6 +5,42 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content">



    <ImageView

        android:id="@+id/contact_crypto_status_icon_simple"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:contentDescription="@null"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_status_corner"

        app:tint="?openpgp_black"

        tools:visibility="gone" />



    <ImageView

        android:id="@+id/contact_crypto_status_icon_simple_enabled"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:contentDescription="@null"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_status_corner"

        app:tint="?openpgp_green"

        tools:visibility="gone" />



    <ImageView

        android:id="@+id/contact_crypto_status_icon_simple_error"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:contentDescription="@null"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_status_corner"

        app:tint="?openpgp_red"

        tools:visibility="gone" />



    <View

        android:id="@+id/background"

        android:layout_width="0dp"
@@ -57,41 +93,7 @@ 
        app:layout_constraintTop_toTopOf="parent"

        tools:text="Jane Doe" />



    <ImageView

        android:id="@+id/contact_crypto_status_icon_simple"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:contentDescription="@null"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_status_corner"

        app:tint="?openpgp_black"

        tools:visibility="gone" />



    <ImageView

        android:id="@+id/contact_crypto_status_icon_simple_enabled"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:contentDescription="@null"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_status_corner"

        app:tint="?openpgp_green"

        tools:visibility="gone" />



    <ImageView

        android:id="@+id/contact_crypto_status_icon_simple_error"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:contentDescription="@null"

        android:visibility="gone"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_status_corner"

        app:tint="?openpgp_red"

        tools:visibility="gone" />



    <ImageView

        android:id="@+id/contact_crypto_status_red"