Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

For #724: Consolidates colors

Browse Source
nightly-build-test
Sawyer Blatz 5 years ago committed by Colin Lee
parent a2666c4f74
commit 29832c5e84
114 changed files with 361 additions and 723 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/java/org/mozilla/fenix/ThemeManager.kt
Unescape Escape View File

@ -120,13 +120,13 @@ class DefaultThemeManager : ThemeManager {
window.navigationBarColor = ContextCompat
.getColor(
context, DefaultThemeManager
.resolveAttribute(R.attr.navigationBarColorHome, context)
.resolveAttribute(R.attr.above, context)
)
} else {
window.navigationBarColor = ContextCompat
.getColor(
context, DefaultThemeManager
.resolveAttribute(R.attr.navigationBarColorBrowser, context)
.resolveAttribute(R.attr.foundation, context)
)
}
}

2
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
Unescape Escape View File

@ -126,7 +126,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
setBackgroundColor(
ContextCompat.getColor(
view.context,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarBackground, context)
DefaultThemeManager.resolveAttribute(R.attr.foundation, context)
)
)

6
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarComponent.kt
Unescape Escape View File

@ -59,15 +59,15 @@ class ToolbarComponent(
private fun applyTheme() {
getView().suggestionBackgroundColor = ContextCompat.getColor(
container.context,
DefaultThemeManager.resolveAttribute(R.attr.suggestionBackground, container.context)
R.color.suggestion_highlight_color
)
getView().textColor = ContextCompat.getColor(
container.context,
DefaultThemeManager.resolveAttribute(R.attr.awesomeBarTitleTextColor, container.context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, container.context)
)
getView().hintColor = ContextCompat.getColor(
container.context,
DefaultThemeManager.resolveAttribute(R.attr.awesomeBarDescriptionTextColor, container.context)
DefaultThemeManager.resolveAttribute(R.attr.secondaryText, container.context)
)
}
}

28
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt
Unescape Escape View File

@ -44,14 +44,14 @@ class ToolbarMenu(
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_back,
primaryContentDescription = context.getString(R.string.browser_menu_back),
primaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
),
isInPrimaryState = {
context.components.core.sessionManager.selectedSession?.canGoBack ?: true
},
secondaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.disabledIconColor,
R.attr.secondaryText,
context
),
disableInSecondaryState = true
@ -63,14 +63,14 @@ class ToolbarMenu(
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_forward,
primaryContentDescription = context.getString(R.string.browser_menu_forward),
primaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
),
isInPrimaryState = {
context.components.core.sessionManager.selectedSession?.canGoForward ?: true
},
secondaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.disabledIconColor,
R.attr.secondaryText,
context
),
disableInSecondaryState = true
@ -82,7 +82,7 @@ class ToolbarMenu(
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_refresh,
primaryContentDescription = context.getString(R.string.browser_menu_refresh),
primaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
),
isInPrimaryState = {
@ -92,7 +92,7 @@ class ToolbarMenu(
secondaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_stop,
secondaryContentDescription = context.getString(R.string.browser_menu_stop),
secondaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
),
disableInSecondaryState = false
@ -112,7 +112,7 @@ class ToolbarMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_help),
R.drawable.ic_help,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(Item.Help)
},
@ -120,7 +120,7 @@ class ToolbarMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_settings),
R.drawable.ic_settings,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(Item.Settings)
},
@ -128,7 +128,7 @@ class ToolbarMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_library),
R.drawable.ic_library,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(Item.Library)
},
@ -143,7 +143,7 @@ class ToolbarMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_find_in_page),
R.drawable.mozac_ic_search,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(Item.FindInPage)
},
@ -151,7 +151,7 @@ class ToolbarMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_private_tab),
R.drawable.ic_private_browsing,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(Item.NewPrivateTab)
},
@ -159,7 +159,7 @@ class ToolbarMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_new_tab),
R.drawable.ic_new,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(Item.NewTab)
},
@ -167,7 +167,7 @@ class ToolbarMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_share),
R.drawable.mozac_ic_share,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(Item.Share)
},
@ -175,7 +175,7 @@ class ToolbarMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_report_issue),
R.drawable.ic_report_issues,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(Item.ReportIssue)
},

20
app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
Unescape Escape View File

