From 9a40f7c08d8d6a9964c083770a4e7aa4e24d63b3 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Tue, 14 Mar 2023 10:57:15 -0700
Subject: [PATCH] update icons

---
 .../java/app/omnivore/omnivore/ui/library/SearchBar.kt |  4 +++-
 .../omnivore/ui/reader/WebReaderLoadingContainer.kt    | 10 ++++++----
 .../app/src/main/res/drawable-v24/account_outline.xml  |  1 +
 .../app/src/main/res/drawable-v24/dots_horizontal.xml  |  1 +
 .../src/main/res/drawable-v24/format_letter_case.xml   |  1 +
 5 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 android/Omnivore/app/src/main/res/drawable-v24/account_outline.xml
 create mode 100644 android/Omnivore/app/src/main/res/drawable-v24/dots_horizontal.xml
 create mode 100644 android/Omnivore/app/src/main/res/drawable-v24/format_letter_case.xml

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchBar.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchBar.kt
index 40bf1a5f6..f23d1b6c3 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchBar.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/SearchBar.kt
@@ -22,8 +22,10 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
+import app.omnivore.omnivore.R
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -65,7 +67,7 @@ fun SearchBar(
 
         IconButton(onClick = onSettingsIconClick) {
           Icon(
-            imageVector = Icons.Filled.Settings,
+            painter = painterResource(id = R.drawable.account_outline),
             contentDescription = null
           )
         }
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
index 6d6d85228..2fd99ba6e 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
@@ -26,12 +26,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.viewmodel.compose.viewModel
 import app.omnivore.omnivore.MainActivity
+import app.omnivore.omnivore.R
 import app.omnivore.omnivore.ui.components.WebReaderLabelsSelectionSheet
 import app.omnivore.omnivore.ui.savedItemViews.SavedItemContextMenu
 import app.omnivore.omnivore.ui.theme.OmnivoreTheme
@@ -144,15 +146,15 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null, o
               )
             }
           }
-          IconButton(onClick = { isMenuExpanded = true }) {
+          IconButton(onClick = { showWebPreferencesDialog = true }) {
             Icon(
-              imageVector = Icons.Filled.Menu,
+              painter = painterResource(id = R.drawable.format_letter_case),
               contentDescription = null
             )
           }
-          IconButton(onClick = { showWebPreferencesDialog = true }) {
+          IconButton(onClick = { isMenuExpanded = true }) {
             Icon(
-              imageVector = Icons.Filled.Settings, // TODO: set a better icon
+              painter = painterResource(id = R.drawable.dots_horizontal),
               contentDescription = null
             )
           }
diff --git a/android/Omnivore/app/src/main/res/drawable-v24/account_outline.xml b/android/Omnivore/app/src/main/res/drawable-v24/account_outline.xml
new file mode 100644
index 000000000..b510dc29c
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable-v24/account_outline.xml
@@ -0,0 +1 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000" android:pathData="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,6A2,2 0 0,0 10,8A2,2 0 0,0 12,10A2,2 0 0,0 14,8A2,2 0 0,0 12,6M12,13C14.67,13 20,14.33 20,17V20H4V17C4,14.33 9.33,13 12,13M12,14.9C9.03,14.9 5.9,16.36 5.9,17V18.1H18.1V17C18.1,16.36 14.97,14.9 12,14.9Z"/></vector>
\ No newline at end of file
diff --git a/android/Omnivore/app/src/main/res/drawable-v24/dots_horizontal.xml b/android/Omnivore/app/src/main/res/drawable-v24/dots_horizontal.xml
new file mode 100644
index 000000000..1c04b685b
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable-v24/dots_horizontal.xml
@@ -0,0 +1 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000" android:pathData="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"/></vector>
\ No newline at end of file
diff --git a/android/Omnivore/app/src/main/res/drawable-v24/format_letter_case.xml b/android/Omnivore/app/src/main/res/drawable-v24/format_letter_case.xml
new file mode 100644
index 000000000..dc963d128
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable-v24/format_letter_case.xml
@@ -0,0 +1 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000" android:pathData="M20.06,18C20,17.83 19.91,17.54 19.86,17.11C19.19,17.81 18.38,18.16 17.45,18.16C16.62,18.16 15.93,17.92 15.4,17.45C14.87,17 14.6,16.39 14.6,15.66C14.6,14.78 14.93,14.1 15.6,13.61C16.27,13.12 17.21,12.88 18.43,12.88H19.83V12.24C19.83,11.75 19.68,11.36 19.38,11.07C19.08,10.78 18.63,10.64 18.05,10.64C17.53,10.64 17.1,10.76 16.75,11C16.4,11.25 16.23,11.54 16.23,11.89H14.77C14.77,11.46 14.92,11.05 15.22,10.65C15.5,10.25 15.93,9.94 16.44,9.71C16.95,9.5 17.5,9.36 18.13,9.36C19.11,9.36 19.87,9.6 20.42,10.09C20.97,10.58 21.26,11.25 21.28,12.11V16C21.28,16.8 21.38,17.42 21.58,17.88V18H20.06M17.66,16.88C18.11,16.88 18.54,16.77 18.95,16.56C19.35,16.35 19.65,16.07 19.83,15.73V14.16H18.7C16.93,14.16 16.04,14.63 16.04,15.57C16.04,16 16.19,16.3 16.5,16.53C16.8,16.76 17.18,16.88 17.66,16.88M5.46,13.71H9.53L7.5,8.29L5.46,13.71M6.64,6H8.36L13.07,18H11.14L10.17,15.43H4.82L3.86,18H1.93L6.64,6Z"/></vector>
\ No newline at end of file