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

Commit e2e9d46f authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'icon_fixes_pie' into 'v1-pie' 

Icon fixes pie

See merge request !15
parents b3fc34a9 2f4ba938

res/color/bottom_nav_color.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:state_checked="true" android:color="@color/navigation_accent_enabled" />

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

</selector>
 
 No newline at end of file

res/layout/gallery_main.xml

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ 
            android:layout_alignParentBottom="true"

            app:menu="@menu/navigation_items"

            app:itemBackground="@color/primary"

            app:itemIconTint="@drawable/item_bg"

            app:itemTextColor="@drawable/item_bg" />

            app:itemIconTint="@color/bottom_nav_color"

            app:itemTextColor="@color/bottom_nav_color" />



    </RelativeLayout>

res/menu/album.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,15 +15,15 @@ 
-->

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

    <item android:id="@+id/action_camera"

        android:icon="@drawable/camera"

        android:icon="@lineageos.platform:drawable/ic_camera_photo"

        android:title="@string/switch_to_camera"

        android:showAsAction="ifRoom" />

    <item android:id="@+id/action_slideshow"

        android:icon="@drawable/slideshow"

        android:icon="@lineageos.platform:drawable/ic_video_play"

        android:title="@string/slideshow"

        android:showAsAction="ifRoom" />

    <item android:id="@+id/action_select"

        android:icon="@drawable/ic_selection"

        android:icon="@lineageos.platform:drawable/ic_squared_tick"

        android:title="@string/select_item"

        android:showAsAction="ifRoom" />

<!--     <item android:id="@+id/action_group_by" -->

res/menu/albumset.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
-->

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

    <item android:id="@+id/action_camera"

        android:icon="@drawable/camera"

        android:icon="@lineageos.platform:drawable/ic_camera_photo"

        android:title="@string/switch_to_camera"

        android:showAsAction="ifRoom" />

    <item android:id="@+id/action_select"

        android:icon="@drawable/ic_selection"

        android:icon="@lineageos.platform:drawable/ic_squared_tick"

        android:title="@string/select_album"

        android:showAsAction="ifRoom" />

    <item android:id="@+id/action_manage_offline"

res/menu/navigation_items.xml

+3 −3
Original line number Diff line number Diff line 
<menu xmlns:android="http://schemas.android.com/apk/res/android">

     <item android:id="@+id/action_timeline"

          android:title="@string/timeline_title"

          android:icon="@drawable/ic_timeline" />

          android:icon="@lineageos.platform:drawable/ic_timeline" />

     <item android:id="@+id/action_album"

          android:title="@string/albums_title"

          android:icon="@drawable/ic_album" />

          android:icon="@lineageos.platform:drawable/ic_album" />

     <item android:id="@+id/action_videos"

          android:title="@string/videos_title"

          android:icon="@drawable/ic_video" />

          android:icon="@lineageos.platform:drawable/ic_videos" />

</menu>