@ -40,14 +40,14 @@ class CustomTabsIntegration(
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_back,
primaryContentDescription = context.getString(R.string.browser_menu_back),
primaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
),
isInPrimaryState = {
context.components.core.sessionManager.selectedSession?.canGoBack ?: true
},
secondaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.disabledIconColor,
R.attr.secondaryText,
context
),
disableInSecondaryState = true
@ -59,14 +59,14 @@ class CustomTabsIntegration(
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_forward,
primaryContentDescription = context.getString(R.string.browser_menu_forward),
primaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
),
isInPrimaryState = {
context.components.core.sessionManager.selectedSession?.canGoForward ?: true
},
secondaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.disabledIconColor,
R.attr.secondaryText,
context
),
disableInSecondaryState = true
@ -78,7 +78,7 @@ class CustomTabsIntegration(
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_refresh,
primaryContentDescription = context.getString(R.string.browser_menu_refresh),
primaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
),
isInPrimaryState = {
@ -88,7 +88,7 @@ class CustomTabsIntegration(
secondaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_stop,
secondaryContentDescription = context.getString(R.string.browser_menu_stop),
secondaryImageTintResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
),
disableInSecondaryState = false
@ -111,7 +111,7 @@ class CustomTabsIntegration(
context.getString(R.string.browser_menu_powered_by, appName).toUpperCase()
}(),
ToolbarMenu.CAPTION_TEXT_SIZE,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
),
BrowserMenuDivider(),
SimpleBrowserMenuItem(
@ -120,7 +120,7 @@ class CustomTabsIntegration(
context.getString(R.string.browser_menu_open_in_fenix, appName)
}(),
textColorResource = DefaultThemeManager.resolveAttribute(
R.attr.browserToolbarMenuIcons,
R.attr.primaryText,
context
)
) {
@ -129,7 +129,7 @@ class CustomTabsIntegration(
BrowserMenuImageText(
context.getString(R.string.browser_menu_find_in_page),
R.drawable.mozac_ic_search,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(ToolbarMenu.Item.FindInPage)
},
@ -140,7 +140,7 @@ class CustomTabsIntegration(
BrowserMenuImageText(
context.getString(R.string.browser_menu_share),
R.drawable.mozac_ic_share,
DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(ToolbarMenu.Item.Share)
},

1
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
Unescape Escape View File

@ -144,7 +144,6 @@ class HomeFragment : Fragment(), CoroutineScope {
val isPrivate = (activity as HomeActivity).browsingModeManager.isPrivate
view.toolbar_wrapper.isPrivateModeEnabled = isPrivate
privateBrowsingButton.contentDescription = contentDescriptionForPrivateBrowsingButton(isPrivate)
privateBrowsingButton.setOnClickListener {

6
app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
Unescape Escape View File

@ -28,7 +28,7 @@ class HomeMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_settings),
R.drawable.ic_settings,
DefaultThemeManager.resolveAttribute(R.attr.iconColor, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(HomeMenu.Item.Settings)
},
@ -36,7 +36,7 @@ class HomeMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_library),
R.drawable.ic_library,
DefaultThemeManager.resolveAttribute(R.attr.iconColor, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(HomeMenu.Item.Library)
},
@ -45,7 +45,7 @@ class HomeMenu(
BrowserMenuImageText(
context.getString(R.string.browser_menu_help),
R.drawable.ic_help,
DefaultThemeManager.resolveAttribute(R.attr.iconColor, context)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context)
) {
onItemTapped.invoke(HomeMenu.Item.Help)
})

47
app/src/main/java/org/mozilla/fenix/home/SearchView.kt
Unescape Escape View File

@ -11,65 +11,34 @@ import android.widget.FrameLayout
import org.mozilla.fenix.R
class SearchView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
var isPrivateModeEnabled = false
private val lightDrawable =
resources.getDrawable(R.drawable.home_search_background_normal, context.theme)
private val privateLightDrawable =
resources.getDrawable(R.drawable.home_search_background_private, context.theme)
private val darkDrawable =
resources.getDrawable(R.drawable.home_search_background_dark, context.theme)
private val privateDarkDrawable =
resources.getDrawable(R.drawable.home_search_background_private_dark, context.theme)
private val darkNoBorderDrawable =
resources.getDrawable(R.drawable.home_search_background_dark_no_border, context.theme)
private val privateDarkNoBorderDrawable =
resources.getDrawable(R.drawable.home_search_background_private_dark_no_border, context.theme)
private val lightToDark = TransitionDrawable(arrayOf(lightDrawable, darkDrawable))
private val darkToNoBorder = TransitionDrawable(arrayOf(darkDrawable, darkNoBorderDrawable))
private val privateLightToDark = TransitionDrawable(arrayOf(privateLightDrawable, privateDarkDrawable))
private val privateDarkToNoBorder = TransitionDrawable(arrayOf(privateDarkDrawable, privateDarkNoBorderDrawable))
fun transitionToLight() {
if (isPrivateModeEnabled) {
background = privateLightToDark
privateLightToDark.reverseTransition(transitionDurationMs)
} else {
background = lightToDark
lightToDark.reverseTransition(transitionDurationMs)
}
background = lightToDark
lightToDark.reverseTransition(transitionDurationMs)
}
fun transitionToDark() {
if (isPrivateModeEnabled) {
background = privateLightToDark
privateLightToDark.startTransition(transitionDurationMs)
} else {
background = lightToDark
lightToDark.startTransition(transitionDurationMs)
}
background = lightToDark
lightToDark.startTransition(transitionDurationMs)
}
fun transitionToDarkFromNoBorder() {
if (isPrivateModeEnabled) {
background = privateDarkToNoBorder
privateDarkToNoBorder.reverseTransition(transitionDurationMs)
} else {
background = darkToNoBorder
darkToNoBorder.reverseTransition(transitionDurationMs)
}
background = darkToNoBorder
darkToNoBorder.reverseTransition(transitionDurationMs)
}
fun transitionToDarkNoBorder() {
if (isPrivateModeEnabled) {
background = privateDarkToNoBorder
privateDarkToNoBorder.startTransition(transitionDurationMs)
} else {
background = darkToNoBorder
darkToNoBorder.startTransition(transitionDurationMs)
}
background = darkToNoBorder
darkToNoBorder.startTransition(transitionDurationMs)
}
companion object {

6
app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt
Unescape Escape View File

@ -49,7 +49,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer
drawable?.setColorFilter(
ContextCompat.getColor(
context!!,
DefaultThemeManager.resolveAttribute(R.attr.iconColor, context!!)
DefaultThemeManager.resolveAttribute(R.attr.accent, context!!)
), PorterDuff.Mode.SRC_IN
)
setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
@ -69,7 +69,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer
drawable?.setColorFilter(
ContextCompat.getColor(
context!!,
DefaultThemeManager.resolveAttribute(R.attr.deleteColor, context!!)
R.color.delete_color
), PorterDuff.Mode.SRC_IN
)
setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
@ -80,7 +80,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer
drawable?.setColorFilter(
ContextCompat.getColor(
context!!,
DefaultThemeManager.resolveAttribute(R.attr.iconColor, context!!)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, context!!)
), PorterDuff.Mode.SRC_IN
)
setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)

3
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
Unescape Escape View File

@ -12,7 +12,6 @@ import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.RecyclerView
import io.reactivex.Observer
import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.R
import org.mozilla.fenix.home.sessioncontrol.viewholders.SessionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.TabViewHolder
@ -130,7 +129,7 @@ class SwipeToDeleteCallback(
val textPaint = Paint()
textPaint.color = ContextCompat.getColor(
context,
DefaultThemeManager.resolveAttribute(R.attr.deleteColor, context)
R.color.delete_color
)
textPaint.textSize = TEXT_SIZE
val textX = iconLeft - TEXT_MARGIN_X

8
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
Unescape Escape View File

@ -109,14 +109,14 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve
null
)
) getString(R.string.library_bookmarks) else currentRoot!!.title
toolbar.setBackgroundColor(R.attr.toolbarColor.getColorFromAttr(context!!))
toolbar.setTitleTextColor(R.attr.toolbarTextColor.getColorFromAttr(context!!))
toolbar.setBackgroundColor(R.attr.foundation.getColorFromAttr(context!!))
toolbar.setTitleTextColor(R.attr.primaryText.getColorFromAttr(context!!))
}
is BookmarkState.Mode.Selecting -> {
inflater.inflate(R.menu.bookmarks_select_multi, menu)
activity?.title = getString(R.string.bookmarks_multi_select_title, mode.selectedItems.size)
val colorFilter =
PorterDuffColorFilter(ContextCompat.getColor(context!!, R.color.off_white), PorterDuff.Mode.SRC_IN)
PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
themeToolbar(toolbar, colorFilter)
}
}
@ -127,7 +127,7 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve
colorFilter: PorterDuffColorFilter
) {
toolbar.setBackgroundColor(ContextCompat.getColor(context!!, R.color.bookmark_multi_select_actionbar))
toolbar.setTitleTextColor(ContextCompat.getColor(context!!, R.color.off_white))
toolbar.setTitleTextColor(R.attr.primaryText.getColorFromAttr(context!!))
toolbar.overflowIcon?.colorFilter = colorFilter
(0 until toolbar.childCount).forEach {
when (val item = toolbar.getChildAt(it)) {

6
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt
Unescape Escape View File

@ -9,7 +9,6 @@ import mozilla.components.browser.menu.BrowserMenuBuilder
import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
import mozilla.components.concept.storage.BookmarkNode
import mozilla.components.concept.storage.BookmarkNodeType
import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.R
class BookmarkItemMenu(
@ -64,10 +63,7 @@ class BookmarkItemMenu(
} else null,
SimpleBrowserMenuItem(
context.getString(R.string.bookmark_menu_delete_button),
textColorResource = DefaultThemeManager.resolveAttribute(
R.attr.deleteColor,
context
)
textColorResource = R.color.delete_color
) {
onItemTapped.invoke(BookmarkItemMenu.Item.Delete)
}

2
app/src/main/java/org/mozilla/fenix/library/bookmarks/addfolder/AddBookmarkFolderFragment.kt
Unescape Escape View File

@ -85,7 +85,7 @@ class AddBookmarkFolderFragment : Fragment(), CoroutineScope {
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.bookmarks_add_folder, menu)
menu.findItem(R.id.confirm_add_folder_button).icon.colorFilter =
PorterDuffColorFilter(R.attr.iconColor.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {

2
app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
Unescape Escape View File

@ -144,7 +144,7 @@ class EditBookmarkFragment : Fragment(), CoroutineScope {
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.bookmarks_edit, menu)
menu.findItem(R.id.delete_bookmark_button).icon.colorFilter =
PorterDuffColorFilter(R.attr.iconColor.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {

2
app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderFragment.kt
Unescape Escape View File

@ -124,7 +124,7 @@ class SelectBookmarkFolderFragment : Fragment(), CoroutineScope, AccountObserver
if (!visitedAddBookmark) {
inflater.inflate(R.menu.bookmarks_select_folder, menu)
menu.findItem(R.id.add_folder_button).icon.colorFilter =
PorterDuffColorFilter(R.attr.iconColor.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
}
}

3
app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt
Unescape Escape View File

@ -7,7 +7,6 @@ package org.mozilla.fenix.library.history
import android.content.Context
import mozilla.components.browser.menu.BrowserMenuBuilder
import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.R
class HistoryItemMenu(
@ -24,7 +23,7 @@ class HistoryItemMenu(
listOf(
SimpleBrowserMenuItem(
context.getString(R.string.history_delete_item),
textColorResource = DefaultThemeManager.resolveAttribute(R.attr.deleteColor, context)
textColorResource = R.color.delete_color
) {
onItemTapped.invoke(Item.Delete)
}

6
app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
Unescape Escape View File

@ -93,7 +93,7 @@ class AwesomeBarUIView(
draw?.setColorFilter(
ContextCompat.getColor(
this,
DefaultThemeManager.resolveAttribute(R.attr.searchShortcutsTextColor, this)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, this)
), PorterDuff.Mode.SRC_IN
)
clipboardSuggestionProvider = ClipboardSuggestionProvider(
@ -122,7 +122,7 @@ class AwesomeBarUIView(
draw?.setColorFilter(
ContextCompat.getColor(
this,
DefaultThemeManager.resolveAttribute(R.attr.searchShortcutsTextColor, this)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, this)
), PorterDuff.Mode.SRC_IN
)
defaultSearchSuggestionProvider =
@ -175,7 +175,7 @@ class AwesomeBarUIView(
draw?.setColorFilter(
ContextCompat.getColor(
this,
DefaultThemeManager.resolveAttribute(R.attr.searchShortcutsTextColor, this)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, this)
), PorterDuff.Mode.SRC_IN
)

4
app/src/main/java/org/mozilla/fenix/search/awesomebar/ShortcutEngineManager.kt
Unescape Escape View File

@ -70,7 +70,7 @@ class ShortcutEngineManager(
awesomeBarUIView.search_shortcuts_button.compoundDrawables[0]?.setTint(
ContextCompat.getColor(
this,
DefaultThemeManager.resolveAttribute(R.attr.pillWrapperBackground, this)
DefaultThemeManager.resolveAttribute(R.attr.foundation, this)
)
)
@ -85,7 +85,7 @@ class ShortcutEngineManager(
awesomeBarUIView.search_shortcuts_button.compoundDrawables[0]?.setTint(
ContextCompat.getColor(
this,
DefaultThemeManager.resolveAttribute(R.attr.searchShortcutsTextColor, this)
DefaultThemeManager.resolveAttribute(R.attr.primaryText, this)
)
)

4
app/src/main/res/color/toggle_text_color.xml
Unescape Escape View File

@ -3,7 +3,7 @@
- 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/. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/pillWrapperBackground" android:state_checked="true" />
<item android:color="?foundation" android:state_checked="true" />
<!-- Default State -->
<item android:color="?attr/searchShortcutsTextColor" />
<item android:color="?primaryText" />
</selector>

2
app/src/main/res/drawable/button_background.xml
Unescape Escape View File

@ -5,5 +5,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"/>
<solid android:color="@color/history_delete_button_background" />
<solid android:color="@color/foundation_normal_theme" />
</shape>

2
app/src/main/res/drawable/fenix_snackbar_background.xml
Unescape Escape View File

@ -4,6 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?attr/fenixSnackbarBackground" />
<solid android:color="?accent" />
<corners android:radius="8dp" />
</shape>

4
app/src/main/res/drawable/home_background_gradient.xml
Unescape Escape View File

@ -7,8 +7,8 @@
<shape>
<gradient
android:angle="270"
android:startColor="?attr/homeBackgroundTopGradient"
android:endColor="?attr/homeBackgroundBottomGradient"
android:startColor="?foundation"
android:endColor="?above"
android:type="linear" />
</shape>
</item>

2
app/src/main/res/drawable/home_header_shadow.xml
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/home_header_shadow"
android:startColor="?above"
android:endColor="@android:color/transparent"
android:angle="270" />
</shape>

4
app/src/main/res/drawable/home_search_background_dark.xml
Unescape Escape View File

@ -3,10 +3,10 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/search_dark_background"/>
<solid android:color="?aboveDarkened"/>
<stroke android:width="1dp"
android:color="@color/search_stroke_alternative"/>
android:color="?aboveDarkened"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"

2
app/src/main/res/drawable/home_search_background_dark_no_border.xml
Unescape Escape View File

@ -3,7 +3,7 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/search_dark_background_alternative"/>
<solid android:color="?aboveDarkened"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"

4
app/src/main/res/drawable/home_search_background_normal.xml
Unescape Escape View File

@ -3,10 +3,10 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/searchBackground_normal_theme"/>
<solid android:color="?above"/>
<stroke android:width="1dp"
android:color="@color/search_stroke_normal"/>
android:color="?above"/>
<corners android:radius="8dp"/>
</shape>

12
app/src/main/res/drawable/home_search_background_private.xml
Unescape Escape 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/search_private_background"/>
<stroke android:width="1dp"
android:color="@color/search_stroke_private"/>
<corners android:radius="8dp"/>
</shape>

12
app/src/main/res/drawable/home_search_background_private_dark.xml
Unescape Escape 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/search_dark_private_background"/>
<stroke android:width="1dp"
android:color="@color/search_stroke_private"/>
<corners android:radius="8dp"/>
</shape>

12
app/src/main/res/drawable/home_search_background_private_dark_no_border.xml
Unescape Escape 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/search_dark_private_background_alternative"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp"/>
</shape>

2
app/src/main/res/drawable/ic_accessibility.xml
Unescape Escape View File

@ -9,5 +9,5 @@
android:viewportHeight="24">
<path
android:pathData="m12,7c1.3807,0 2.5,-1.1193 2.5,-2.5s-1.1193,-2.5 -2.5,-2.5 -2.5,1.1193 -2.5,2.5 1.1193,2.5 2.5,2.5zM4,9c0,-0.5523 0.4477,-1 1,-1h14c0.5523,0 1,0.4477 1,1s-0.4477,1 -1,1h-4v6,5c0,0.5523 -0.4477,1 -1,1s-1,-0.4477 -1,-1v-5h-2v5c0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1v-5,-6h-4c-0.5523,0 -1,-0.4477 -1,-1z"
android:fillColor="?attr/iconColor" />
android:fillColor="?primaryText" />
</vector>

2
app/src/main/res/drawable/ic_archive.xml
Unescape Escape View File

@ -9,6 +9,6 @@
android:viewportHeight="24">
<path
android:pathData="M13,14.6449L14.2772,13.309C14.6588,12.9098 15.2918,12.8955 15.691,13.2772C16.0902,13.6588 16.1045,14.2918 15.7228,14.691L12.7903,17.7585C12.4026,18.1641 11.7571,18.1713 11.3604,17.7746L8.2929,14.7071C7.9024,14.3166 7.9024,13.6834 8.2929,13.2929C8.6834,12.9024 9.3166,12.9024 9.7071,13.2929L11,14.5858L11,11C11,10.4477 11.4477,10 12,10C12.5523,10 13,10.4477 13,11L13,14.6449ZM20,8L4,8L4,19C4,19.5523 4.4477,20 5,20L19,20C19.5523,20 20,19.5523 20,19L20,8ZM18.7908,6L17.333,4.3401C17.1432,4.1239 16.8694,4 16.5817,4L7.8284,4C7.5632,4 7.3089,4.1054 7.1213,4.2929L5.4142,6L18.7908,6ZM2,19L2,7.8284C2,7.0328 2.3161,6.2697 2.8787,5.7071L5.7071,2.8787C6.2697,2.3161 7.0328,2 7.8284,2L16.5817,2C17.4448,2 18.2662,2.3718 18.8358,3.0203L21.2541,5.7739C21.7349,6.3213 22,7.025 22,7.7536L22,19C22,20.6569 20.6569,22 19,22L5,22C3.3431,22 2,20.6569 2,19Z"
android:fillColor="?attr/iconColor"
android:fillColor="?foundation"
android:fillType="evenOdd" />
</vector>

2
app/src/main/res/drawable/ic_bookmark_filled.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M6.749,21.248C6.4234,21.2471 6.1142,21.1054 5.9008,20.8595C5.6875,20.6136 5.5909,20.2874 5.636,19.965L6.414,14.4L2.674,10.38C2.3928,10.0785 2.2991,9.6474 2.4296,9.2564C2.5601,8.8654 2.8941,8.5771 3.3,8.505L8.529,7.57L10.993,2.624C11.1833,2.242 11.5733,2.0006 12,2.0006C12.4267,2.0006 12.8167,2.242 13.007,2.624L15.471,7.57L20.7,8.5C21.1057,8.5724 21.4394,8.8608 21.5697,9.2518C21.7,9.6427 21.6062,10.0737 21.325,10.375L17.586,14.4L18.364,19.968C18.4229,20.3853 18.2434,20.8005 17.8991,21.0434C17.5547,21.2864 17.1034,21.3164 16.73,21.121L12,18.654L7.269,21.119C7.1087,21.2035 6.9302,21.2478 6.749,21.248Z"
android:strokeWidth="1" />
</vector>

2
app/src/main/res/drawable/ic_bookmark_outline.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M12,2a1,1 0,0 1,0.87 0.507l2.768,4.884 5.536,0.977a1,1 0,0 1,0.624 1.588l-3.744,4.955 0.934,5.934a1,1 0,0 1,-1.456 1.039L12,18.955l-5.532,2.929a1,1 0,0 1,-1.456 -1.04l0.934,-5.933 -3.744,-4.955a1,1 0,0 1,0.624 -1.588l5.536,-0.977 2.768,-4.884A1,1 0,0 1,12 2zM12,5.028l-2.13,3.76a1,1 0,0 1,-0.696 0.49l-4.391,0.776 3.015,3.99a1,1 0,0 1,0.19 0.759l-0.69,4.378 4.234,-2.241a1,1 0,0 1,0.936 0l4.232,2.24 -0.689,-4.378a1,1 0,0 1,0.19 -0.759l3.015,-3.99 -4.39,-0.775a1,1 0,0 1,-0.697 -0.492L12,5.028z" />
</vector>

2
app/src/main/res/drawable/ic_camera.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
</vector>

2
app/src/main/res/drawable/ic_close.xml
Unescape Escape View File

@ -9,6 +9,6 @@
android:viewportHeight="24">
<path
android:pathData="M13.3588,11.981L17.7411,7.5987C18.0934,7.2259 18.0851,6.6403 17.7224,6.2776C17.3597,5.9149 16.7741,5.9066 16.4013,6.2589L12.019,10.6412L7.6367,6.2589C7.2638,5.9066 6.6783,5.9149 6.3156,6.2776C5.9529,6.6403 5.9446,7.2259 6.2969,7.5987L10.6792,11.981L6.2969,16.3633C6.0461,16.6002 5.9439,16.9547 6.03,17.2888C6.1162,17.6229 6.3771,17.8838 6.7112,17.97C7.0453,18.0561 7.3998,17.9539 7.6367,17.7031L12.019,13.3208L16.4013,17.7031C16.7741,18.0554 17.3597,18.0471 17.7224,17.6844C18.0851,17.3217 18.0934,16.7362 17.7411,16.3633L13.3588,11.981Z"
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd" />
</vector>

2
app/src/main/res/drawable/ic_customize.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M21.568,3.557C21.9357,3.9222 21.9558,4.5105 21.614,4.9L12.864,14.935C12.6852,15.1396 12.4296,15.2609 12.158,15.27L12.125,15.27C11.8649,15.2698 11.6156,15.1661 11.432,14.982L10.143,13.693C9.9508,13.5011 9.8468,13.238 9.8559,12.9666C9.865,12.6951 9.9863,12.4396 10.191,12.261L20.23,3.511C20.6191,3.1733 21.203,3.1934 21.568,3.557ZM7.125,15.5C8.1561,15.5002 9.0805,16.1355 9.4505,17.0979C9.8204,18.0603 9.5595,19.1512 8.794,19.842C8.787,19.849 8.786,19.858 8.778,19.865C7.528,21.115 5.247,21.745 2.747,21.745C2.4018,21.745 2.122,21.4652 2.122,21.12C2.1242,20.8914 2.2522,20.6826 2.455,20.577L2.485,20.561C2.495,20.557 2.504,20.546 2.515,20.546C3.833,19.968 4.263,18.747 4.715,17.331C4.719,17.318 4.731,17.312 4.737,17.3C5.0446,16.236 6.0174,15.5027 7.125,15.5Z" />
</vector>

2
app/src/main/res/drawable/ic_data_collection.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M22,6a2,2 0,0 1,-2.07 1.999l-3.164,5.062a2,2 0,1 1,-3.762 0.81l-3.117,-2.078A1.992,1.992 0,0 1,8.93 12l-3.164,5.06A2,2 0,1 1,4.07 16l3.164,-5.062a2,2 0,1 1,3.762 -0.81l3.117,2.078A1.992,1.992 0,0 1,15.07 12l3.164,-5.062A2,2 0,1 1,22 6z" />
</vector>

3
app/src/main/res/drawable/ic_delete.xml
Unescape Escape View File

@ -7,8 +7,9 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<!-- photonRed60-->
<path
android:pathData="M12.531,17.5009C12.2549,17.5009 12.031,17.2771 12.031,17.0009L12,9.0009C12,8.7248 12.2239,8.5009 12.5,8.5009C12.7761,8.5009 13,8.7248 13,9.0009L13.031,17.0009C13.031,17.2771 12.8071,17.5009 12.531,17.5009ZM15,17.5009C14.7239,17.5009 14.5,17.2771 14.5,17.0009L14.5,9.0009C14.5,8.7248 14.7239,8.5009 15,8.5009C15.2761,8.5009 15.5,8.7248 15.5,9.0009L15.5,17.0009C15.5,17.2771 15.2761,17.5009 15,17.5009ZM10,17.5009C9.7239,17.5009 9.5,17.2771 9.5,17.0009L9.5,9.0009C9.5,8.7248 9.7239,8.5009 10,8.5009C10.2761,8.5009 10.5,8.7248 10.5,9.0009L10.5,17.0009C10.5,17.2771 10.2761,17.5009 10,17.5009ZM19,4.0009L15.316,4.0009C14.8986,2.8028 13.7688,2 12.5,2C11.2312,2 10.1014,2.8028 9.684,4.0009L6,4.0009C5.4477,4.0009 5,4.4487 5,5.0009C5,5.5532 5.4477,6.0009 6,6.0009L6,19.0009C6,20.6578 7.3431,22.0009 9,22.0009L16,22.0009C17.6569,22.0009 19,20.6578 19,19.0009L19,6.0009C19.5523,6.0009 20,5.5532 20,5.0009C20,4.4487 19.5523,4.0009 19,4.0009ZM12.5,3.0009C13.2113,3.0031 13.8676,3.3842 14.222,4.0009L10.778,4.0009C11.1324,3.3842 11.7887,3.0031 12.5,3.0009L12.5,3.0009ZM17,19.0009C17,19.5532 16.5523,20.0009 16,20.0009L9,20.0009C8.4477,20.0009 8,19.5532 8,19.0009L8,6.0009L17,6.0009L17,19.0009Z"
android:fillColor="?attr/deleteColor"
android:fillColor="#d70022"
android:fillType="evenOdd" />
</vector>

2
app/src/main/res/drawable/ic_download.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M11.293,17.707L5.293,11.707C4.914,11.3146 4.9194,10.6909 5.3052,10.3052C5.6909,9.9194 6.3146,9.914 6.707,10.293L11,14.586L11,3C11,2.4477 11.4477,2 12,2C12.5523,2 13,2.4477 13,3L13,14.586L17.293,10.293C17.6854,9.914 18.3091,9.9194 18.6948,10.3052C19.0806,10.6909 19.086,11.3146 18.707,11.707L12.707,17.707C12.3165,18.0974 11.6835,18.0974 11.293,17.707ZM18,20C18.5523,20 19,20.4477 19,21C19,21.5523 18.5523,22 18,22L6,22C5.4477,22 5,21.5523 5,21C5,20.4477 5.4477,20 6,20L18,20Z"
android:strokeWidth="1" />
</vector>

2
app/src/main/res/drawable/ic_drawer_pull_tab.xml
Unescape Escape View File

@ -7,6 +7,6 @@
<shape android:shape="rectangle">
<corners android:radius="2dp"/>
<size android:height="2dp" android:width="24dp" />
<solid android:color="?attr/quickActionPullTabColor" />
<solid android:color="?neutral"/>
</shape>
</inset>

2
app/src/main/res/drawable/ic_energy.xml
Unescape Escape View File

@ -9,5 +9,5 @@
android:viewportHeight="24">
<path
android:pathData="M11.026,22.133l7.282,-11.994c0.215,-0.354 0.102,-0.815 -0.252,-1.03 -0.117,-0.071 -0.252,-0.109 -0.389,-0.109H13l0.436,-6.987c0.01,-0.138 -0.096,-0.257 -0.233,-0.266 -0.093,-0.005 -0.181,0.04 -0.23,0.12L5.691,13.861c-0.215,0.354 -0.102,0.815 0.252,1.03 0.118,0.071 0.252,0.109 0.39,0.109H11l-0.437,6.987c-0.009,0.138 0.096,0.257 0.234,0.266 0.093,0.005 0.181,-0.04 0.23,-0.12z"
android:fillColor="?attr/iconColor"/>
android:fillColor="?primaryText"/>
</vector>

2
app/src/main/res/drawable/ic_formfill.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd"
android:pathData="M11.269,9C11.1976,9.0003 11.129,8.972 11.0785,8.9215C11.028,8.871 10.9997,8.8024 11,8.731L11,4C11,3.4477 11.4477,3 12,3C12.5523,3 13,3.4477 13,4L13,8.731C13.0003,8.8024 12.972,8.871 12.9215,8.9215C12.871,8.972 12.8024,9.0003 12.731,9L11.269,9ZM19,6C20.6393,6.0415 21.9585,7.3607 22,9L22,18C21.9585,19.6393 20.6393,20.9585 19,21L5,21C3.3607,20.9585 2.0415,19.6393 2,18L2,9C2.0415,7.3607 3.3607,6.0415 5,6L8,6C8.5523,6 9,6.4477 9,7C9,7.5523 8.5523,8 8,8L5,8C4.4682,8.0465 4.0465,8.4682 4,9L4,18C4.0465,18.5318 4.4682,18.9535 5,19L19,19C19.5318,18.9535 19.9535,18.5318 20,18L20,9C19.9535,8.4682 19.5318,8.0465 19,8L16,8C15.4477,8 15,7.5523 15,7C15,6.4477 15.4477,6 16,6L19,6ZM6.722,11L10.278,11C10.6767,11 11,11.3233 11,11.722L11,15.278C11,15.6767 10.6767,16 10.278,16L6.722,16C6.3233,16 6,15.6767 6,15.278L6,11.722C6,11.3233 6.3233,11 6.722,11ZM13.488,11L17.512,11C17.7815,11 18,11.2185 18,11.488L18,11.512C18,11.7815 17.7815,12 17.512,12L13.488,12C13.2185,12 13,11.7815 13,11.512L13,11.488C13,11.2185 13.2185,11 13.488,11ZM13.408,14L16.592,14C16.8173,14 17,14.1827 17,14.408L17,14.592C17,14.8173 16.8173,15 16.592,15L13.408,15C13.1827,15 13,14.8173 13,14.592L13,14.408C13,14.1827 13.1827,14 13.408,14Z" />
</vector>

2
app/src/main/res/drawable/ic_help.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd"
android:pathData="M12,2C6.4772,2 2,6.4772 2,12C2,17.5228 6.4772,22 12,22C17.5228,22 22,17.5228 22,12C21.9939,6.4797 17.5203,2.0061 12,2ZM12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12C19.995,16.4162 16.4162,19.995 12,20ZM12,15.536C11.1125,15.536 10.393,16.2555 10.393,17.143C10.393,18.0305 11.1125,18.75 12,18.75C12.8875,18.75 13.607,18.0305 13.607,17.143C13.6073,16.7167 13.438,16.3078 13.1366,16.0064C12.8352,15.705 12.4263,15.5357 12,15.536ZM12,5.732C10.9986,5.6611 10.0158,6.0281 9.3059,6.7379C8.5961,7.4478 8.2291,8.4306 8.3,9.432C8.3,10.0533 8.8037,10.557 9.425,10.557C10.0463,10.557 10.55,10.0533 10.55,9.432C10.55,8.15 11.323,7.985 11.996,7.985C12.6417,7.9359 13.2391,8.3294 13.449,8.942C13.5665,9.486 13.2775,10.036 12.763,10.248C11.6251,10.8409 10.9001,12.0062 10.871,13.289L10.871,13.722C10.871,14.3433 11.3747,14.847 11.996,14.847C12.6173,14.847 13.121,14.3433 13.121,13.722L13.121,13.246C13.1776,12.7796 13.4749,12.3772 13.904,12.186C15.2962,11.4597 16.0072,9.8723 15.622,8.35C15.1528,6.7536 13.663,5.6768 12,5.732Z" />
</vector>

2
app/src/main/res/drawable/ic_history.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4ZM16.5,13L11.5,13C11.2239,13 11,12.7761 11,12.5L11,7.5C11,7.2239 11.2239,7 11.5,7C11.7761,7 12,7.2239 12,7.5L12,12L16.5,12C16.7761,12 17,12.2239 17,12.5C17,12.7761 16.7761,13 16.5,13Z"
android:strokeWidth="1" />
</vector>

2
app/src/main/res/drawable/ic_home.xml
Unescape Escape View File

@ -9,5 +9,5 @@
android:viewportHeight="24">
<path
android:pathData="m21.457,11.1228 l-8.75,-8.0208c-0.3905,-0.3579 -1.0235,-0.3579 -1.414,0l-8.75,8.0208c-0.379,0.3597 -0.3736,0.9314 0.0122,1.285 0.3857,0.3536 1.0094,0.3586 1.4018,0.0112l1.043,-0.9561v6.9538c0,1.5188 1.3431,2.75 3,2.75h8c1.6569,0 3,-1.2312 3,-2.75v-6.9538l1.043,0.9561c0.3924,0.3474 1.0161,0.3424 1.4018,-0.0112 0.3857,-0.3536 0.3912,-0.9253 0.0122,-1.285zM17,18.4167c0,0.5063 -0.4477,0.9167 -1,0.9167 0.6667,0 0.1667,0 -1.5,0s-3.3333,0 -5,0h-1.5c-0.5523,0 -1,-0.4104 -1,-0.9167v-8.7872l5,-4.5833 5,4.5833z"
android:fillColor="?attr/iconColor"/>
android:fillColor="?primaryText"/>
</vector>

2
app/src/main/res/drawable/ic_info.xml
Unescape Escape View File

@ -9,6 +9,6 @@
android:viewportHeight="24">
<path
android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4ZM12,11C12.5523,11 13,11.4477 13,12L13,16C13,16.5523 12.5523,17 12,17C11.4477,17 11,16.5523 11,16L11,12C11,11.4477 11.4477,11 12,11ZM12,7C12.5523,7 13,7.4477 13,8C13,8.5523 12.5523,9 12,9C11.4477,9 11,8.5523 11,8C11,7.4477 11.4477,7 12,7Z"
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd" />
</vector>

2
app/src/main/res/drawable/ic_internet.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd"
android:pathData="M12,2C6.4772,2 2,6.4772 2,12C2,17.5228 6.4772,22 12,22C17.5228,22 22,17.5228 22,12C21.9939,6.4797 17.5203,2.0061 12,2ZM19.931,11L15.981,11C15.9554,8.7791 15.5436,6.5797 14.764,4.5C17.5622,5.5357 19.5532,8.0403 19.931,11L19.931,11ZM12,20C11.52,20 10.192,17.6 10.019,13L13.981,13C13.808,17.6 12.48,20 12,20ZM10.019,11C10.192,6.4 11.519,4 12,4C12.481,4 13.808,6.4 13.981,11L10.019,11ZM9.236,4.5C8.4564,6.5797 8.0446,8.7791 8.019,11L4.069,11C4.4468,8.0403 6.4378,5.5357 9.236,4.5ZM4.069,13L8.019,13C8.0446,15.2209 8.4564,17.4203 9.236,19.5C6.4378,18.4643 4.4468,15.9597 4.069,13L4.069,13ZM14.769,19.5C15.5469,17.42 15.957,15.2206 15.981,13L19.931,13C19.5532,15.9597 17.5622,18.4643 14.764,19.5L14.769,19.5Z" />
</vector>

2
app/src/main/res/drawable/ic_language.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="m9.8944,3.5528c-0.247,-0.494 -0.8477,-0.6942 -1.3416,-0.4472 -0.494,0.247 -0.6942,0.8477 -0.4472,1.3416l0.2764,0.5528h-5.382c-0.5523,0 -1,0.4477 -1,1 0,0.5523 0.4477,1 1,1h6.9797c0.0141,0.0003 0.0281,0.0003 0.0423,0h1.6451c-0.7152,2.1364 -1.7998,3.9404 -2.9531,5.4106 -0.6679,-0.6568 -1.3242,-1.5526 -1.7777,-2.7617 -0.1939,-0.5171 -0.7703,-0.7791 -1.2874,-0.5852 -0.5171,0.1939 -0.7791,0.7703 -0.5852,1.2874 0.5893,1.5715 1.4593,2.7316 2.3389,3.5735 -0.1204,0.1263 -0.2404,0.2491 -0.3596,0.3683 -0.9566,0.9566 -1.8526,1.6731 -2.5061,2.1484 -0.3264,0.2373 -0.5911,0.4137 -0.7712,0.5289 -0.09,0.0576 -0.1588,0.0999 -0.2034,0.1269l-0.0371,0.0221 -0.0114,0.0068 -0.0099,0.0058 -0.0012,0.0006c-0.4786,0.2744 -0.6447,0.8846 -0.3709,1.3637 0.274,0.4796 0.8849,0.6462 1.3644,0.3721l0.06,-0.0351 -0.0584,0.0343 0.0022,-0.0013 0.0063,-0.0037 0.0202,-0.0118c0.0168,-0.0098 0.0695,-0.0414 0.0695,-0.0414 0.0589,-0.0356 0.1425,-0.087 0.2478,-0.1544 0.2105,-0.1348 0.5083,-0.3334 0.8694,-0.5961 0.7216,-0.5248 1.7005,-1.3082 2.7439,-2.3516 0.1773,-0.1773 0.3567,-0.3624 0.5373,-0.5552 0.3924,0.2405 0.7462,0.4174 1.0292,0.5432 0.2008,0.0892 0.367,0.1532 0.4874,0.1961 0.0602,0.0214 0.1091,0.0377 0.1453,0.0492 0.0181,0.0058 0.033,0.0104 0.0446,0.0139l0.0148,0.0044 0.0055,0.0016 0.0023,0.0007 0.0019,0.0005c0.531,0.1518 1.0845,-0.1557 1.2362,-0.6868 0.1514,-0.5299 -0.1537,-1.082 -0.6827,-1.235l-0.0025,-0.0007 -0.0119,-0.0038c-0.0159,-0.0051 -0.0436,-0.0142 -0.082,-0.0279 -0.0769,-0.0274 -0.1958,-0.0728 -0.3466,-0.1399 -0.147,-0.0653 -0.3232,-0.1507 -0.5194,-0.2593 1.3691,-1.7529 2.6634,-3.955 3.4472,-6.6081h2.2364c0.5523,0 1,-0.4477 1,-1 0,-0.5523 -0.4477,-1 -1,-1h-2.9786c-0.0148,-0.0003 -0.0296,-0.0003 -0.0443,0h-2.3591zM18.6261,16h-3.2522l1.6261,-4.4025zM19.3649,18 L20.2558,20.4119c0.1722,0.4662 0.6898,0.7046 1.156,0.5324 0.4663,-0.1723 0.7047,-0.6898 0.5324,-1.1561l-3.6309,-9.8302c-0.4506,-1.2199 -2.176,-1.2199 -2.6266,0l-3.6309,9.8302c-0.1723,0.4663 0.0661,0.9838 0.5324,1.1561 0.4662,0.1722 0.9838,-0.0662 1.156,-0.5324l0.8909,-2.4119z" />
</vector>

2
app/src/main/res/drawable/ic_launcher_background.xml
Unescape Escape View File

@ -8,7 +8,7 @@
<path android:fillType="evenOdd"
android:pathData="M0,0h108v108h-108z">
<aapt:attr name="android:fillColor">
<solid android:color="@color/color_accent"/>
<solid android:color="@color/accent_light_theme"/>
</aapt:attr>
</path>
</vector>

2
app/src/main/res/drawable/ic_library.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M5,4a1,1 0,1 0,-2 0v16a1,1 0,1 0,2 0L5,4zM9,7a1,1 0,1 0,-2 0v13a1,1 0,1 0,2 0L9,7zM12,5a1,1 0,0 1,1 1v14a1,1 0,1 1,-2 0L11,6a1,1 0,0 1,1 -1zM16.452,5.694a1,1 0,1 0,-1.904 0.612l4.5,14a1,1 0,1 0,1.904 -0.612l-4.5,-14z" />
</vector>

2
app/src/main/res/drawable/ic_link.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/pillWrapperSelectedBackground"
android:fillColor="?attr/accent"
android:fillType="evenOdd"
android:pathData="M4.47,7.53L7.515,4.485C7.7829,4.2172 8.2171,4.2172 8.485,4.485L12.685,8.685C13.4609,7.7001 13.3815,6.2915 12.5,5.4L9.837,2.734C8.863,1.7601 7.284,1.7601 6.31,2.734L2.766,6.279C2.2984,6.7465 2.0356,7.3807 2.0356,8.042C2.0356,8.7033 2.2984,9.3375 2.766,9.805L5.426,12.466C6.3,13.3366 7.68,13.4354 8.669,12.698L4.47,8.5C4.3409,8.3716 4.2683,8.1971 4.2683,8.015C4.2683,7.8329 4.3409,7.6584 4.47,7.53ZM21.27,14.163L21.266,14.163C22.2383,15.137 22.2379,16.7145 21.265,17.688L17.72,21.232C17.2525,21.6996 16.6183,21.9624 15.957,21.9624C15.2957,21.9624 14.6615,21.6996 14.194,21.232L11.533,18.572C10.6621,17.6985 10.5633,16.3186 11.301,15.33L15.501,19.53C15.6293,19.6588 15.8037,19.7312 15.9855,19.7312C16.1673,19.7312 16.3417,19.6588 16.47,19.53L19.512,16.479C19.7798,16.2111 19.7798,15.7769 19.512,15.509L15.312,11.309C16.2998,10.53 17.7139,10.612 18.605,11.5L21.27,14.163ZM16.163,14.718C16.542,15.1104 16.5366,15.7341 16.1508,16.1198C15.7651,16.5056 15.1414,16.511 14.749,16.132L7.829,9.212C7.559,8.9632 7.4471,8.5864 7.5375,8.2306C7.6279,7.8747 7.906,7.597 8.262,7.5071C8.6179,7.4172 8.9946,7.5297 9.243,7.8L16.163,14.718Z" />
</vector>

2
app/src/main/res/drawable/ic_location.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>

2
app/src/main/res/drawable/ic_login.xml
Unescape Escape View File

@ -9,6 +9,6 @@
android:viewportHeight="24">
<path
android:pathData="M11.3769,4.8424C10.3318,6.0215 9.8457,7.5938 10.043,9.157L9,10.2C8.8561,10.3741 8.8561,10.6259 9,10.8C9.1152,11.0055 9.2597,11.1932 9.429,11.357C9.6452,11.5468 9.837,11.7628 10,12L3,19L3,20.7C2.9983,20.7801 3.0294,20.8573 3.086,20.914C3.1427,20.9706 3.2199,21.0017 3.3,21L7,21L7,20L8,20L8,18.5L9,18.5L9,18L10,18L10,16L11,16L12.6,14.4L12.9,14.4L13.5,15C13.8,15.3 13.8,15.3 13.969,15.3C14.1027,15.2898 14.2283,15.232 14.323,15.137L15.223,13.986C15.316,13.986 15.408,14 15.502,14C18.5396,14 21.002,11.5376 21.002,8.5C21.002,5.4624 18.5396,3 15.502,3C13.9245,2.9919 12.4219,3.6633 11.3769,4.8424ZM17.5,8C16.6716,8 16,7.3284 16,6.5C16,5.6716 16.6716,5 17.5,5C18.3284,5 19,5.6716 19,6.5C19,7.3284 18.3284,8 17.5,8Z"
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd" />
</vector>

2
app/src/main/res/drawable/ic_microphone.xml
Unescape Escape View File

@ -9,5 +9,5 @@
android:viewportHeight="24">
<path
android:pathData="M17,11v-1c0,-0.552 0.448,-1 1,-1s1,0.448 1,1v1c0,3.526 -2.608,6.444 -6,6.93L13,21c0,0.552 -0.448,1 -1,1s-1,-0.448 -1,-1v-3.07c-3.392,-0.486 -6,-3.404 -6,-6.93v-1c0,-0.552 0.448,-1 1,-1s1,0.448 1,1v1c0,2.761 2.239,5 5,5s5,-2.239 5,-5zM12,2c1.657,0 3,1.343 3,3v6c0,1.657 -1.343,3 -3,3s-3,-1.343 -3,-3L9,5c0,-1.657 1.343,-3 3,-3z"
android:fillColor="?attr/iconColor"/>
android:fillColor="?primaryText"/>
</vector>

2
app/src/main/res/drawable/ic_notification.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd"
android:pathData="M19,3L5,3C3.3431,3 2,4.3431 2,6L2,14C2,15.6569 3.3431,17 5,17L12.586,17L16.293,20.707C16.4805,20.8946 16.7348,20.9999 17,21C17.1315,21.0004 17.2617,20.9746 17.383,20.924C17.7566,20.7691 18.0001,20.4044 18,20L18,17L19,17C20.6569,17 22,15.6569 22,14L22,6C22,4.3431 20.6569,3 19,3ZM20,14C20,14.5523 19.5523,15 19,15L17,15C16.4477,15 16,15.4477 16,16L16,17.586L13.707,15.293C13.5195,15.1055 13.2652,15.0001 13,15L5,15C4.4477,15 4,14.5523 4,14L4,6C4,5.4477 4.4477,5 5,5L19,5C19.5523,5 20,5.4477 20,6L20,14ZM16.5,8L7.5,8C7.2239,8 7,8.2239 7,8.5C7,8.7761 7.2239,9 7.5,9L16.5,9C16.7761,9 17,8.7761 17,8.5C17,8.2239 16.7761,8 16.5,8ZM16.5,11L7.5,11C7.2239,11 7,11.2239 7,11.5C7,11.7761 7.2239,12 7.5,12L16.5,12C16.7761,12 17,11.7761 17,11.5C17,11.2239 16.7761,11 16.5,11Z" />
</vector>

2
app/src/main/res/drawable/ic_permission.xml
Unescape Escape View File

@ -9,5 +9,5 @@
android:viewportHeight="24">
<path
android:pathData="m12,20h5c1.6569,0 3,-1.3431 3,-3v-10c0,-1.6568 -1.3431,-3 -3,-3h-5zM7,2h10c2.7614,0 5,2.2386 5,5v10c0,2.7614 -2.2386,5 -5,5h-10c-2.7614,0 -5,-2.2386 -5,-5v-10c0,-2.7614 2.2386,-5 5,-5zM6.2143,15c0.0152,0.0001 0.0304,-0.0006 0.0455,-0.0021 0.154,-0.0135 0.2941,-0.0945 0.3827,-0.2212l3.0064,-4.9671c0.155,-0.2364 0.094,-0.5531 -0.1375,-0.7151s-0.55,-0.1107 -0.7189,0.1159l-2.6493,4.4563 -0.9971,-0.9971c-0.2052,-0.1981 -0.5313,-0.1953 -0.733,0.0064 -0.2017,0.2017 -0.2045,0.5278 -0.0064,0.7329l1.4379,1.4379c0.098,0.0981 0.231,0.1532 0.3697,0.1532zM13.1464,9.8535c-0.1952,-0.1953 -0.1952,-0.5118 0,-0.7071 0.1953,-0.1953 0.5119,-0.1953 0.7072,0l2.1464,2.1465 2.1464,-2.1465c0.1953,-0.1953 0.5119,-0.1953 0.7072,0 0.1952,0.1953 0.1952,0.5118 0,0.7071l-2.1465,2.1465 2.1465,2.1465c0.1952,0.1952 0.1952,0.5118 0,0.7071 -0.1953,0.1952 -0.5119,0.1952 -0.7072,0l-2.1464,-2.1465 -2.1464,2.1465c-0.1953,0.1952 -0.5119,0.1952 -0.7072,0 -0.1952,-0.1953 -0.1952,-0.5119 0,-0.7071l2.1465,-2.1465z"
android:fillColor="?attr/iconColor" />
android:fillColor="?primaryText" />
</vector>

2
app/src/main/res/drawable/ic_private_browsing.xml
Unescape Escape View File

@ -9,5 +9,5 @@
android:viewportHeight="24">
<path
android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z"
android:fillColor="?attr/privateBrowsingButtonTint" />
android:fillColor="?primaryText" />
</vector>

2
app/src/main/res/drawable/ic_qr.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd"
android:pathData="M17.5,3C19.433,3 21,4.567 21,6.5L21,9C21,9.5523 20.5523,10 20,10C19.4477,10 19,9.5523 19,9L19,6.5C19,5.6716 18.3284,5 17.5,5L15,5C14.4477,5 14,4.5523 14,4C14,3.4477 14.4477,3 15,3L17.5,3ZM20,14C20.5523,14 21,14.4477 21,15L21,17.5C21,19.433 19.433,21 17.5,21L15,21C14.4477,21 14,20.5523 14,20C14,19.4477 14.4477,19 15,19L17.5,19C18.3284,19 19,18.3284 19,17.5L19,15C19,14.4477 19.4477,14 20,14ZM9,19C9.5523,19 10,19.4477 10,20C10,20.5523 9.5523,21 9,21L6.5,21C4.567,21 3,19.433 3,17.5L3,15C3,14.4477 3.4477,14 4,14C4.5523,14 5,14.4477 5,15L5,17.5C5,18.3284 5.6716,19 6.5,19L9,19ZM4,10C3.4477,10 3,9.5523 3,9L3,6.5C3,4.567 4.567,3 6.5,3L9,3C9.5523,3 10,3.4477 10,4C10,4.5523 9.5523,5 9,5L6.5,5C5.6716,5 5,5.6716 5,6.5L5,9C5,9.5523 4.5523,10 4,10ZM15,7L17,7L17,9L15,9L15,7ZM7,9L7,7L11,7L11,9L11,11L9,11L7,11L7,9ZM15,11L17,11L17,13L15,13L15,11ZM9,13L11,13L11,15L9,15L9,13ZM15,15L17,15L17,17L15,17L15,15ZM11,15L13,15L13,17L11,17L11,15ZM7,15L9,15L9,17L7,17L7,15ZM13,13L15,13L15,15L13,15L13,13ZM13,9L15,9L15,11L13,11L13,9Z" />
</vector>

2
app/src/main/res/drawable/ic_report_issues.xml
Unescape Escape View File

@ -7,6 +7,6 @@
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:pathData="M8,0C4.3,0 2,2.107 2,5.5c0,2.372 2.065,4.268 3,5L5,14c0,1.476 1.616,2 3,2s3,-0.524 3,-2v-3.5c0.935,-0.736 3,-2.632 3,-5C14,2.107 11.7,0 8,0zM9,12L7,12v-1h2zM8,14a3.086,3.086 0,0 1,-1 -0.172L7,13h2v0.828A3.047,3.047 0,0 1,8 14zM9.445,9.168A1,1 0,0 0,9 10L7,10a1,1 0,0 0,-0.444 -0.831C5.845,8.691 4,7.1 4,5.5 4,2.607 6.175,2 8,2s4,0.607 4,3.5c0,1.6 -1.845,3.191 -2.555,3.668z" />
</vector>

2
app/src/main/res/drawable/ic_screenshots.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd"
android:pathData="M10.4097,13.5843L14.9445,10.4447C16.0797,9.6588 17.6371,9.942 18.423,11.0772L7.9279,18.3431C7.9751,18.5545 8,18.7743 8,19C8,20.6569 6.6569,22 5,22C3.3431,22 2,20.6569 2,19C2,17.3431 3.3431,16 5,16C5.5103,16 5.9909,16.1274 6.4116,16.3522L8.2516,15.0783L6.4,13.654C5.9821,13.8749 5.5056,14 5,14C3.3431,14 2,12.6569 2,11C2,9.3431 3.3431,8 5,8C6.6569,8 8,9.3431 8,11C8,11.2312 7.9738,11.4563 7.9243,11.6725L10.4097,13.5843ZM13.648,16.0753L18.7621,20.0092C17.9203,21.1036 16.3507,21.3083 15.2563,20.4665L11.49,17.5693L13.648,16.0753ZM5,12C5.5523,12 6,11.5523 6,11C6,10.4477 5.5523,10 5,10C4.4477,10 4,10.4477 4,11C4,11.5523 4.4477,12 5,12ZM5,20C5.5523,20 6,19.5523 6,19C6,18.4477 5.5523,18 5,18C4.4477,18 4,18.4477 4,19C4,19.5523 4.4477,20 5,20ZM5,7C4.4477,7 4,6.5523 4,6L4,5C4,3.3431 5.3431,2 7,2L11,2C11.5523,2 12,2.4477 12,3C12,3.5523 11.5523,4 11,4L7,4C6.4477,4 6,4.4477 6,5L6,6C6,6.5523 5.5523,7 5,7ZM15,4C14.4477,4 14,3.5523 14,3C14,2.4477 14.4477,2 15,2L19,2C20.6569,2 22,3.3431 22,5L22,7C22,7.5523 21.5523,8 21,8C20.4477,8 20,7.5523 20,7L20,5C20,4.4477 19.5523,4 19,4L15,4ZM17,14L19,14C19.5523,14 20,13.5523 20,13L20,11C20,10.4477 20.4477,10 21,10C21.5523,10 22,10.4477 22,11L22,13C22,14.6569 20.6569,16 19,16L17,16C16.4477,16 16,15.5523 16,15C16,14.4477 16.4477,14 17,14Z" />
</vector>

2
app/src/main/res/drawable/ic_search.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd"
android:pathData="M21.457,20.043L15.457,14.043C17.8623,10.8933 17.4137,6.4181 14.4311,3.8085C11.4484,1.1989 6.9533,1.3486 4.151,4.151C1.3486,6.9533 1.1989,11.4484 3.8085,14.4311C6.4181,17.4137 10.8933,17.8623 14.043,15.457L20.043,21.457C20.4354,21.836 21.0591,21.8306 21.4448,21.4448C21.8306,21.0591 21.836,20.4354 21.457,20.043L21.457,20.043ZM9.5,15C6.4624,15 4,12.5376 4,9.5C4,6.4624 6.4624,4 9.5,4C12.5376,4 15,6.4624 15,9.5C14.9967,12.5362 12.5362,14.9967 9.5,15Z" />
</vector>

2
app/src/main/res/drawable/ic_settings.xml
Unescape Escape View File

@ -9,6 +9,6 @@
android:viewportHeight="24">
<path
android:pathData="M20.75,11L17.91,11C17.7599,10.1093 17.4094,9.2644 16.885,8.529L18.894,6.52C19.273,6.1276 19.2676,5.5039 18.8818,5.1182C18.4961,4.7324 17.8724,4.727 17.48,5.106L15.471,7.115C14.7356,6.5906 13.8907,6.2401 13,6.09L13,3.25C13,2.6977 12.5523,2.25 12,2.25C11.4477,2.25 11,2.6977 11,3.25L11,6.09C10.1093,6.2401 9.2644,6.5906 8.529,7.115L6.52,5.106C6.1276,4.727 5.5039,4.7324 5.1182,5.1182C4.7324,5.5039 4.727,6.1276 5.106,6.52L7.115,8.529C6.5906,9.2644 6.2401,10.1093 6.09,11L3.25,11C2.6977,11 2.25,11.4477 2.25,12C2.25,12.5523 2.6977,13 3.25,13L6.09,13C6.2436,13.9088 6.6057,14.7697 7.148,15.515C7.0646,15.555 6.9871,15.6065 6.918,15.668L5.106,17.48C4.846,17.7311 4.7418,18.1029 4.8333,18.4525C4.9248,18.8021 5.1979,19.0752 5.5475,19.1667C5.8971,19.2582 6.2689,19.154 6.52,18.894L8.332,17.082C8.3935,17.0129 8.445,16.9354 8.485,16.852C9.2303,17.3943 10.0912,17.7564 11,17.91L11,20.75C11,21.3023 11.4477,21.75 12,21.75C12.5523,21.75 13,21.3023 13,20.75L13,17.91C13.8907,17.7599 14.7356,17.4094 15.471,16.885L17.48,18.894C17.8724,19.273 18.4961,19.2676 18.8818,18.8818C19.2676,18.4961 19.273,17.8724 18.894,17.48L16.885,15.471C17.4094,14.7356 17.7599,13.8907 17.91,13L20.75,13C21.3023,13 21.75,12.5523 21.75,12C21.75,11.4477 21.3023,11 20.75,11ZM8,12C8,9.7909 9.7909,8 12,8C14.2091,8 16,9.7909 16,12C16,14.2091 14.2091,16 12,16C10.9391,16 9.9217,15.5786 9.1716,14.8284C8.4214,14.0783 8,13.0609 8,12Z"
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd" />
</vector>

2
app/src/main/res/drawable/ic_share.xml
Unescape Escape View File

@ -10,7 +10,7 @@
<path
android:pathData="M8.92,14.7338C8.1902,15.5131 7.1519,16 6,16C3.7909,16 2,14.2091 2,12C2,9.7909 3.7909,8 6,8C7.0609,8 8.0783,8.4214 8.8284,9.1716C8.86,9.2031 8.8909,9.2351 8.9213,9.2676L13.1206,6.9785C13.0418,6.6654 13,6.3376 13,6C13,3.7909 14.7909,2 17,2C19.2091,2 21,3.7909 21,6C21,8.2091 19.2091,10 17,10C15.8481,10 14.8098,9.5131 14.08,8.7338L9.879,11.0237C9.9587,11.3403 10,11.668 10,12C10,12.3376 9.9582,12.6654 9.8794,12.9785L14.0787,15.2675C14.8087,14.4875 15.8474,14 17,14C19.2091,14 21,15.7909 21,18C21,20.2091 19.2091,22 17,22C14.7909,22 13,20.2091 13,18C13,17.6631 13.0417,17.3358 13.1201,17.0232L8.92,14.7338ZM17,4C15.8954,4 15,4.8954 15,6C15,7.1046 15.8954,8 17,8C18.1046,8 19,7.1046 19,6C19,4.8954 18.1046,4 17,4ZM6,10C4.8954,10 4,10.8954 4,12C4,13.1046 4.8954,14 6,14C7.1046,14 8,13.1046 8,12C8,10.8954 7.1046,10 6,10ZM17,16C15.8954,16 15,16.8954 15,18C15,19.1046 15.8954,20 17,20C18.1046,20 19,19.1046 19,18C19,16.8954 18.1046,16 17,16Z"
android:strokeWidth="1"
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>

2
app/src/main/res/drawable/ic_shortcuts.xml
Unescape Escape View File

@ -9,6 +9,6 @@
android:viewportHeight="24">
<path
android:pathData="M10.0127,12.1576C10.0127,13.7366 10.6987,14.6946 11.8427,14.6946C13.0177,14.6946 13.7477,13.7256 13.7477,12.1576C13.7477,10.5906 13.0177,9.6206 11.8527,9.6206C10.6987,9.6206 10.0127,10.5676 10.0127,12.1576M20.9997,11.0916C20.9997,14.5206 19.3777,16.7316 16.7207,16.7316C15.3697,16.7316 14.3357,16.0786 14.0957,15.0216L13.9437,15.0216C13.4967,16.1106 12.5827,16.6986 11.3197,16.6986C9.0547,16.6986 7.5407,14.8586 7.5407,12.0926C7.5407,9.4466 9.0327,7.6386 11.2107,7.6386C12.3867,7.6386 13.3667,8.2266 13.7917,9.1846L13.9437,9.1846L13.9437,7.8786L16.1547,7.8786L16.1547,13.7046C16.1547,14.4556 16.5027,14.9346 17.1887,14.9346C18.2557,14.9346 18.9967,13.5736 18.9967,11.2546C18.9967,7.2906 16.2627,4.7316 12.1367,4.7316C7.9437,4.7316 5.0037,7.7586 5.0037,12.1366C5.0037,16.7196 8.0637,19.3986 12.5497,19.3986C13.7147,19.3986 14.9017,19.2466 15.5227,19.0176L15.5227,20.7606C14.6737,21.0116 13.5627,21.1636 12.3867,21.1636C6.8767,21.1636 2.9997,17.7116 2.9997,12.0816C2.9997,6.6806 6.7787,3.0006 12.2127,3.0006C17.3737,3.0006 20.9997,6.2446 20.9997,11.0916"
android:fillColor="?attr/iconColor"
android:fillColor="?primaryText"
android:fillType="evenOdd" />
</vector>

2
app/src/main/res/drawable/ic_tabs.xml
Unescape Escape View File

@ -9,6 +9,6 @@
android:viewportHeight="24">
<path
android:pathData="M15.2222,22L5.7778,22C3.6914,22 2,20.3086 2,18.2222L2,8.7778C2,6.6914 3.6914,5 5.7778,5L15.2222,5C17.3086,5 19,6.6914 19,8.7778L19,18.2222C19,20.3086 17.3086,22 15.2222,22ZM5.8571,7C4.8315,7 4,7.8315 4,8.8571L4,18.1429C4,19.1685 4.8315,20 5.8571,20L15.1429,20C16.1685,20 17,19.1685 17,18.1429L17,8.8571C17,7.8315 16.1685,7 15.1429,7L5.8571,7ZM6,4C6,2.8954 6.8954,2 8,2L15.9866,2C19.3004,2 21.9866,4.6863 21.9866,8C21.9866,8.008 21.9866,8.008 21.9866,8.016L21.9632,16.0027C21.96,17.1073 21.062,18.0003 19.9573,17.9973L19.9866,8.0107L19.9866,8C19.9866,5.7909 18.1958,4 15.9866,4L6,4Z"
android:fillColor="?attr/browserToolbarIcons"
android:fillColor="?primaryText"
android:fillType="evenOdd" />
</vector>

2
app/src/main/res/drawable/ic_tracking_protection.xml
Unescape Escape View File

@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/primaryTextColor"
android:fillColor="?primaryText"
android:fillType="evenOdd"
android:pathData="M20,6.047C19.9965,4.9927 19.2276,4.0971 18.186,3.934L12,2.912L5.816,3.933C4.7741,4.0968 4.0049,4.9923 4,6.047C4,7.729 4.012,9.954 4.111,11.005C4.411,14.205 5.033,15.96 6.56,17.954C7.8759,19.6329 9.7831,20.746 11.892,21.066L12,21.078L12.107,21.066C14.2159,20.746 16.1231,19.6329 17.439,17.954C18.967,15.96 19.584,14.206 19.888,11.005L19.888,11.005C19.993,9.891 20,7.421 20,6.047ZM17.9,10.815C17.63,13.659 17.152,15.043 15.855,16.739C14.8897,17.9499 13.5217,18.7739 12,19.061C10.4792,18.7737 9.1122,17.9496 8.148,16.739C6.848,15.039 6.372,13.659 6.103,10.816C6.031,10.059 6,8.367 6,6.054C6.0036,5.9768 6.0631,5.9138 6.14,5.906L12,4.939L17.861,5.907C17.9376,5.9135 17.9972,5.9762 18,6.053C18.005,8.328 17.968,10.064 17.9,10.815ZM8,7.626C8.015,9.593 8.066,10.365 8.091,10.626C8.347,13.326 8.785,14.282 9.733,15.526C10.3122,16.2484 11.1061,16.7677 12,17.009L12,6.967L8,7.626Z" />
</vector>

2
app/src/main/res/drawable/mozac_ui_tabcounter_box.xml
Unescape Escape View File

@ -8,6 +8,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?browserToolbarIcons"
android:fillColor="?primaryText"
android:pathData="M15.2222,22L5.7778,22C3.6914,22 2,20.3086 2,18.2222L2,8.7778C2,6.6914 3.6914,5 5.7778,5L15.2222,5C17.3086,5 19,6.6914 19,8.7778L19,18.2222C19,20.3086 17.3086,22 15.2222,22ZM5.8571,7C4.8315,7 4,7.8315 4,8.8571L4,18.1429C4,19.1685 4.8315,20 5.8571,20L15.1429,20C16.1685,20 17,19.1685 17,18.1429L17,8.8571C17,7.8315 16.1685,7 15.1429,7L5.8571,7ZM6,4C6,2.8954 6.8954,2 8,2L15.9866,2C19.3004,2 21.9866,4.6863 21.9866,8C21.9866,8.008 21.9866,8.008 21.9866,8.016L21.9632,16.0027C21.96,17.1073 21.062,18.0003 19.9573,17.9973L19.9866,8.0107L19.9866,8C19.9866,5.7909 18.1958,4 15.9866,4L6,4Z" />
</vector>

4
app/src/main/res/drawable/private_browsing_button_background.xml
Unescape Escape View File

@ -6,13 +6,13 @@
android:color="?android:attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape>
<solid android:color="@color/private_browsing_primary" />
<solid android:color="?accentBright" />
<corners android:radius="32dp" />
</shape>
</item>
<item>
<shape>
<solid android:color="@color/private_browsing_primary" />
<solid android:color="?accentBright" />
<corners android:radius="32dp" />
</shape>
</item>

2
app/src/main/res/drawable/progress_gradient.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<solid android:color="?attr/unloadedProgressColor" />
<solid android:color="?above" />
</shape>
</item>

4
app/src/main/res/drawable/search_pill_background.xml
Unescape Escape View File

@ -3,10 +3,10 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?attr/pillWrapperSelectedBackground"/>
<solid android:color="?accent"/>
<stroke android:width="1dp"
android:color="?attr/pillWrapperSelectedBackground"/>
android:color="?accent"/>
<corners android:radius="16dp"/>
</shape>

4
app/src/main/res/drawable/search_pill_background_unselected.xml
Unescape Escape View File

@ -3,10 +3,10 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?attr/pillWrapperBackground"/>
<solid android:color="?foundation"/>
<stroke android:width="1dp"
android:color="?attr/disabledIconColor"/>
android:color="?neutral"/>
<corners android:radius="16dp"/>
</shape>

2
app/src/main/res/drawable/session_border.xml
Unescape Escape View File

@ -5,5 +5,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/tab_corner_radius"/>
<stroke android:width="@dimen/tab_border_width" android:color="?attr/sessionBorderColor"/>
<stroke android:width="@dimen/tab_border_width" android:color="?accentBright"/>
</shape>

2
app/src/main/res/drawable/session_list_empty_bg.xml
Unescape Escape View File

@ -3,7 +3,7 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/session_list_empty_bg"/>
<solid android:color="?foundation"/>
<padding android:left="2dp"
android:top="2dp"

2
app/src/main/res/drawable/sign_in_preference_background.xml
Unescape Escape View File

@ -12,7 +12,7 @@
</item>
<item>
<shape>
<solid android:color="?attr/sessionBackgroundColor" />
<solid android:color="?foundation" />
<corners android:radius="8dp" />
</shape>
</item>

2
app/src/main/res/drawable/url_background.xml
Unescape Escape View File

@ -3,7 +3,7 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/url_box_view" />
<solid android:color="?above" />
<corners
android:bottomLeftRadius="8dp"

2
app/src/main/res/layout/activity_home.xml
Unescape Escape View File

@ -16,7 +16,7 @@
app:titleMarginStart="16dp"
app:titleMarginEnd="16dp"
app:titleTextAppearance="@style/ToolbarTitleTextStyle"
android:background="?attr/toolbarColor"
android:background="?foundation"
android:elevation="8dp"/>
<fragment

6
app/src/main/res/layout/archive_tabs_button.xml
Unescape Escape View File

@ -10,7 +10,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/button_background"
android:backgroundTint="@color/save_session_button_color"
android:backgroundTint="?accent"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
@ -22,12 +22,12 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
android:drawableTint="@color/save_session_button_text_color"
android:drawableTint="@color/foundation_light_theme"
android:drawableStart="@drawable/ic_archive"
android:drawablePadding="8dp"
android:focusable="false"
android:gravity="center"
android:textStyle="bold"
android:text="@string/session_save"
android:textColor="@color/save_session_button_text_color" />
android:textColor="@color/foundation_light_theme"/>
</FrameLayout>

8
app/src/main/res/layout/bookmark_row.xml
Unescape Escape View File

@ -28,7 +28,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
android:foregroundTint="?attr/iconColor"
android:foregroundTint="?primaryText"
tools:src="@drawable/ic_folder_icon" />
<TextView
@ -39,7 +39,7 @@
android:ellipsize="end"
android:lines="1"
android:textSize="16sp"
android:textColor="?attr/bookmarksEditTextColor"
android:textColor="?secondaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/bookmark_overflow"
app:layout_constraintHorizontal_bias="0"
@ -54,7 +54,7 @@
android:layout_margin="10dp"
android:contentDescription="@string/bookmark_menu_content_description"
android:src="@drawable/ic_menu"
android:tint="?attr/iconColor"
android:tint="?primaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -71,7 +71,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/bookmark_overflow"
android:background="?attr/bookmarksEditTextColor"
android:background="?neutral"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/component_awesomebar.xml
Unescape Escape View File

@ -13,5 +13,5 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
mozac:awesomeBarDescriptionTextColor="?attr/awesomeBarDescriptionTextColor"
mozac:awesomeBarTitleTextColor="?attr/awesomeBarTitleTextColor" />
mozac:awesomeBarDescriptionTextColor="?secondaryText"
mozac:awesomeBarTitleTextColor="?primaryText" />

2
app/src/main/res/layout/component_bookmark.xml
Unescape Escape View File

@ -23,6 +23,6 @@
android:layout_gravity="center"
android:text="@string/bookmarks_empty_message"
android:visibility="gone"
android:textColor="?attr/bookmarksLabelColor"/>
android:textColor="?primaryText"/>
</FrameLayout>

8
app/src/main/res/layout/component_search.xml
Unescape Escape View File

@ -10,8 +10,8 @@
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
app:browserToolbarClearColor="?attr/browserToolbarIcons"
app:browserToolbarInsecureColor="?attr/browserToolbarIcons"
app:browserToolbarMenuColor="?attr/browserToolbarIcons"
app:browserToolbarClearColor="?primaryText"
app:browserToolbarInsecureColor="?primaryText"
app:browserToolbarMenuColor="?primaryText"
app:browserToolbarProgressBarGravity="top"
app:browserToolbarSecureColor="?attr/browserToolbarIcons" />
app:browserToolbarSecureColor="?primaryText" />

2
app/src/main/res/layout/delete_history_button.xml
Unescape Escape View File

@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/history_delete_all"
android:textColor="?attr/deleteColor"
android:textColor="@color/delete_color"
android:drawablePadding="8dp"
android:textSize="16sp"
android:gravity="center"

4
app/src/main/res/layout/delete_tabs_button.xml
Unescape Escape View File

@ -10,7 +10,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/button_background"
android:backgroundTint="@color/delete_session_button_background"
android:backgroundTint="?neutral"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
@ -28,6 +28,6 @@
android:textStyle="bold"
android:gravity="center"
android:text="@string/session_delete"
android:textColor="@color/color_primary_dark"
android:textColor="@color/primary_text_light_theme"
android:textSize="16sp" />
</FrameLayout>

2
app/src/main/res/layout/fragment_about.xml
Unescape Escape View File

@ -12,7 +12,7 @@
<ImageView
android:id="@+id/wordmark"
android:importantForAccessibility="no"
android:src="?attr/fenixLogo"
android:src="?fenixLogo"
android:layout_marginTop="24dp"
android:layout_height="wrap_content"
android:layout_width="0dp"

10
app/src/main/res/layout/fragment_add_bookmark_folder.xml
Unescape Escape View File

@ -16,7 +16,7 @@
android:layout_marginTop="16dp"
android:text="@string/bookmark_name_label"
android:textAllCaps="true"
android:textColor="?attr/bookmarksLabelColor"
android:textColor="?primaryText"
android:textSize="12sp" />
<EditText
@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:inputType="textAutoComplete"
android:textColor="?attr/bookmarksEditTextColor"
android:textColor="?secondaryText"
android:textSize="15sp"
tools:text="News" />
@ -36,7 +36,7 @@
android:layout_marginTop="8dp"
android:text="@string/bookmark_folder_label"
android:textAllCaps="true"
android:textColor="?attr/bookmarksLabelColor"
android:textColor="?primaryText"
android:textSize="12sp" />
<TextView
@ -46,8 +46,8 @@
android:layout_marginTop="8dp"
android:drawableStart="@drawable/ic_folder_icon"
android:drawablePadding="10dp"
android:drawableTint="?attr/iconColor"
android:textColor="?attr/bookmarksEditTextColor"
android:drawableTint="?primaryText"
android:textColor="?secondaryText"
android:textSize="16sp"
tools:targetApi="m"
tools:text="Mobile Bookmarks" />

8
app/src/main/res/layout/fragment_browser.xml
Unescape Escape View File

@ -21,7 +21,7 @@
android:id="@+id/nestedScrollQuickAction"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="?attr/quickActionBackgroundColor"
android:background="?foundation"
android:clipToPadding="true"
app:behavior_hideable="true"
app:behavior_peekHeight="15dp"
@ -32,9 +32,9 @@
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_gravity="bottom"
android:background="?attr/browserToolbarBackground"
mozac:findInPageResultCountTextColor="?attr/browserToolbarIcons"
mozac:findInPageButtonsTint="?attr/browserToolbarIcons"
android:background="?foundation"
mozac:findInPageResultCountTextColor="?primaryText"
mozac:findInPageButtonsTint="?primaryText"
android:visibility="gone"
app:layout_behavior="org.mozilla.fenix.components.FindInPageBarBehavior" />

16
app/src/main/res/layout/fragment_crash_reporter.xml
Unescape Escape View File

@ -7,7 +7,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/searchBackground_normal_theme">
android:background="?above">
<ImageView
android:id="@+id/crash_tab_image"
@ -27,7 +27,7 @@
android:layout_marginTop="6dp"
android:lineSpacingExtra="8sp"
android:singleLine="false"
android:textColor="@color/text_color_normal_theme"
android:textColor="@color/primary_text_normal_theme"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -39,10 +39,10 @@
android:layout_width="0dp"
android:layout_height="32dp"
android:layout_marginBottom="20dp"
android:buttonTint="@color/crash_page_accent"
android:buttonTint="?accent"
android:checked="true"
android:text="@string/tab_crash_send_report"
android:textColor="@color/text_color_normal_theme"
android:textColor="@color/primary_text_normal_theme"
android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@id/close_tab_button"
app:layout_constraintEnd_toEndOf="parent"
@ -56,10 +56,10 @@
android:layout_marginStart="@dimen/crash_reporter_close_tab_button_horizontal_margin"
android:layout_marginEnd="@dimen/crash_reporter_close_tab_button_horizontal_margin"
android:layout_marginBottom="@dimen/crash_reporter_close_tab_button_bottom_margin"
android:backgroundTint="@color/crash_page_accent"
android:backgroundTint="?accent"
android:text="@string/tab_crash_restore"
android:fontFamily="Sharp Sans"
android:textColor="@color/off_white"
android:textColor="@color/foundation_normal_theme"
android:textStyle="bold"
android:textAllCaps="false"
android:textSize="14sp"
@ -75,10 +75,10 @@
android:layout_marginStart="@dimen/crash_reporter_close_tab_button_horizontal_margin"
android:layout_marginEnd="@dimen/crash_reporter_close_tab_button_horizontal_margin"
android:layout_marginBottom="@dimen/crash_reporter_close_tab_button_bottom_margin"
android:backgroundTint="@color/crash_page_off_accent"
android:backgroundTint="?neutral"
android:text="@string/tab_crash_close"
android:fontFamily="Sharp Sans"
android:textColor="@color/about_primary_text_color"
android:textColor="?primaryText"
android:textStyle="bold"
android:textAllCaps="false"
android:textSize="14sp"

14
app/src/main/res/layout/fragment_edit_bookmark.xml
Unescape Escape View File

@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/bookmark_name_label"
android:textColor="?attr/bookmarksLabelColor"
android:textColor="?primaryText"
android:textSize="12sp"
android:textAllCaps="true"/>
@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textSize="15sp"
android:textColor="?attr/bookmarksEditTextColor"
android:textColor="?secondaryText"
tools:text="Internet for people, not profit -- Mozilla"
android:inputType="textAutoComplete"/>
@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/bookmark_url_label"
android:textColor="?attr/bookmarksLabelColor"
android:textColor="?primaryText"
android:textSize="12sp"
android:textAllCaps="true"/>
@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:textSize="15sp"
android:textColor="?attr/bookmarksEditTextColor"
android:textColor="?secondaryText"
tools:text="https://www.mozilla.org/en-US/"
android:inputType="textUri"/>
@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/bookmark_folder_label"
android:textColor="?attr/bookmarksLabelColor"
android:textColor="?primaryText"
android:textSize="12sp"
android:textAllCaps="true"/>
@ -65,10 +65,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textSize="16sp"
android:textColor="?attr/bookmarksEditTextColor"
android:textColor="?secondaryText"
android:drawableStart="@drawable/ic_folder_icon"
android:drawablePadding="10dp"
android:drawableTint="?attr/iconColor"
android:drawableTint="?primaryText"
tools:text="Mobile Bookmarks"
tools:targetApi="m" />

15
app/src/main/res/layout/fragment_home.xml
Unescape Escape View File

@ -12,7 +12,7 @@
android:id="@+id/homeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/homeBackgroundGradient"
android:background="@drawable/home_background_gradient"
app:layoutDescription="@xml/home_scene"
tools:context=".home.HomeFragment">
<ImageButton
@ -22,7 +22,7 @@
android:layout_marginTop="16dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_menu"
android:tint="?attr/menuButtonTint"
android:tint="?primaryText"
android:contentDescription="@string/content_description_menu"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -31,8 +31,9 @@
android:id="@+id/privateBrowsingButton"
android:layout_width="@dimen/glyph_button_height"
android:layout_height="@dimen/glyph_button_height"
android:background="?attr/privateBrowsingButtonBackground"
android:background="?privateBrowsingButtonBackground"
android:src="@drawable/ic_private_browsing"
android:tint="?primaryText"
android:contentDescription="@string/content_description_private_browsing_button"
app:layout_constraintEnd_toStartOf="@id/menuButton"
app:layout_constraintTop_toTopOf="@id/menuButton" />
@ -43,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="42dp"
android:src="?attr/fenixLogo"
android:src="?fenixLogo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/menuButton" />
@ -55,7 +56,7 @@
android:layout_marginTop="64dp"
android:layout_marginStart="16dp"
android:elevation="@dimen/toolbar_elevation"
android:background="?attr/toolbarWrapperBackground"
android:background="@drawable/home_search_background_normal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/wordmark">
@ -73,7 +74,7 @@
android:focusable="true"
android:gravity="center_vertical"
android:text="@string/search_hint"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
android:textSize="14sp" />
</org.mozilla.fenix.home.SearchView>
@ -81,7 +82,7 @@
android:id="@+id/homeDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/homeDividerColor"
android:background="?neutral"
app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
Unescape Escape View File

@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/quick_settings_sheet"
android:background="?attr/toolbarColor">
android:background="?foundation">
<TextView
android:id="@+id/url"
@ -40,7 +40,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_height="1dp"
android:background="?attr/homeDividerColor"
android:background="?neutral"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/security_info"/>

8
app/src/main/res/layout/fragment_search.xml
Unescape Escape View File

@ -9,7 +9,7 @@
android:layout_height="match_parent"
tools:context=".search.SearchFragment"
android:id="@+id/search_layout"
android:background="?attr/searchBackground">
android:background="?above">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbar_wrapper"
@ -18,7 +18,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="16dp"
android:background="?attr/toolbarWrapperBackground"
android:background="@drawable/home_search_background_dark"
android:outlineProvider="paddedBounds"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -53,7 +53,7 @@
android:textAllCaps="true"
android:textStyle="bold"
android:textSize="12sp"
android:textColor="?attr/awesomeBarDescriptionTextColor"
android:textColor="?secondaryText"
android:letterSpacing="0.15"
android:text="@string/search_shortcuts_search_with"
app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
@ -61,7 +61,7 @@
<LinearLayout
android:id="@+id/pill_wrapper"
android:background="?attr/pillWrapperBackground"
android:background="?foundation"
android:elevation="10dp"
android:layout_width="0dp"
android:layout_height="wrap_content"

2
app/src/main/res/layout/history_header.xml
Unescape Escape View File

@ -15,5 +15,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="17sp"
android:textColor="?attr/historyHeader"/>
android:textColor="?primaryText"/>
</FrameLayout>

6
app/src/main/res/layout/history_list_item.xml
Unescape Escape View File

@ -28,7 +28,7 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_history_menu"
android:src="@drawable/ic_menu"
android:tint="?attr/menuButtonTint"
android:tint="?primaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -50,7 +50,7 @@
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?attr/historyURLColor"
android:textColor="?secondaryText"
android:textSize="12sp"
android:layout_marginTop="4dp"
app:layout_constraintEnd_toStartOf="@id/history_item_overflow"
@ -66,7 +66,7 @@
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?attr/historyTitleColor"
android:textColor="?primaryText"
android:textSize="18sp"
app:layout_constraintEnd_toStartOf="@id/history_item_overflow"
app:layout_constraintStart_toEndOf="@id/history_favicon"

18
app/src/main/res/layout/layout_quick_action_sheet.xml
Unescape Escape View File

@ -7,7 +7,7 @@
android:id="@+id/quick_action_sheet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/quickActionBackgroundColor"
android:background="?foundation"
android:orientation="vertical">
<ImageButton
@ -31,12 +31,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackgroundBorderless"
android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/quick_action_icon_share"
android:drawablePadding="5dp"
android:text="@string/quick_action_share"
android:textAllCaps="false"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
android:textSize="12sp" />
<Button
@ -44,12 +44,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackgroundBorderless"
android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/library_icon_downloads_circle_background"
android:drawablePadding="5dp"
android:text="@string/quick_action_download"
android:textAllCaps="false"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
android:textSize="12sp" />
<Button
@ -57,12 +57,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackgroundBorderless"
android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/library_icon_bookmarks_circle_background"
android:drawablePadding="5dp"
android:text="@string/quick_action_bookmark"
android:textAllCaps="false"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
android:textSize="12sp" />
<Button
@ -70,12 +70,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackgroundBorderless"
android:background="?selectableItemBackgroundBorderless"
android:drawableTop="@drawable/quick_action_icon_read"
android:drawablePadding="5dp"
android:text="@string/quick_action_read"
android:textAllCaps="false"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/layout_url_background.xml
Unescape Escape View File

@ -11,5 +11,5 @@
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="?attr/browserUrlBarBackground"/>
android:background="@drawable/home_search_background_dark"/>
</FrameLayout>

4
app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
Unescape Escape View File

@ -21,7 +21,7 @@
android:layout_height="24dp"
android:contentDescription="@string/mozac_ui_tabcounter_description"
android:src="@drawable/mozac_ui_tabcounter_box"
android:tint="?attr/browserToolbarIcons" />
android:tint="?primaryText" />
<!-- This text size auto adjusts based on num digits in `TabCounter` -->
<TextView
@ -31,7 +31,7 @@
android:layout_gravity="center"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:textColor="?attr/browserToolbarIcons"
android:textColor="?primaryText"
android:textSize="12sp"
android:textStyle="bold"
tools:text="16" />

4
app/src/main/res/layout/private_browsing_description.xml
Unescape Escape View File

@ -11,7 +11,7 @@
android:orientation="vertical">
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
android:text="@string/private_browsing_title"
android:layout_marginBottom="8dp"
android:layout_width="wrap_content"
@ -24,6 +24,6 @@
android:gravity="center_vertical"
android:scrollHorizontally="false"
android:text="@string/private_browsing_explanation"
android:textColor="@color/off_white"
android:textColor="?primaryText"
android:textSize="14sp" />
</LinearLayout>

28
app/src/main/res/layout/session_bottom_sheet.xml
Unescape Escape View File

@ -15,8 +15,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
app:cardBackgroundColor="?attr/sessionBackgroundColor"
android:background="?attr/sessionBackgroundColor"
app:cardBackgroundColor="?foundation"
android:background="?foundation"
android:elevation="5dp"
android:padding="10dp"
app:cardCornerRadius="10dp">
@ -48,7 +48,7 @@
android:layout_marginBottom="8dp"
android:text="@string/tabs_header_title"
android:textAppearance="@style/HeaderTextStyle"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
app:layout_constraintStart_toEndOf="@id/current_session_image"
app:layout_constraintTop_toTopOf="parent" />
@ -62,7 +62,7 @@
android:fadingEdgeLength="48dp"
android:requiresFadingEdge="vertical"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textColor="?attr/secondaryTextColor"
android:textColor="?secondaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
@ -78,36 +78,36 @@
android:id="@+id/delete_session_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/sessionBackgroundColor"
android:background="?foundation"
android:drawableStart="@drawable/ic_delete"
android:drawablePadding="14dp"
android:drawableTint="?attr/deleteColor"
android:drawableTint="@color/delete_color"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/current_session_delete"
android:textColor="?attr/deleteColor"
android:textColor="@color/delete_color"
android:textSize="16sp"
tools:targetApi="m" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/listDividerColor" />
android:background="?neutral" />
<TextView
android:id="@+id/archive_session_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/sessionBackgroundColor"
android:background="?foundation"
android:drawableStart="@drawable/ic_archive"
android:drawablePadding="14dp"
android:drawableTint="?attr/iconColor"
android:drawableTint="?accent"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/current_session_save"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
android:textSize="16sp"
tools:targetApi="m" />
@ -115,15 +115,15 @@
android:id="@+id/send_and_share_session_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/sessionBackgroundColor"
android:background="?foundation"
android:drawableStart="@drawable/ic_share"
android:drawablePadding="14dp"
android:drawableTint="?attr/iconColor"
android:drawableTint="?primaryText"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/current_session_share"
android:textColor="?attr/toolbarTextColor"
android:textColor="?primaryText"
android:textSize="16sp"
tools:targetApi="m" />
</LinearLayout>

12
app/src/main/res/layout/session_item.xml
Unescape Escape View File

@ -12,7 +12,7 @@
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@color/sessionBackgroundColor_normal_theme"
app:cardBackgroundColor="?foundation"
app:cardCornerRadius="10dp"
app:cardElevation="5dp">
@ -38,7 +38,7 @@
android:layout_marginEnd="12dp"
android:layout_marginBottom="5dp"
android:textAppearance="@style/Header14TextStyle"
android:textColor="?attr/primaryTextColor"
android:textColor="?primaryText"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/session_card_overflow_button"
app:layout_constraintStart_toEndOf="@+id/session_card_thumbnail"
@ -49,7 +49,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textColor="?attr/secondaryTextColor"
android:textColor="?secondaryText"
app:layout_constraintEnd_toEndOf="@id/session_card_timestamp"
app:layout_constraintStart_toStartOf="@id/session_card_timestamp"
app:layout_constraintTop_toBottomOf="@+id/session_card_timestamp" />
@ -59,7 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textColor="?attr/secondaryTextColor"
android:textColor="?secondaryText"
app:layout_constraintStart_toStartOf="@id/session_card_titles"
app:layout_constraintTop_toBottomOf="@+id/session_card_titles" />
@ -77,7 +77,7 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_session_menu"
android:src="@drawable/ic_menu"
android:tint="?attr/toolbarTextColor"
android:tint="?primaryText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -91,5 +91,5 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_session_share"
android:src="@drawable/ic_send"
android:tint="?attr/toolbarTextColor" />
android:tint="?primaryText" />
</androidx.cardview.widget.CardView>

2
app/src/main/res/layout/session_list_empty.xml
Unescape Escape View File

@ -24,7 +24,7 @@
android:layout_marginStart="23dp"
android:ellipsize="none"
android:scrollHorizontally="false"
android:textColor="@color/session_list_empty_fg"
android:textColor="?primaryText"
android:textSize="16sp"
android:text="@string/sessions_intro_description"
app:layout_constraintVertical_bias="0"

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save