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

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

Some theme related fixes

parent 70b0a6d9

res/drawable/ic_account_circle.xml

+1 −1
Original line number Diff line number Diff line 
<vector android:height="35dp" android:tint="?attr/iconCalendarAccount"

<vector android:height="35dp" android:tint="@color/color_default_secondary_text"

    android:viewportHeight="24.0" android:viewportWidth="24.0"

    android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>

res/drawable/ic_add.xml

+1 −1
Original line number Diff line number Diff line 
<vector android:height="24dp" android:tint="?attr/iconAddCalendar"

<vector android:height="24dp" android:tint="@color/color_default_secondary_text"

    android:viewportHeight="24.0" android:viewportWidth="24.0"

    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

res/drawable/ic_settings.xml

+1 −1
Original line number Diff line number Diff line 
<vector android:height="24dp" android:tint="?attr/iconSettingsGeneral"

<vector android:height="24dp" android:tint="@color/color_default_secondary_text"

    android:viewportHeight="24" android:viewportWidth="24"

    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>

res/drawable/menu_selector.xml

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

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

    <item android:color="@color/colorAccent" android:state_checked="true" />

    <item android:color="@color/color_default_secondary_text" android:state_checked="false" />

</selector>
 
 No newline at end of file

res/layout/all_in_one_material.xml

+6 −2
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
                android:layout_width="match_parent"

                android:layout_height="?attr/actionBarSize"

                app:popupTheme="@style/Widget.CalendarAppTheme.ActionBar.PopupTheme"

                android:minHeight="?attr/actionBarSize" />

                android:minHeight="?attr/actionBarSize"

                app:titleTextColor="@color/color_default_primary_text"/>

        </com.google.android.material.appbar.AppBarLayout>



        <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -51,5 +52,8 @@ 
        android:layout_height="match_parent"

        android:layout_gravity="start"

        android:fitsSystemWindows="true"

        app:menu="@menu/calendar_view" />

        app:menu="@menu/calendar_view"

        app:itemTextColor="@drawable/menu_selector"

        app:itemIconTint="@drawable/menu_selector"

        app:theme="@style/NavigationDrawer"/>

</androidx.drawerlayout.widget.DrawerLayout>