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

Commit d6412fa

Browse files
keianhzobluemarvin
keianhzo
authored and
bluemarvin
committed
URL Bar styles fixes (#2517)
* Fixes url bar icons private mode style * Keep the url bar outline with children are pressed
1 parent f624a4f commit d6412fa

File tree

10 files changed

+126
-15
lines changed

10 files changed

+126
-15
lines changed

‎app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,10 @@ private void setIsBookmarked(boolean aValue) {
418418
}
419419

420420
public void setPrivateMode(boolean isEnabled) {
421+
mBinding.bookmarkButton.setPrivateMode(isEnabled);
422+
mBinding.microphoneButton.setPrivateMode(isEnabled);
423+
mBinding.clearButton.setPrivateMode(isEnabled);
424+
421425
mBinding.setIsPrivateMode(isEnabled);
422426
}
423427

‎app/src/main/res/drawable/url_background_outline.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,22 @@
3838
</item>
3939
</layer-list>
4040
</item>
41+
<item android:state_pressed="true">
42+
<layer-list>
43+
<item>
44+
<shape android:shape="rectangle">
45+
<corners android:radius="20dp" />
46+
<stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
47+
</shape>
48+
</item>
49+
<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">
50+
<shape android:shape="rectangle">
51+
<corners android:radius="20dp" />
52+
<stroke android:width="2dp" android:color="@color/azure" />
53+
</shape>
54+
</item>
55+
</layer-list>
56+
</item>
4157
<item android:state_hovered="false" android:state_pressed="false">
4258
<shape android:shape="rectangle">
4359
<corners android:radius="20dp" />

‎app/src/main/res/drawable/url_background_private_outline.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,22 @@
3838
</item>
3939
</layer-list>
4040
</item>
41+
<item android:state_pressed="true">
42+
<layer-list>
43+
<item>
44+
<shape android:shape="rectangle">
45+
<corners android:radius="20dp" />
46+
<stroke android:width="@dimen/blur_radius" android:color="@color/azure_blur" />
47+
</shape>
48+
</item>
49+
<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">
50+
<shape android:shape="rectangle">
51+
<corners android:radius="20dp" />
52+
<stroke android:width="2dp" android:color="@color/azure" />
53+
</shape>
54+
</item>
55+
</layer-list>
56+
</item>
4157
<item android:state_hovered="false" android:state_pressed="false">
4258
<shape android:shape="rectangle">
4359
<corners android:radius="20dp" />

‎app/src/main/res/drawable/url_button_end_private.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:state_enabled="false">
4+
<shape android:shape="rectangle">
5+
<corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
6+
<solid android:color="@android:color/transparent"/>
7+
</shape>
8+
</item>
9+
<item android:state_pressed="true">
10+
<shape android:shape="rectangle">
11+
<corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
12+
<solid android:color="@color/blackberry"/>
13+
<stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
14+
</shape>
15+
</item>
16+
<item android:state_hovered="true" android:state_pressed="false">
17+
<shape android:shape="rectangle">
18+
<corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
19+
<solid android:color="@color/fog"/>
20+
<stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
21+
</shape>
22+
</item>
23+
<item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
24+
</item>
25+
</selector>

‎app/src/main/res/drawable/url_button_icon_color.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎app/src/main/res/drawable/url_button_private.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:state_enabled="false">
4+
<shape android:shape="rectangle">
5+
<solid android:color="@android:color/transparent" />
6+
</shape>
7+
</item>
8+
<item android:state_pressed="true">
9+
<shape android:shape="rectangle">
10+
<solid android:color="@color/blackberry"/>
11+
<stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
12+
</shape>
13+
</item>
14+
<item android:state_hovered="true" android:state_pressed="false">
15+
<shape android:shape="rectangle">
16+
<solid android:color="@color/fog"/>
17+
<stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
18+
</shape>
19+
</item>
20+
<item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
21+
</item>
22+
</selector>

‎app/src/main/res/drawable/url_button_start_private.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:state_enabled="false">
4+
<shape android:shape="rectangle">
5+
<corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
6+
<solid android:color="@android:color/transparent"/>
7+
</shape>
8+
</item>
9+
<item android:state_pressed="true">
10+
<shape android:shape="rectangle">
11+
<corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
12+
<solid android:color="@color/blackberry"/>
13+
<stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
14+
</shape>
15+
</item>
16+
<item android:state_hovered="true" android:state_pressed="false">
17+
<shape android:shape="rectangle">
18+
<corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
19+
<solid android:color="@color/fog"/>
20+
<stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
21+
</shape>
22+
</item>
23+
<item android:state_hovered="false" android:state_pressed="false" android:drawable="@android:color/transparent" >
24+
</item>
25+
</selector>

‎app/src/main/res/layout/keyboard.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:layout_height="@dimen/keyboard_key_width"
2222
android:layout_marginStart="0dp"
2323
android:layout_marginEnd="@dimen/keyboard_layout_padding"
24-
app:tintColorList="@drawable/url_button_icon_color"
24+
app:tintColorList="@drawable/main_button_icon_color"
2525
android:padding="10dp"
2626
android:src="@drawable/ic_icon_exit"
2727
android:scaleType="fitCenter"
@@ -33,7 +33,7 @@
3333
android:layout_marginStart="0dp"
3434
android:layout_marginEnd="@dimen/keyboard_layout_padding"
3535
android:layout_marginTop="4dp"
36-
app:tintColorList="@drawable/url_button_icon_color"
36+
app:tintColorList="@drawable/main_button_icon_color"
3737
android:padding="10dp"
3838
android:src="@drawable/ic_icon_move"
3939
android:scaleType="fitCenter"

‎app/src/main/res/layout/navigation_url.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
android:id="@+id/microphoneButton"
8585
style="@style/urlBarIconTheme"
8686
android:layout_width="@{(isLibraryVisible || isSpecialUrl) ? @dimen/url_bar_last_item_width : @dimen/url_bar_item_width}"
87-
android:background="@{(isLibraryVisible || isSpecialUrl) ? @drawable/url_button_end : @drawable/url_button}"
87+
android:background="@{(isLibraryVisible || isSpecialUrl) ? (isPrivateMode ? @drawable/url_button_end_private : @drawable/url_button_end) : (isPrivateMode ? @drawable/url_button_private : @drawable/url_button)}"
8888
android:src="@drawable/ic_icon_microphone"
8989
android:tint="@color/fog"
9090
android:tooltipText="@string/voice_search_tooltip"

‎app/src/main/res/values/styles.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,29 +174,41 @@
174174

175175
<style name="urlBarIconTheme">
176176
<item name="android:background">@drawable/url_button</item>
177-
<item name="tintColorList">@drawable/url_button_icon_color</item>
178177
<item name="android:layout_width">@dimen/url_bar_item_width</item>
179178
<item name="android:layout_height">match_parent</item>
180179
<item name="android:scaleType">centerInside</item>
181180
<item name="android:gravity">center</item>
181+
<item name="privateModeBackground">@drawable/url_button_private</item>
182+
<item name="tintColorList">@drawable/main_button_icon_color</item>
183+
<item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
184+
<item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
185+
<item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
182186
</style>
183187

184188
<style name="urlBarIconThemeStart">
185189
<item name="android:background">@drawable/url_button_start</item>
186-
<item name="tintColorList">@drawable/url_button_icon_color</item>
187190
<item name="android:layout_width">@dimen/url_bar_first_item_width</item>
188191
<item name="android:layout_height">match_parent</item>
189192
<item name="android:scaleType">centerInside</item>
190193
<item name="android:gravity">center</item>
194+
<item name="privateModeBackground">@drawable/url_button_start_private</item>
195+
<item name="tintColorList">@drawable/main_button_icon_color</item>
196+
<item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
197+
<item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
198+
<item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
191199
</style>
192200

193201
<style name="urlBarIconThemeEnd">
194202
<item name="android:background">@drawable/url_button_end</item>
195-
<item name="tintColorList">@drawable/url_button_icon_color</item>
196203
<item name="android:layout_width">@dimen/url_bar_last_item_width</item>
197204
<item name="android:layout_height">match_parent</item>
198205
<item name="android:scaleType">centerInside</item>
199206
<item name="android:gravity">center</item>
207+
<item name="privateModeBackground">@drawable/url_button_end_private</item>
208+
<item name="tintColorList">@drawable/main_button_icon_color</item>
209+
<item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
210+
<item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
211+
<item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
200212
</style>
201213

202214
<style name="scrollbar">

0 commit comments

Comments
 (0)