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

[fenix] For https://github.com/mozilla-mobile/fenix/issues/23957 - Rename toolbarDivider attribute to borderPrimary

Browse Source
pull/600/head
Gabriel Luong 2 years ago
parent 52a618a580
commit e09bb8c28c
9 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -109,7 +109,7 @@ class BrowserToolbarView(
)
val separatorColor = ContextCompat.getColor(
context,
ThemeManager.resolveAttribute(R.attr.toolbarDivider, context)
ThemeManager.resolveAttribute(R.attr.borderPrimary, context)
)
display.urlFormatter = { url -> URLStringUtils.toDisplayUrl(url) }

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

@ -6,7 +6,7 @@
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="?toolbarDivider" />
android:color="?borderPrimary" />
<corners android:radius="8dp" />

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

@ -8,6 +8,6 @@
android:radius="4dp"/>
<stroke
android:width="1dp"
android:color="?toolbarDivider"/>
android:color="?borderPrimary"/>
<solid android:color="@android:color/transparent"/>
</shape>

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

@ -18,4 +18,4 @@
app:browserToolbarMenuColor="?primaryText"
app:browserToolbarProgressBarGravity="top"
app:browserToolbarSecureColor="?primaryText"
app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider" />
app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?borderPrimary" />

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

@ -19,4 +19,4 @@
app:browserToolbarMenuColor="?primaryText"
app:browserToolbarProgressBarGravity="bottom"
app:browserToolbarSecureColor="?primaryText"
app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider" />
app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?borderPrimary" />

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

@ -26,7 +26,7 @@
app:browserToolbarMenuColor="?primaryText"
app:browserToolbarProgressBarGravity="bottom"
app:browserToolbarSecureColor="?primaryText"
app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider"
app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?borderPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

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

@ -25,7 +25,7 @@
app:browserToolbarMenuColor="?primaryText"
app:browserToolbarProgressBarGravity="bottom"
app:browserToolbarSecureColor="?primaryText"
app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider"
app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?borderPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

3
app/src/main/res/values/attrs.xml
Unescape Escape View File

@ -10,6 +10,8 @@
<attr name="textAccent" format="reference" />
<!-- Active tab -->
<attr name="iconActive" format="reference" />
<!-- Default, Divider, Dotted -->
<attr name="borderPrimary" format="reference" />
<!-- Color palette attributes -->
<attr name="primaryText" format="reference" />
@ -29,7 +31,6 @@
<attr name="disabled" format="reference" />
<attr name="scrimStart" format="reference"/>
<attr name="scrimEnd" format="reference"/>
<attr name="toolbarDivider" format="reference"/>
<attr name="preferenceSectionHeader" format="reference"/>
<!-- Color used in DefaultToolbarMenu for buttons placed at the end of menu items -->

6
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -38,6 +38,8 @@
<item name="textAccent">@color/fx_mobile_text_color_accent</item>
<!-- Active tab -->
<item name="iconActive">@color/fx_mobile_icon_color_active</item>
<!-- Default, Divider, Dotted -->
<item name="borderPrimary">@color/fx_mobile_border_color_primary</item>
<!-- Active thumb color & Active track color (30% transparency) -->
<item name="colorControlActivated">@color/accent_high_contrast_normal_theme</item>
@ -69,7 +71,6 @@
<item name="toolbarStartGradient">@color/fx_mobile_layer_color_1</item>
<item name="toolbarCenterGradient">@color/fx_mobile_layer_color_1</item>
<item name="toolbarEndGradient">@color/fx_mobile_layer_color_1</item>
<item name="toolbarDivider">@color/fx_mobile_border_color_primary</item>
<item name="fillLinkFromClipboard">@color/fill_link_from_clipboard_normal_theme</item>
<item name="syncDisconnected">@color/sync_disconnected_icon_fill_normal_theme</item>
<item name="syncDisconnectedBackground">@color/sync_disconnected_background_normal_theme</item>
@ -217,6 +218,8 @@
<item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
<!-- Active tab -->
<item name="iconActive">@color/fx_mobile_private_icon_color_active</item>
<!-- Default, Divider, Dotted -->
<item name="borderPrimary">@color/fx_mobile_private_border_color_primary</item>
<!-- Inactive thumb color -->
<item name="colorSwitchThumbNormal">@color/toggle_off_knob_dark_theme</item>
@ -246,7 +249,6 @@
<item name="toolbarStartGradient">@color/fx_mobile_private_layer_color_4_start</item>
<item name="toolbarCenterGradient">@color/fx_mobile_private_layer_color_4_center</item>
<item name="toolbarEndGradient">@color/fx_mobile_private_layer_color_4_end</item>
<item name="toolbarDivider">@color/fx_mobile_private_border_color_primary</item>
<item name="fillLinkFromClipboard">@color/accent_high_contrast_private_theme</item>
<item name="syncDisconnected">@color/sync_disconnected_icon_fill_private_theme</item>
<item name="syncDisconnectedBackground">@color/sync_disconnected_background_private_theme</item>

Write Preview
Loading…
Cancel
Save