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

Commit b768bab5 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'issue_3369_weekView_improvement' into 'master' 

Issue 3369 week view improvement

See merge request e/apps/calendar!41
parents 72cd7682 59354422

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
    package="foundation.e.calendar"

    android:installLocation="auto"

    android:versionCode="20"

    android:versionName="1.0.18">

    android:versionName="1.0.18"

    >

<!--         android:sharedUserLabel="@string/app_label"> -->



    <!--

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ android { 
        abortOnError false

    }





    aaptOptions{

        additionalParameters '-I', 'e-ui-sdk.jar'

    }

e-ui-sdk.jar

+521 B (113 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

res/values/colors.xml

+5 −3
Original line number Diff line number Diff line
@@ -33,8 +33,10 @@ 
    <color name="color_default_blue_lite">@lineageos.platform:color/color_default_selector</color>

    <color name="color_gray2">@lineageos.platform:color/color_default_gray2</color>



    <color name="date_strip_bg">@lineageos.platform:color/color_default_foreground2</color>



    <color name="color_non_focus_item_bg">#fafafa</color>

    <color name="color_label_bg">#eeeeee</color>

    <color name="color_label_bg">@color/date_strip_bg</color>



    <color name="colorOrangePrimary">#f1922d</color>

    <color name="colorOrangePrimaryDark">#b36f28</color>
@@ -75,7 +77,7 @@ 
    <color name="week_sunday">@color/color_gray2</color>

    <color name="calendar_future_bg_color">@color/colorPrimary</color>

    <color name="calendar_hour_label">@color/color_gray2</color>

    <color name="calendar_hour_background">@color/color_label_bg</color>

    <color name="calendar_hour_background">@color/date_strip_bg</color>



    <color name="calendar_date_banner_background">@color/foreground_color</color>
@@ -339,7 +341,7 @@ 
    <color name="week_today_dark">@color/colorAccent</color>

    <color name="week_saturday_dark">@color/color_default_secondary_text</color>

    <color name="week_sunday_dark">@color/color_default_secondary_text</color>

    <color name="calendar_date_banner_text_color_dark">#b2ffffff</color>

    <color name="calendar_date_banner_text_color_dark">#b2ff00</color>

    <color name="calendar_future_bg_color_dark">@color/bg_dark</color>

    <color name="calendar_hour_background_dark">@color/bg_dark</color>

    <color name="calendar_hour_label_dark">#b2ffffff</color>