Skip to content

Commit 95bfd33

Browse files
0nko0nko
authored
Visual update: Replace fire icons (#6011)
Task/Issue URL: https://app.asana.com/1/137249556945/project/1207418217763355/task/1210118271429446?focus=true ### Description This PR replaces all fire icons but only in the internal build flavor. ### Steps to test this PR _Internal build (verify the new icons are used)_ - [ ] Onboarding - [ ] Bottom navigation - [ ] Enabled/disabled protection in the browser menu - [ ] Fire bottom sheet - [ ] Tab manager - [ ] Settings _Play Store build (verify the old icons are used)_ - [ ] Onboarding - [ ] Bottom navigation / toolbar - [ ] Enabled/disabled protection in the browser menu - [ ] Fire bottom sheet - [ ] Tab manager - [ ] Settings ### UI changes | Before | After | | ------ | ----- | ![image](https://github.com/user-attachments/assets/1fe8463e-c932-44e8-98ed-744fba95cf8d)|![image](https://github.com/user-attachments/assets/aa95a2db-7dd6-4f26-aa67-316d529b6fd0)| ![Screenshot_20250506_094323](https://github.com/user-attachments/assets/0fe758ff-a088-428d-9a68-41c7a1972be7)|![Screenshot_20250506_093209](https://github.com/user-attachments/assets/b7f61ea3-2e2f-405e-842b-f17828f38de6)| ![Screenshot_20250506_093243](https://github.com/user-attachments/assets/7502aa7d-4235-44de-8f61-d1bdbffa8283)|![Screenshot_20250506_094339](https://github.com/user-attachments/assets/692b62d9-7fe6-440f-a027-b1c21eee2d1f)| ![Screenshot_20250506_093255](https://github.com/user-attachments/assets/fdea762f-8338-4c2e-8eba-65226afc2e3f)|![Screenshot_20250506_094352](https://github.com/user-attachments/assets/2937146a-b0b6-4b9e-9d92-23bfa697af61)| ![Screenshot_20250506_094303](https://github.com/user-attachments/assets/bf37e4fb-d54a-4222-af83-4fd5ff971481)|![Screenshot_20250506_093219](https://github.com/user-attachments/assets/73566519-9729-4870-8e99-01a459cd6399)| ![image](https://github.com/user-attachments/assets/8e018d1c-179b-494b-b2e3-8e6471a695fe)|![Screenshot_20250506_093332](https://github.com/user-attachments/assets/408615e4-abd2-4dcd-8f42-2121c01fbb16)| ![Screenshot_20250506_094206](https://github.com/user-attachments/assets/6f1ebb92-e4a5-4238-937c-5c82c6a44c10)|![Screenshot_20250506_093308](https://github.com/user-attachments/assets/b4596a5a-d61a-4fdb-bafd-105499b8485c)|
1 parent fd2356a commit 95bfd33

File tree

5 files changed

+119
-0
lines changed

5 files changed

+119
-0
lines changed

‎app/src/internal/res/drawable/ic_fire_16.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="16dp"
3+
android:height="16dp"
4+
android:viewportWidth="16"
5+
android:viewportHeight="16">
6+
<group>
7+
<clip-path
8+
android:pathData="M0,0h16v16H0z"/>
9+
<path
10+
android:fillColor="?attr/daxColorPrimaryIcon"
11+
android:pathData="M9.815,0.01a0.663,0.663 0,0 1,0.768 0.537c0.027,0.15 0.04,0.316 0.19,0.386a0.663,0.663 0,1 1,-0.566 1.2,1.516 1.516,0 0,1 -0.7,-0.643 2.244,2.244 0,0 1,-0.229 -0.712,0.663 0.663,0 0,1 0.537,-0.768Z" />
12+
<path
13+
android:fillColor="?attr/daxColorPrimaryIcon"
14+
android:pathData="M6.576,0.033a0.663,0.663 0,0 1,0.598 0.132c1.304,1.092 1.58,2.641 1.777,3.753 0.121,0.683 0.212,1.15 0.38,1.453 0.126,0.23 0.317,0.337 0.578,0.358 0.406,0.033 0.601,-0.074 0.712,-0.176 0.13,-0.121 0.234,-0.322 0.296,-0.604a3.24,3.24 0,0 0,0.025 -1.181v-0.003a0.663,0.663 0,0 1,1.154 -0.543c1.685,1.944 2.737,4.375 2.882,6.604 0.106,1.637 -0.351,3.21 -1.54,4.367C12.253,15.345 10.434,16 7.99,16c-2.718,0 -4.924,-1.125 -6.093,-2.934 -1.178,-1.823 -1.221,-4.218 0.15,-6.558 0.737,-1.26 1.61,-2.303 2.348,-3.248 0.754,-0.963 1.372,-1.829 1.73,-2.813a0.663,0.663 0,0 1,0.45 -0.414ZM6.293,12.603c0,-0.521 0.23,-0.965 0.669,-1.539 0.264,-0.345 0.63,-0.765 0.994,-1.246 0.362,0.486 0.74,0.905 1.022,1.257 0.468,0.586 0.712,1.023 0.712,1.528 0,0.662 -0.149,1.143 -0.395,1.447 -0.227,0.28 -0.61,0.5 -1.304,0.5 -0.629,0 -1.022,-0.213 -1.27,-0.509 -0.263,-0.313 -0.428,-0.797 -0.428,-1.438Z"
15+
android:fillType="evenOdd"/>
16+
</group>
17+
</vector>

‎app/src/internal/res/drawable/ic_fire_24.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:fillColor="?attr/daxColorPrimaryIcon"
8+
android:pathData="M10.268,2.025a0.752,0.752 0,0 1,0.684 0.157c1.644,1.418 1.933,3.454 2.18,4.87 0.13,0.744 0.212,2.08 1.199,2.163 0.745,0.062 1.148,-0.348 1.297,-1.048 0.119,-0.555 0.066,-1.1 0.022,-1.656a0.75,0.75 0,0 1,1.323 -0.482c2.039,2.423 3.387,5.477 3.526,8.656 0.04,1.9 -0.53,3.702 -1.878,5.052C17.186,21.175 14.973,22 11.983,22c-3.323,0 -6.005,-1.416 -7.42,-3.67 -1.42,-2.265 -1.477,-5.243 0.186,-8.168 0.853,-1.439 1.861,-2.757 2.872,-4.087 0.923,-1.215 1.69,-2.317 2.132,-3.574a0.773,0.773 0,0 1,0.514 -0.476ZM12,14.228c-0.395,0.599 -0.81,1.142 -1.13,1.613 -0.547,0.806 -0.87,1.458 -0.87,2.159 0,0.793 0.236,1.376 0.573,1.752 0.33,0.369 0.806,0.59 1.41,0.59 0.777,0 1.239,-0.24 1.521,-0.575 0.3,-0.355 0.496,-0.93 0.496,-1.767 0,-0.701 -0.322,-1.353 -0.87,-2.16 -0.32,-0.47 -0.734,-1.013 -1.13,-1.612Z"
9+
android:fillType="evenOdd"/>
10+
<path
11+
android:fillColor="?attr/daxColorPrimaryIcon"
12+
android:pathData="M14.435,2a0.751,0.751 0,0 1,0.708 0.548l0.072,0.335c0.046,0.162 0.138,0.245 0.285,0.327 0.482,0.298 0.445,1.033 -0.04,1.295 -0.278,0.15 -0.557,0.084 -0.82,-0.057a1.784,1.784 0,0 1,-0.688 -0.705c-0.16,-0.295 -0.225,-0.616 -0.28,-0.942A0.76,0.76 0,0 1,14.434 2Z" />
13+
</vector>

‎app/src/internal/res/drawable/ic_fire_color_24.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="24dp"
4+
android:height="24dp"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
<path
8+
android:pathData="M5.087,10.514C6.907,7.42 9.37,5.421 10.387,2.631C13.339,5.092 11.504,9.702 14.376,9.936C17.247,10.169 16.609,6.442 16.609,6.442C18.667,8.806 19.93,11.742 20.102,14.382C20.35,18.181 17.968,21.369 11.983,21.369C5.465,21.369 1.847,16.023 5.087,10.514Z">
9+
<aapt:attr name="android:fillColor">
10+
<gradient
11+
android:startX="12.086"
12+
android:startY="6.379"
13+
android:endX="13.978"
14+
android:endY="19.747"
15+
android:type="linear">
16+
<item android:offset="0" android:color="#FFFA8B38"/>
17+
<item android:offset="0.52" android:color="#FFE72A57"/>
18+
<item android:offset="1" android:color="#FFCC165B"/>
19+
</gradient>
20+
</aapt:attr>
21+
</path>
22+
<path
23+
android:pathData="M11.954,12.794C13.099,14.858 15.014,15.97 15.014,17.875C15.014,19.781 14.165,21.21 11.983,21.21C9.936,21.21 8.952,19.781 8.952,17.875C8.952,15.97 10.707,14.858 11.954,12.794Z"
24+
android:fillColor="#FFCC33"/>
25+
<path
26+
android:pathData="M11.965,12.17C12.188,12.174 12.392,12.296 12.5,12.491C12.901,13.214 13.39,13.794 13.889,14.386C14.059,14.588 14.231,14.792 14.4,15.003C15.037,15.796 15.638,16.695 15.638,17.875C15.638,18.908 15.41,19.904 14.801,20.652C14.174,21.422 13.22,21.835 11.983,21.835C10.802,21.835 9.859,21.416 9.222,20.66C8.599,19.92 8.327,18.928 8.327,17.875C8.327,16.711 8.872,15.818 9.49,15.014C9.693,14.749 9.901,14.497 10.108,14.245C10.558,13.698 11.008,13.152 11.419,12.471C11.534,12.28 11.742,12.165 11.965,12.17ZM10.48,15.775C9.909,16.519 9.576,17.135 9.576,17.875C9.576,18.729 9.797,19.404 10.177,19.855C10.544,20.29 11.117,20.586 11.983,20.586C12.927,20.586 13.49,20.284 13.832,19.863C14.193,19.42 14.389,18.748 14.389,17.875C14.389,17.15 14.033,16.541 13.426,15.785C13.292,15.618 13.144,15.442 12.988,15.257C12.654,14.862 12.285,14.425 11.94,13.937C11.627,14.367 11.303,14.761 11.008,15.119C10.816,15.352 10.637,15.571 10.48,15.775Z"
27+
android:fillColor="#FFCC33"
28+
android:fillType="evenOdd"/>
29+
<path
30+
android:pathData="M14.426,2.016C14.765,1.956 15.09,2.182 15.15,2.522C15.19,2.748 15.229,2.879 15.281,2.971C15.321,3.043 15.38,3.112 15.518,3.177C15.83,3.324 15.965,3.695 15.818,4.008C15.672,4.32 15.3,4.455 14.988,4.308C14.618,4.135 14.361,3.886 14.19,3.581C14.031,3.296 13.965,2.99 13.92,2.74C13.86,2.401 14.086,2.076 14.426,2.016ZM10.225,2.028C10.421,1.975 10.631,2.021 10.788,2.151C12.397,3.494 12.738,5.399 12.994,6.828C13.005,6.889 13.015,6.949 13.026,7.008C13.165,7.776 13.284,8.343 13.503,8.74C13.604,8.924 13.717,9.049 13.847,9.135C13.976,9.221 14.156,9.291 14.426,9.313C15,9.36 15.318,9.209 15.513,9.029C15.727,8.831 15.874,8.525 15.959,8.142C16.043,7.763 16.053,7.363 16.04,7.048C16.033,6.892 16.021,6.763 16.01,6.674C16.005,6.63 16,6.596 15.997,6.574C15.997,6.571 15.996,6.567 15.996,6.564C15.995,6.558 15.994,6.554 15.994,6.551L15.993,6.547L15.993,6.547C15.946,6.271 16.088,5.998 16.341,5.878C16.594,5.758 16.896,5.821 17.08,6.032C19.215,8.485 20.543,11.546 20.726,14.341C20.859,16.383 20.285,18.323 18.815,19.748C17.35,21.167 15.081,21.993 11.983,21.993C8.556,21.993 5.803,20.583 4.352,18.347C2.891,16.097 2.825,13.127 4.548,10.198C5.34,8.852 6.253,7.703 7.093,6.646C7.247,6.452 7.399,6.261 7.547,6.073C8.515,4.84 9.329,3.711 9.801,2.417C9.87,2.226 10.029,2.081 10.225,2.028ZM17.212,8.247C17.202,8.302 17.191,8.356 17.179,8.411C17.064,8.93 16.832,9.512 16.359,9.948C15.866,10.401 15.187,10.628 14.325,10.558C13.878,10.522 13.487,10.396 13.155,10.176C12.824,9.956 12.586,9.663 12.409,9.344C12.073,8.734 11.927,7.95 11.797,7.23C11.793,7.207 11.788,7.184 11.784,7.161C11.563,5.933 11.343,4.715 10.593,3.74C10.046,4.86 9.302,5.861 8.529,6.845C8.374,7.043 8.217,7.24 8.06,7.438C7.22,8.495 6.369,9.567 5.625,10.831C4.108,13.41 4.231,15.868 5.399,17.667C6.15,18.824 7.364,19.757 8.946,20.281C8.518,19.597 8.327,18.757 8.327,17.875C8.327,16.71 8.872,15.818 9.49,15.014C9.693,14.748 9.901,14.497 10.108,14.245C10.558,13.698 11.008,13.152 11.419,12.471C11.534,12.28 11.742,12.165 11.965,12.169C12.188,12.174 12.392,12.296 12.5,12.491C12.901,13.214 13.39,13.794 13.888,14.386C14.059,14.588 14.231,14.792 14.4,15.003C15.037,15.795 15.638,16.695 15.638,17.875C15.638,18.798 15.456,19.691 14.983,20.405C16.275,20.076 17.247,19.528 17.945,18.851C19.1,17.732 19.594,16.179 19.479,14.422C19.348,12.425 18.549,10.218 17.212,8.247ZM10.48,15.775C9.909,16.519 9.576,17.135 9.576,17.875C9.576,18.728 9.797,19.403 10.177,19.855C10.544,20.29 11.117,20.585 11.983,20.585C12.927,20.585 13.49,20.283 13.832,19.863C14.193,19.42 14.389,18.748 14.389,17.875C14.389,17.15 14.033,16.541 13.426,15.785C13.292,15.618 13.144,15.442 12.988,15.257C12.654,14.862 12.285,14.424 11.94,13.937C11.627,14.367 11.303,14.76 11.008,15.119C10.816,15.352 10.637,15.571 10.48,15.775Z"
31+
android:fillType="evenOdd">
32+
<aapt:attr name="android:fillColor">
33+
<gradient
34+
android:startX="12"
35+
android:startY="2.631"
36+
android:endX="12"
37+
android:endY="21.369"
38+
android:type="linear">
39+
<item android:offset="0" android:color="#FFFF7611"/>
40+
<item android:offset="1" android:color="#FF970239"/>
41+
</gradient>
42+
</aapt:attr>
43+
</path>
44+
</vector>

‎app/src/internal/res/drawable/ic_fire_red_24.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M10.268,2.025a0.752,0.752 0,0 1,0.684 0.157c1.644,1.418 1.933,3.454 2.18,4.87 0.13,0.744 0.212,2.08 1.199,2.163 0.745,0.062 1.148,-0.348 1.297,-1.048 0.119,-0.555 0.066,-1.1 0.022,-1.656a0.75,0.75 0,0 1,1.323 -0.482c2.039,2.423 3.387,5.477 3.526,8.656 0.04,1.9 -0.53,3.702 -1.878,5.052C17.186,21.175 14.973,22 11.983,22c-3.323,0 -6.005,-1.416 -7.42,-3.67 -1.42,-2.265 -1.477,-5.243 0.186,-8.168 0.853,-1.439 1.861,-2.757 2.872,-4.087 0.923,-1.215 1.69,-2.317 2.132,-3.574a0.773,0.773 0,0 1,0.514 -0.476ZM12,14.228c-0.395,0.599 -0.81,1.142 -1.13,1.613 -0.547,0.806 -0.87,1.458 -0.87,2.159 0,0.793 0.236,1.376 0.573,1.752 0.33,0.369 0.806,0.59 1.41,0.59 0.777,0 1.239,-0.24 1.521,-0.575 0.3,-0.355 0.496,-0.93 0.496,-1.767 0,-0.701 -0.322,-1.353 -0.87,-2.16 -0.32,-0.47 -0.734,-1.013 -1.13,-1.612Z"
8+
android:fillColor="?attr/daxColorDestructive"
9+
android:fillType="evenOdd"/>
10+
<path
11+
android:pathData="M14.435,2a0.751,0.751 0,0 1,0.708 0.548l0.072,0.335c0.046,0.162 0.138,0.245 0.285,0.327 0.482,0.298 0.445,1.033 -0.04,1.295 -0.278,0.15 -0.557,0.084 -0.82,-0.057a1.784,1.784 0,0 1,-0.688 -0.705c-0.16,-0.295 -0.225,-0.616 -0.28,-0.942A0.76,0.76 0,0 1,14.434 2Z"
12+
android:fillColor="?attr/daxColorDestructive" />
13+
</vector>

‎app/src/internal/res/drawable/ic_fireproof_solid_16.xml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!--
2+
~ Copyright (c) 2025 DuckDuckGo
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
17+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
18+
android:width="16dp"
19+
android:height="16dp"
20+
android:viewportWidth="16"
21+
android:viewportHeight="16">
22+
<path
23+
android:pathData="M6.577,0.033a0.663,0.663 0,0 1,0.597 0.132c1.304,1.092 1.58,2.64 1.777,3.752l0.026,0.15c0.11,0.61 0.2,1.022 0.354,1.304 0.068,0.124 0.138,0.2 0.21,0.249a0.752,0.752 0,0 0,0.368 0.109c0.405,0.033 0.601,-0.074 0.712,-0.176 0.13,-0.12 0.234,-0.322 0.296,-0.604a3.25,3.25 0,0 0,0.058 -0.812,4.008 4.008,0 0,0 -0.021,-0.28l-0.01,-0.073 -0.002,-0.017v-0.002l-0.01,-0.11a0.663,0.663 0,0 1,1.164 -0.434,12.578 12.578,0 0,1 1.93,2.998c0.357,0.784 -0.543,1.554 -1.404,1.532a4.75,4.75 0,0 0,-4.316 2.515,13.074 13.074,0 0,1 -0.35,-0.448c-0.203,0.27 -0.409,0.52 -0.596,0.749 -0.147,0.18 -0.282,0.345 -0.398,0.497 -0.44,0.574 -0.67,1.018 -0.67,1.539 0,0.64 0.166,1.126 0.428,1.438 0.249,0.296 0.643,0.51 1.272,0.51 0.076,0 0.149,-0.004 0.218,-0.01 0.072,0.152 0.151,0.298 0.239,0.44 0.254,0.413 0.028,1.018 -0.458,1.018 -2.718,0 -4.924,-1.124 -6.093,-2.933 -1.178,-1.823 -1.22,-4.218 0.15,-6.559 0.623,-1.064 1.343,-1.974 1.997,-2.8 0.12,-0.152 0.237,-0.3 0.351,-0.447 0.754,-0.963 1.372,-1.829 1.73,-2.813a0.664,0.664 0,0 1,0.45 -0.414Z"
24+
android:fillColor="?attr/daxColorPrimaryIcon" />
25+
<path
26+
android:pathData="M9.815,0.01a0.663,0.663 0,0 1,0.769 0.537c0.03,0.174 0.056,0.252 0.082,0.298 0.01,0.018 0.02,0.03 0.03,0.04 0.011,0.01 0.033,0.028 0.076,0.048a0.663,0.663 0,0 1,-0.564 1.2,1.517 1.517,0 0,1 -0.7,-0.643 2.247,2.247 0,0 1,-0.23 -0.712,0.663 0.663,0 0,1 0.537,-0.768Z"
27+
android:fillColor="?attr/daxColorPrimaryIcon" />
28+
<path
29+
android:pathData="M12.5,9a3.5,3.5 0,1 1,0 7,3.5 3.5,0 0,1 0,-7ZM10.375,11.875a0.5,0.5 0,0 0,-0.5 0.5v0.25a0.5,0.5 0,0 0,0.5 0.5h4.25a0.5,0.5 0,0 0,0.5 -0.5v-0.25a0.5,0.5 0,0 0,-0.5 -0.5h-4.25Z"
30+
android:fillColor="?attr/daxColorPrimaryIcon"
31+
android:fillType="evenOdd"/>
32+
</vector>

0 commit comments

Comments
 (0)