Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
fenix
Commits
d3dcf690
Commit
d3dcf690
authored
Jan 11, 2021
by
Jonathan Almeida
Committed by
Jonathan Almeida
Jan 18, 2021
Browse files
A-C 71.0.20210118134928: Fix breaking API in TabCounterToolbarButton
parent
fb64c7c0
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
View file @
d3dcf690
...
...
@@ -171,8 +171,7 @@ class DefaultToolbarIntegration(
interactor
.
onTabCounterClicked
()
},
store
=
store
,
menu
=
tabCounterMenu
,
privateColor
=
ContextCompat
.
getColor
(
context
,
R
.
color
.
primary_text_private_theme
)
menu
=
tabCounterMenu
)
val
tabCount
=
if
(
isPrivate
)
{
...
...
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View file @
d3dcf690
...
...
@@ -1010,7 +1010,6 @@ class HomeFragment : Fragment() {
// https://github.com/mozilla-mobile/fenix/issues/16792
private
fun
updateTabCounter
(
browserState
:
BrowserState
)
{
val
tabCount
=
if
(
browsingModeManager
.
mode
.
isPrivate
)
{
view
?.
tab_button
?.
setColor
(
ContextCompat
.
getColor
(
requireContext
(),
R
.
color
.
primary_text_private_theme
))
browserState
.
privateTabs
.
size
}
else
{
browserState
.
normalTabs
.
size
...
...
app/src/main/res/values/styles.xml
View file @
d3dcf690
...
...
@@ -107,6 +107,8 @@
<item
name=
"bottomBarBackgroundTop"
>
@drawable/home_bottom_bar_background_top
</item>
<item
name=
"privateBrowsingButtonBackground"
>
@android:color/transparent
</item>
<item
name=
"privateBrowsingButtonAccent"
>
@color/primary_text_normal_theme
</item>
<item
name=
"tabCounterTintColor"
>
?primaryText
</item>
</style>
<style
name=
"NormalTheme"
parent=
"NormalThemeBase"
/>
...
...
buildSrc/src/main/java/AndroidComponents.kt
View file @
d3dcf690
...
...
@@ -3,5 +3,5 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
object
AndroidComponents
{
const
val
VERSION
=
"71.0.2021011
7143132
"
const
val
VERSION
=
"71.0.2021011
8134928
"
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment