Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-02 03:40:16 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/23121 - Replace @drawble/ic_desktop with @drawable/mozac_ic_device_desktop

Browse Source
This commit is contained in:
Gabriel Luong 2022-01-08 19:00:26 -05:00 committed by mergify[bot]
parent d9bec9ba36
commit 5a66fd7824
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
View File

@ -232,7 +232,7 @@ open class DefaultToolbarMenu(
}
val desktopSiteItem = BrowserMenuImageSwitch(
imageResource = R.drawable.ic_desktop,
imageResource = R.drawable.mozac_ic_device_desktop,
label = context.getString(R.string.browser_menu_desktop_site),
initialState = {
selectedSession?.content?.desktopMode ?: false

2
app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
View File

@ -133,7 +133,7 @@ class CustomTabToolbarMenu(
}
private val desktopMode = BrowserMenuImageSwitch(
imageResource = R.drawable.ic_desktop,
imageResource = R.drawable.mozac_ic_device_desktop,
label = context.getString(R.string.browser_menu_desktop_site),
initialState = { session?.content?.desktopMode ?: false }
) { checked ->

2
app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
View File

@ -103,7 +103,7 @@ class HomeMenu(
}
val desktopItem = BrowserMenuImageSwitch(
imageResource = R.drawable.ic_desktop,
imageResource = R.drawable.mozac_ic_device_desktop,
label = context.getString(R.string.browser_menu_desktop_site),
initialState = { context.settings().openNextTabInDesktopMode }
) { checked ->

12
app/src/main/res/drawable/ic_desktop.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<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="?primaryText"
android:pathData="M20.5,17h-2a2.5,2.5 0,0 0,2.5 -2.5v-9A2.5,2.5 0,0 0,18.5 3h-13A2.5,2.5 0,0 0,3 5.5v9A2.5,2.5 0,0 0,5.5 17h-2a1.5,1.5 0,0 0,0 3h17a1.5,1.5 0,0 0,0 -3zM5.3,15.5l-0.8,-0.8L4.5,5.3l0.8,-0.8h13.4l0.8,0.8v9.4l-0.8,0.8L5.3,15.5zM13.25,18.5h-2.5a0.75,0.75 0,0 1,0 -1.5h2.5a0.75,0.75 0,0 1,0 1.5z" />
</vector>