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

Awesome bar icons update #1449

Merged
MortimerGoro merged 1 commit into from
Jul 24, 2019
Merged

Awesome bar icons update #1449

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
4 changes: 2 additions & 2 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 @@ -238,9 +238,9 @@ private void handleBookmarkClick() {

private void setBookmarked(boolean aValue) {
if (aValue) {
mBookmarkButton.setImageDrawable(getContext().getDrawable(R.drawable.ic_icon_bookmark_active));
mBookmarkButton.setImageDrawable(getContext().getDrawable(R.drawable.ic_icon_bookmarked_active));
} else {
mBookmarkButton.setImageDrawable(getContext().getDrawable(R.drawable.ic_icon_bookmark));
mBookmarkButton.setImageDrawable(getContext().getDrawable(R.drawable.ic_icon_bookmarked));
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/SuggestionsWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
if (selectedItem.type == SuggestionItem.Type.SUGGESTION)
itemViewHolder.favicon.setImageResource(R.drawable.ic_icon_search);
else if (selectedItem.type == SuggestionItem.Type.COMPLETION)
itemViewHolder.favicon.setImageResource(R.drawable.ic_icon_browser);
itemViewHolder.favicon.setImageResource(R.drawable.ic_icon_globe);
else if (selectedItem.type == SuggestionItem.Type.HISTORY)
itemViewHolder.favicon.setImageResource(R.drawable.ic_icon_history);
else if (selectedItem.type == SuggestionItem.Type.BOOKMARK)
itemViewHolder.favicon.setImageResource(R.drawable.ic_icon_bookmark_active);
itemViewHolder.favicon.setImageResource(R.drawable.ic_icon_bookmark);

itemViewHolder.delete.setVisibility(GONE);
itemViewHolder.favicon.setVisibility(VISIBLE);
Expand Down
11 changes: 8 additions & 3 deletions app/src/main/res/drawable/ic_icon_bookmark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<vector android:height="24dp" android:viewportHeight="200"
android:viewportWidth="200" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/fog" android:pathData="M189.12,79.29a7.37,7.37 0,0 0,-5.94 -5l-52.91,-7.68L106.61,18.64a7.36,7.36 0,0 0,-13.21 0l-23.67,48L16.82,74.27a7.37,7.37 0,0 0,-4.08 12.57L51,124.16l-9,52.69a7.38,7.38 0,0 0,10.69 7.77L100,159.74l47.32,24.88A7.37,7.37 0,0 0,158 176.85l-9,-52.69 38.29,-37.32A7.36,7.36 0,0 0,189.12 79.29ZM135.92,116.29a7.35,7.35 0,0 0,-2.12 6.52l7.17,41.8L103.43,144.9a7.34,7.34 0,0 0,-6.85 0L59,164.63l7.17,-41.8a7.35,7.35 0,0 0,-2.12 -6.52L33.71,86.71l42,-6.1a7.38,7.38 0,0 0,5.55 -4l18.77,-38 18.77,38a7.38,7.38 0,0 0,5.55 4l42,6.1Z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="200"
android:viewportHeight="200">
<path
android:fillColor="@color/white"
android:pathData="M183.42,80.61a6.91,6.91 0,0 0,-5.56 -4.69l-49.53,-7.19L106.18,23.84a6.89,6.89 0,0 0,-12.36 0L71.67,68.73 22.14,75.92a6.9,6.9 0,0 0,-3.82 11.76l35.84,34.93L45.7,171.94a6.89,6.89 0,0 0,10 7.27L100,155.92l44.3,23.29a6.9,6.9 0,0 0,10 -7.27l-8.46,-49.33 35.84,-34.93A6.87,6.87 0,0 0,183.42 80.61Z" />
</vector>
4 changes: 4 additions & 0 deletions app/src/main/res/drawable/ic_icon_bookmarked.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="200"
android:viewportWidth="200" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/fog" android:pathData="M189.12,79.29a7.37,7.37 0,0 0,-5.94 -5l-52.91,-7.68L106.61,18.64a7.36,7.36 0,0 0,-13.21 0l-23.67,48L16.82,74.27a7.37,7.37 0,0 0,-4.08 12.57L51,124.16l-9,52.69a7.38,7.38 0,0 0,10.69 7.77L100,159.74l47.32,24.88A7.37,7.37 0,0 0,158 176.85l-9,-52.69 38.29,-37.32A7.36,7.36 0,0 0,189.12 79.29ZM135.92,116.29a7.35,7.35 0,0 0,-2.12 6.52l7.17,41.8L103.43,144.9a7.34,7.34 0,0 0,-6.85 0L59,164.63l7.17,-41.8a7.35,7.35 0,0 0,-2.12 -6.52L33.71,86.71l42,-6.1a7.38,7.38 0,0 0,5.55 -4l18.77,-38 18.77,38a7.38,7.38 0,0 0,5.55 4l42,6.1Z"/>
</vector>
0 .../res/drawable/ic_icon_bookmark_active.xml → ...es/drawable/ic_icon_bookmarked_active.xml
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_icon_globe.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="200"
android:viewportHeight="200">
<path
android:fillColor="@color/white"
android:pathData="M184.56,100A84.56,84.56 0,0 0,100 15.44h0a84.56,84.56 0,0 0,0 169.12h0A84.56,84.56 0,0 0,184.56 100ZM29.67,106.94h22a138.6,138.6 0,0 0,3.44 25.13L37.05,132.07A70,70 0,0 1,29.67 106.94ZM170.33,93.06L148.28,93.06a138.6,138.6 0,0 0,-3.44 -25.13L163,67.93A70.19,70.19 0,0 1,170.33 93.06ZM134.33,93.06L106.94,93.06L106.94,67.93L130.5,67.93A123.35,123.35 0,0 1,134.37 93.06ZM106.94,54L106.94,31c5.41,2.62 10.74,8.16 15.27,16.07A74.59,74.59 0,0 1,125.67 54ZM93.06,31L93.06,54L74.33,54a74.59,74.59 0,0 1,3.46 -6.93C82.32,39.2 87.65,33.66 93.06,31ZM93.06,67.89L93.06,93.06L65.63,93.06A123.35,123.35 0,0 1,69.5 67.93ZM51.72,93.06h-22a70,70 0,0 1,7.38 -25.13L55.16,67.93A138.6,138.6 0,0 0,51.72 93.06ZM65.63,106.94L93.06,106.94v25.13L69.5,132.07A123.35,123.35 0,0 1,65.63 106.94ZM93.06,145.94v23c-5.41,-2.62 -10.74,-8.16 -15.27,-16.07A74.59,74.59 0,0 1,74.33 146ZM106.94,168.94L106.94,146h18.73a74.59,74.59 0,0 1,-3.46 6.93C117.68,160.8 112.35,166.34 106.94,169ZM106.94,132.05L106.94,106.94h27.43a123.35,123.35 0,0 1,-3.87 25.13ZM148.28,106.92h22.05A70.19,70.19 0,0 1,163 132.07L144.84,132.07A138.6,138.6 0,0 0,148.28 106.94ZM153.62,54h-13a89.65,89.65 0,0 0,-8.19 -16.78A71,71 0,0 1,153.62 54ZM67.52,37.26A89.65,89.65 0,0 0,59.33 54L46.38,54A71,71 0,0 1,67.52 37.26ZM46.38,146L59.33,146a89.65,89.65 0,0 0,8.19 16.78A71,71 0,0 1,46.38 146ZM132.48,162.78A89.65,89.65 0,0 0,140.67 146h13A71,71 0,0 1,132.48 162.74Z" />
</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 @@ -72,7 +72,7 @@
<org.mozilla.vrbrowser.ui.views.UIButton
android:id="@+id/bookmarkButton"
style="@style/urlBarIconThemeEnd"
android:src="@drawable/ic_icon_bookmark"
android:src="@drawable/ic_icon_bookmarked"
android:tooltipText="@string/bookmark_tooltip"
android:tint="@color/fog" />
</LinearLayout>
Expand Down