Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

URL Bar styles fixes #2517

Merged
merged 2 commits into from
Dec 20, 2019
Merged

URL Bar styles fixes #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edc0b2e
Fixes url bar icons private mode style
keianhzo Dec 20, 2019
cca4f9e
Keep the url bar outline with children are pressed
keianhzo Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,10 @@ private void setIsBookmarked(boolean aValue) {
}

public void setPrivateMode(boolean isEnabled) {
mBinding.bookmarkButton.setPrivateMode(isEnabled);
mBinding.microphoneButton.setPrivateMode(isEnabled);
mBinding.clearButton.setPrivateMode(isEnabled);

mBinding.setIsPrivateMode(isEnabled);
}

Expand Down
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/url_background_outline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,22 @@
</item>
</layer-list>
</item>
<item android:state_pressed="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
</shape>
</item>
<item android:start="@dimen/blur_radius_half" android:end="@dimen/blur_radius_half" android:top="@dimen/blur_radius_half" android:bottom="@dimen/blur_radius_half">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<stroke android:width="2dp" android:color="@color/azure" />
</shape>
</item>
</layer-list>
</item>
<item android:state_hovered="false" android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/url_background_private_outline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,22 @@
</item>
</layer-list>
</item>
<item android:state_pressed="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
</shape>
</item>
<item android:start="@dimen/blur_radius_half" android:end="@dimen/blur_radius_half" android:top="@dimen/blur_radius_half" android:bottom="@dimen/blur_radius_half">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<stroke android:width="2dp" android:color="@color/azure" />
</shape>
</item>
</layer-list>
</item>
<item android:state_hovered="false" android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
Expand Down
25 changes: 25 additions & 0 deletions app/src/main/res/drawable/url_button_end_private.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
<solid android:color="@android:color/transparent"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
<solid android:color="@color/blackberry"/>
<stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
</shape>
</item>
<item android:state_hovered="true" android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
<solid android:color="@color/fog"/>
<stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
</shape>
</item>
<item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
</item>
</selector>
9 changes: 0 additions & 9 deletions app/src/main/res/drawable/url_button_icon_color.xml
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions app/src/main/res/drawable/url_button_private.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@android:color/transparent" />
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/blackberry"/>
<stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
</shape>
</item>
<item android:state_hovered="true" android:state_pressed="false">
<shape android:shape="rectangle">
<solid android:color="@color/fog"/>
<stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
</shape>
</item>
<item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
</item>
</selector>
25 changes: 25 additions & 0 deletions app/src/main/res/drawable/url_button_start_private.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
<solid android:color="@android:color/transparent"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
<solid android:color="@color/blackberry"/>
<stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
</shape>
</item>
<item android:state_hovered="true" android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
<solid android:color="@color/fog"/>
<stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
</shape>
</item>
<item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
</item>
</selector>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/keyboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:layout_height="@dimen/keyboard_key_width"
android:layout_marginStart="0dp"
android:layout_marginEnd="@dimen/keyboard_layout_padding"
app:tintColorList="@drawable/url_button_icon_color"
app:tintColorList="@drawable/main_button_icon_color"
android:padding="10dp"
android:src="@drawable/ic_icon_exit"
android:scaleType="fitCenter"
Expand All @@ -33,7 +33,7 @@
android:layout_marginStart="0dp"
android:layout_marginEnd="@dimen/keyboard_layout_padding"
android:layout_marginTop="4dp"
app:tintColorList="@drawable/url_button_icon_color"
app:tintColorList="@drawable/main_button_icon_color"
android:padding="10dp"
android:src="@drawable/ic_icon_move"
android:scaleType="fitCenter"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/navigation_url.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
android:id="@+id/microphoneButton"
style="@style/urlBarIconTheme"
android:layout_width="@{(isLibraryVisible || isSpecialUrl) ? @dimen/url_bar_last_item_width : @dimen/url_bar_item_width}"
android:background="@{(isLibraryVisible || isSpecialUrl) ? @drawable/url_button_end : @drawable/url_button}"
android:background="@{(isLibraryVisible || isSpecialUrl) ? (isPrivateMode ? @drawable/url_button_end_private : @drawable/url_button_end) : (isPrivateMode ? @drawable/url_button_private : @drawable/url_button)}"
android:src="@drawable/ic_icon_microphone"
android:tint="@color/fog"
android:tooltipText="@string/voice_search_tooltip"
Expand Down
18 changes: 15 additions & 3 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,29 +174,41 @@

<style name="urlBarIconTheme">
<item name="android:background">@drawable/url_button</item>
<item name="tintColorList">@drawable/url_button_icon_color</item>
<item name="android:layout_width">@dimen/url_bar_item_width</item>
<item name="android:layout_height">match_parent</item>
<item name="android:scaleType">centerInside</item>
<item name="android:gravity">center</item>
<item name="privateModeBackground">@drawable/url_button_private</item>
<item name="tintColorList">@drawable/main_button_icon_color</item>
<item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
<item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
<item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
</style>

<style name="urlBarIconThemeStart">
<item name="android:background">@drawable/url_button_start</item>
<item name="tintColorList">@drawable/url_button_icon_color</item>
<item name="android:layout_width">@dimen/url_bar_first_item_width</item>
<item name="android:layout_height">match_parent</item>
<item name="android:scaleType">centerInside</item>
<item name="android:gravity">center</item>
<item name="privateModeBackground">@drawable/url_button_start_private</item>
<item name="tintColorList">@drawable/main_button_icon_color</item>
<item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
<item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
<item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
</style>

<style name="urlBarIconThemeEnd">
<item name="android:background">@drawable/url_button_end</item>
<item name="tintColorList">@drawable/url_button_icon_color</item>
<item name="android:layout_width">@dimen/url_bar_last_item_width</item>
<item name="android:layout_height">match_parent</item>
<item name="android:scaleType">centerInside</item>
<item name="android:gravity">center</item>
<item name="privateModeBackground">@drawable/url_button_end_private</item>
<item name="tintColorList">@drawable/main_button_icon_color</item>
<item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
<item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
<item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
</style>

<style name="scrollbar">
Expand Down