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

Fixes #3335 Invert popup icons and fix tooltip texts #3341

Merged
merged 1 commit into from
May 6, 2020
Merged

Fixes #3335 Invert popup icons and fix tooltip texts #3341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ public void showPopUpsBlockedNotification() {
showNotification(POPUP_NOTIFICATION_ID,
mBinding.navigationBarNavigation.urlBar.getPopUpButton(),
NotificationManager.Notification.TOP,
R.string.popup_tooltip);
R.string.popup_blocked_tooltip);
}
}, POP_UP_NOTIFICATION_DELAY);
}
Expand Down
14 changes: 10 additions & 4 deletions app/src/main/res/drawable/ic_icon_popup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="200dp"
android:height="200dp"
android:viewportWidth="200"
android:viewportHeight="200">
<path
android:fillColor="@color/white"
android:pathData="M137.77,95.51A38.27,38.27 0,1 0,176 133.78,38.27 38.27,0 0,0 137.77,95.51ZM121,110.43a28.61,28.61 0,0 1,33.33 0l-39.93,39.92A28.62,28.62 0,0 1,121 110.43ZM154.49,157.13a28.59,28.59 0,0 1,-33.32 0l39.92,-39.92A28.62,28.62 0,0 1,154.51 157.13Z"/>
android:pathData="M143.74,94.49A38.27,38.27 0,1 0,182 132.8v0A38.27,38.27 0,0 0,143.74 94.49ZM127,109.41a28.61,28.61 0,0 1,33.33 0l-39.93,39.92A28.62,28.62 0,0 1,127 109.41ZM160.51,156.11h0a28.59,28.59 0,0 1,-33.32 0l39.92,-39.92A28.62,28.62 0,0 1,160.48 156.11Z"/>
<path
android:fillColor="@color/white"
android:pathData="M147.33,28.54L51.66,28.54A28.7,28.7 0,0 0,23 57.24v76.54a28.7,28.7 0,0 0,28.7 28.7L80.37,162.48a9.57,9.57 0,0 0,0 -19.13L51.66,143.35a9.57,9.57 0,0 1,-9.56 -9.57L42.1,76.38L156.9,76.38a9.57,9.57 0,1 0,19.14 0L176.04,57.24A28.71,28.71 0,0 0,147.33 28.54ZM156.9,66.81L42.1,66.81L42.1,57.24a9.56,9.56 0,0 1,9.56 -9.56h95.67a9.56,9.56 0,0 1,9.57 9.56Z"/>
android:pathData="M86.34,142.33H67.59l-18,18a29,29 0,0 0,8.06 1.15H86.34a9.57,9.57 0,0 0,0 -19.13Z"/>
<path
android:fillColor="@color/white"
android:pathData="M173.79,36.13 L160.26,49.67a9.52,9.52 0,0 1,2.61 6.54h0v9.57H144.13l-9.57,9.57h28.31a9.57,9.57 0,1 0,19.14 0V56.22A28.61,28.61 0,0 0,173.79 36.13Z"/>
<path
android:fillColor="@color/white"
android:pathData="M165.1,16a7,7 0,0 0,-9.9 0L143.63,27.52h-86A28.7,28.7 0,0 0,29 56.22v76.54a28.57,28.57 0,0 0,1.2 8.22L20,151.11a7,7 0,1 0,9.9 9.89L165.1,25.85A7,7 0,0 0,165.1 16ZM48.1,123.13L48.1,75.36L95.79,75.36ZM105.39,65.84L48.07,65.84L48.07,56.22a9.56,9.56 0,0 1,9.56 -9.56h66.86Z"/>
</vector>
14 changes: 4 additions & 10 deletions app/src/main/res/drawable/ic_icon_popup_blocked.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="200dp"
android:height="200dp"
android:width="24dp"
android:height="24dp"
android:viewportWidth="200"
android:viewportHeight="200">
<path
android:fillColor="@color/white"
android:pathData="M143.74,94.49A38.27,38.27 0,1 0,182 132.8v0A38.27,38.27 0,0 0,143.74 94.49ZM127,109.41a28.61,28.61 0,0 1,33.33 0l-39.93,39.92A28.62,28.62 0,0 1,127 109.41ZM160.51,156.11h0a28.59,28.59 0,0 1,-33.32 0l39.92,-39.92A28.62,28.62 0,0 1,160.48 156.11Z"/>
android:pathData="M137.77,95.51A38.27,38.27 0,1 0,176 133.78,38.27 38.27,0 0,0 137.77,95.51ZM121,110.43a28.61,28.61 0,0 1,33.33 0l-39.93,39.92A28.62,28.62 0,0 1,121 110.43ZM154.49,157.13a28.59,28.59 0,0 1,-33.32 0l39.92,-39.92A28.62,28.62 0,0 1,154.51 157.13Z"/>
<path
android:fillColor="@color/white"
android:pathData="M86.34,142.33H67.59l-18,18a29,29 0,0 0,8.06 1.15H86.34a9.57,9.57 0,0 0,0 -19.13Z"/>
<path
android:fillColor="@color/white"
android:pathData="M173.79,36.13 L160.26,49.67a9.52,9.52 0,0 1,2.61 6.54h0v9.57H144.13l-9.57,9.57h28.31a9.57,9.57 0,1 0,19.14 0V56.22A28.61,28.61 0,0 0,173.79 36.13Z"/>
<path
android:fillColor="@color/white"
android:pathData="M165.1,16a7,7 0,0 0,-9.9 0L143.63,27.52h-86A28.7,28.7 0,0 0,29 56.22v76.54a28.57,28.57 0,0 0,1.2 8.22L20,151.11a7,7 0,1 0,9.9 9.89L165.1,25.85A7,7 0,0 0,165.1 16ZM48.1,123.13L48.1,75.36L95.79,75.36ZM105.39,65.84L48.07,65.84L48.07,56.22a9.56,9.56 0,0 1,9.56 -9.56h66.86Z"/>
android:pathData="M147.33,28.54L51.66,28.54A28.7,28.7 0,0 0,23 57.24v76.54a28.7,28.7 0,0 0,28.7 28.7L80.37,162.48a9.57,9.57 0,0 0,0 -19.13L51.66,143.35a9.57,9.57 0,0 1,-9.56 -9.57L42.1,76.38L156.9,76.38a9.57,9.57 0,1 0,19.14 0L176.04,57.24A28.71,28.71 0,0 0,147.33 28.54ZM156.9,66.81L42.1,66.81L42.1,57.24a9.56,9.56 0,0 1,9.56 -9.56h95.67a9.56,9.56 0,0 1,9.57 9.56Z"/>
</vector>
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 @@ -111,7 +111,7 @@
android:src="@{viewmodel.isPopUpBlocked ? @drawable/ic_icon_popup_blocked : @drawable/ic_icon_popup}"
tools:src="@drawable/ic_icon_popup_blocked"
android:tint="@color/fog"
android:tooltipText="@string/popup_tooltip"
android:tooltipText="@{viewmodel.isPopUpBlocked ? @string/popup_blocked_tooltip : @string/popup_tooltip_v1}"
app:privateMode="@{viewmodel.isPrivateSession}" />
</LinearLayout>

Expand Down
10 changes: 8 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,8 +1172,14 @@
<string name="clear_tooltip">Clear</string>

<!-- This string is for the tooltip that appears upon hovering the 'Pop-Up' button in the
browser's navigation bar. The button it labels, when pressed, Shows the pop-up blocked dialog. -->
<string name="popup_tooltip">Pop-Up Blocked</string>
browser's navigation bar if popups are not blocked for the site.
The button it labels, when pressed, Shows the pop-up dialog. -->
<string name="popup_tooltip_v1">Pop-Ups Not Blocked</string>

<!-- This string is for the tooltip that appears upon hovering the 'Pop-Up' button in the
browser's navigation bar if popups are blocked for the site.
The button it labels, when pressed, Shows the pop-up dialog. -->
<string name="popup_blocked_tooltip">Pop-Ups Blocked</string>

<!-- This string is for the tooltip that appears upon hovering the 'DRM' button in the
browser's navigation bar when DRM is allowed for the site. The button it labels, when pressed,
Expand Down