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

Commit 032d0c29 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Fix accent & primaryTextColor issue 

Prebuilt apps failed to receive actual android private colors. This
commit change these colors to e-ui-sdk colors.
parent fd1404ba

app/src/main/res/layout/fragment_eelo_authenticator.xml

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
                    android:layout_marginEnd="16dp"

                    android:text="@string/sign_in"

                    android:textColor="@android:color/white"

                    app:backgroundTint="@*android:color/accent_material_light" />

                    app:backgroundTint="@color/accentColor" />



                <Button

                    android:id="@+id/server_toggle_button"

app/src/main/res/layout/fragment_invite_successful.xml

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="@*android:color/bright_foreground_holo_light"

            android:textColor="@color/primaryTextColor"

            android:textSize="13sp"

            android:layout_marginStart="17dp"

            android:layout_marginEnd="24dp"
@@ -53,7 +53,7 @@ 
        android:layout_marginTop="48dp"

        android:layout_marginStart="24dp"

        android:textSize="20sp"

        android:textColor="@*android:color/bright_foreground_holo_light"

        android:textColor="@color/primaryTextColor"

        android:text="@string/instructions_heading"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/successful_box"/>
@@ -78,7 +78,7 @@ 
        android:layout_marginBottom="16dp"

        android:layout_marginStart="16dp"

        android:layout_marginEnd="16dp"

        app:backgroundTint="@*android:color/accent_material_light"

        app:backgroundTint="@color/accentColor"

        android:textColor="@android:color/white"

        android:text="@string/sign_in_button"

        app:layout_constraintStart_toStartOf="parent"
@@ -91,7 +91,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/setup_later_button"

        android:textColor="@*android:color/accent_material_light"

        android:textColor="@color/accentColor"

        style="@style/Widget.MaterialComponents.Button.TextButton"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/fragment_send_invite.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:paddingStart="24dp"

        android:paddingEnd="24dp"

        android:textSize="16sp"

        android:textColor="@*android:color/bright_foreground_holo_light"

        android:textColor="@color/primaryTextColor"

        android:text="@string/send_invite_heading"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

app/src/main/res/values-night/colors.xml

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <color name="actionbar_back">@*android:color/bright_foreground_holo_dark</color>

    <color name="edit_text_disabled_color">#61ffffff</color>

    <color name="button_text">#BDFFFFFF</color>

</resources>
 
 No newline at end of file

app/src/main/res/values/colors.xml

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



<resources>

    <color name="create_account_button_enabled_color">@*android:color/accent_material_light</color>

    <color name="create_account_button_enabled_color">@color/accentColor</color>

    <color name="create_account_button_disabled_color">#61000000</color>

    <color name="create_account_input_enabled_color">@*android:color/accent_material_light</color>

    <color name="create_account_input_enabled_color">@color/accentColor</color>

    <color name="create_account_input_disabled_color">#61000000</color>

    <color name="instructions_text">#BD000000</color>

    <color name="actionbar_back">@*android:color/bright_foreground_holo_light</color>

    <color name="actionbar_back">@color/primaryTextColor</color>

    <color name="edit_text_disabled_color">#61000000</color>

    <color name="button_text">#BD000000</color>

</resources>