blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #724: Consolidates colors

master
Sawyer Blatz 2019-04-12 15:20:49 -07:00 committed by Colin Lee
parent a2666c4f74
commit 29832c5e84
114 changed files with 358 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/ThemeManager.kt
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_camera.xml
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
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_data_collection.xml
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
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_drawer_pull_tab.xml
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
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
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_history.xml
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
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_info.xml
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
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_launcher_background.xml
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
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
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_location.xml
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
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_microphone.xml
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
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_private_browsing.xml
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
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_report_issues.xml
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
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_search.xml
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
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
app/src/main/res/drawable/private_browsing_button_background.xml
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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