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

Commit fea4e0a8 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic6-s-icon-redesign' into 'v1-s' 

Update app icon according to new design and add support for dynamic months in icon

See merge request !53
parents 7bbe27b7 a0188945

app/src/main/AndroidManifest.xml

+7 −1
Original line number Diff line number Diff line
@@ -86,9 +86,15 @@ 
            <meta-data android:name="android.app.shortcuts"

                android:resource="@xml/shortcuts" />



            <meta-data android:name="org.lineageos.etar.dynamic_icons"

            <meta-data android:name="foundation.e.calendar.dynamic_icons"

                android:resource="@array/calendar_icons_dynamic" />



            <meta-data android:name="foundation.e.calendar.month_dynamic_icons"

                android:resource="@array/e_icons_month_dynamic" />



            <meta-data android:name="foundation.e.calendar.day_dynamic_icons"

                android:resource="@array/e_icons_day_dynamic" />



        </activity>



        <activity-alias android:name="com.android.calendar.LaunchActivity"

app/src/main/res/drawable/e_day_1.xml

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

<!--

  ~ Copyright Murena SAS 2024

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:pathData="M56.82,51.38V73.52H53.17V55.71L47.76,57.55V54.53L56.38,51.38H56.82Z"

      android:fillColor="#2D313E"/>

</vector>

app/src/main/res/drawable/e_day_10.xml

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

<!--

  ~ Copyright Murena SAS 2024

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:pathData="M48,51.38V73.52H44.35V55.71L38.94,57.55V54.53L47.56,51.38H48ZM70.05,60.64V64.24C70.05,65.97 69.88,67.45 69.53,68.67C69.2,69.88 68.71,70.87 68.08,71.62C67.44,72.38 66.68,72.94 65.79,73.29C64.91,73.64 63.93,73.82 62.83,73.82C61.97,73.82 61.16,73.71 60.41,73.49C59.67,73.26 59.01,72.92 58.41,72.44C57.81,71.97 57.3,71.36 56.88,70.61C56.47,69.85 56.14,68.95 55.91,67.9C55.69,66.84 55.58,65.63 55.58,64.24V60.64C55.58,58.9 55.75,57.43 56.09,56.24C56.43,55.04 56.92,54.06 57.56,53.32C58.2,52.56 58.96,52.01 59.83,51.67C60.72,51.32 61.71,51.15 62.8,51.15C63.68,51.15 64.49,51.26 65.23,51.48C65.98,51.7 66.64,52.03 67.23,52.5C67.83,52.96 68.33,53.57 68.74,54.32C69.17,55.06 69.49,55.95 69.71,57C69.94,58.04 70.05,59.25 70.05,60.64ZM66.4,64.76V60.09C66.4,59.21 66.35,58.44 66.24,57.77C66.14,57.1 65.99,56.52 65.79,56.06C65.6,55.59 65.36,55.2 65.06,54.91C64.77,54.61 64.44,54.39 64.06,54.26C63.69,54.12 63.27,54.04 62.8,54.04C62.24,54.04 61.73,54.16 61.29,54.38C60.84,54.59 60.47,54.93 60.17,55.41C59.86,55.88 59.63,56.51 59.47,57.29C59.32,58.06 59.24,58.99 59.24,60.09V64.76C59.24,65.65 59.29,66.43 59.39,67.11C59.5,67.78 59.65,68.36 59.85,68.85C60.05,69.32 60.29,69.72 60.58,70.03C60.87,70.33 61.2,70.56 61.58,70.7C61.96,70.84 62.38,70.91 62.83,70.91C63.41,70.91 63.92,70.8 64.36,70.58C64.81,70.36 65.18,70 65.49,69.52C65.79,69.02 66.02,68.38 66.17,67.59C66.32,66.8 66.4,65.86 66.4,64.76Z"

      android:fillColor="#2D313E"/>

</vector>

app/src/main/res/drawable/e_day_11.xml

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

<!--

  ~ Copyright Murena SAS 2024

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:pathData="M48,51.38V73.52H44.35V55.71L38.94,57.55V54.53L47.56,51.38H48ZM65.64,51.38V73.52H61.99V55.71L56.58,57.55V54.53L65.2,51.38H65.64Z"

      android:fillColor="#2D313E"/>

</vector>

app/src/main/res/drawable/e_day_12.xml

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

<!--

  ~ Copyright Murena SAS 2024

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:pathData="M48,51.38V73.52H44.35V55.71L38.94,57.55V54.53L47.56,51.38H48ZM70.46,70.61V73.52H55.67V71.02L62.85,63.18C63.64,62.29 64.26,61.53 64.71,60.88C65.17,60.23 65.49,59.65 65.67,59.14C65.86,58.61 65.96,58.1 65.96,57.61C65.96,56.91 65.82,56.3 65.56,55.77C65.31,55.24 64.94,54.82 64.44,54.51C63.95,54.2 63.34,54.04 62.64,54.04C61.82,54.04 61.13,54.22 60.58,54.58C60.02,54.93 59.6,55.42 59.32,56.04C59.04,56.66 58.89,57.37 58.89,58.17H55.24C55.24,56.88 55.54,55.71 56.12,54.65C56.71,53.58 57.56,52.73 58.67,52.11C59.78,51.47 61.12,51.15 62.68,51.15C64.16,51.15 65.41,51.4 66.44,51.89C67.47,52.39 68.25,53.09 68.79,54C69.34,54.91 69.61,55.98 69.61,57.23C69.61,57.91 69.5,58.6 69.27,59.27C69.05,59.95 68.73,60.63 68.32,61.3C67.92,61.97 67.44,62.64 66.88,63.32C66.32,63.99 65.71,64.66 65.05,65.35L60.27,70.61H70.46Z"

      android:fillColor="#2D313E"/>

</vector>