From cd1dc678610af4c5dafba9c124d5061baa4eb0c5 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 24 Jan 2023 17:52:04 +0530
Subject: [PATCH 1/2] Fix icons in top bar to match Android S

---
 res/menu/album.xml    | 6 +++---
 res/menu/albumset.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/menu/album.xml b/res/menu/album.xml
index 10ae9085e..3fa1ee0e9 100644
--- a/res/menu/album.xml
+++ b/res/menu/album.xml
@@ -16,17 +16,17 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/action_camera"
-        android:icon="@lineageos.platform:drawable/ic_camera_photo"
+        android:icon="@drawable/camera"
         android:title="@string/switch_to_camera"
         android:showAsAction="ifRoom"
         app:iconTint="@color/color_default_primary"/>
     <item android:id="@+id/action_slideshow"
-        android:icon="@lineageos.platform:drawable/ic_video_play"
+        android:icon="@drawable/slideshow"
         android:title="@string/slideshow"
         android:showAsAction="ifRoom"
         app:iconTint="@color/color_default_primary"/>
     <item android:id="@+id/action_select"
-        android:icon="@lineageos.platform:drawable/ic_squared_tick"
+        android:icon="@drawable/ic_selection"
         android:title="@string/select_item"
         android:showAsAction="ifRoom"
         app:iconTint="@color/color_default_primary"/>
diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml
index 2db11eab5..a6cda04a3 100644
--- a/res/menu/albumset.xml
+++ b/res/menu/albumset.xml
@@ -19,12 +19,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/action_camera"
-        android:icon="@lineageos.platform:drawable/ic_camera_photo"
+        android:icon="@drawable/camera"
         android:title="@string/switch_to_camera"
         android:showAsAction="ifRoom"
         app:iconTint="@color/color_default_primary"/>
     <item android:id="@+id/action_select"
-        android:icon="@lineageos.platform:drawable/ic_squared_tick"
+        android:icon="@drawable/ic_selection"
         android:title="@string/select_album"
         android:showAsAction="ifRoom"
         app:iconTint="@color/color_default_primary"/>
-- 
GitLab


From 4abae56ec412a0f553ea8043e1087b2406a3ad7d Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 24 Jan 2023 17:52:19 +0530
Subject: [PATCH 2/2] Change selection icon

---
 res/drawable/ic_selection.xml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/res/drawable/ic_selection.xml b/res/drawable/ic_selection.xml
index 1f8c99e3f..aa8cfb0a9 100644
--- a/res/drawable/ic_selection.xml
+++ b/res/drawable/ic_selection.xml
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/color_default_secondary_text"
-        android:pathData="M3,5 L5,5 L5,3 C3.9,3,3,3.9,3,5 Z M3,13 L5,13 L5,11 L3,11 L3,13 Z M7,21 L9,21
-L9,19 L7,19 L7,21 Z M3,9 L5,9 L5,7 L3,7 L3,9 Z M13,3 L11,3 L11,5 L13,5 L13,3 Z
-M19,3 L19,5 L21,5 C21,3.9,20.1,3,19,3 Z M5,21 L5,19 L3,19 C3,20.1,3.9,21,5,21 Z
-M3,17 L5,17 L5,15 L3,15 L3,17 Z M9,3 L7,3 L7,5 L9,5 L9,3 Z M11,21 L13,21 L13,19
-L11,19 L11,21 Z M19,13 L21,13 L21,11 L19,11 L19,13 Z M19,21
-C20.1,21,21,20.1,21,19 L19,19 L19,21 Z M19,9 L21,9 L21,7 L19,7 L19,9 Z M19,17
-L21,17 L21,15 L19,15 L19,17 Z M15,21 L17,21 L17,19 L15,19 L15,21 Z M15,5 L17,5
-L17,3 L15,3 L15,5 Z M7,17 L17,17 L17,7 L7,7 L7,17 Z M9,9 L15,9 L15,15 L9,15 L9,9
-Z" />
+  <path
+      android:fillColor="@color/color_default_secondary_text"
+      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM17.99,9l-1.41,-1.42 -6.59,6.59 -2.58,-2.57 -1.42,1.41 4,3.99z"/>
 </vector>
-- 
GitLab