-
-
Notifications
You must be signed in to change notification settings - Fork 446
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
style: Add new open pet food facts, open beauty facts, open product i…
…con (#4910) #### Description <!--Give a small description related to the changes you have made.--> Added new open pet food facts, open beauty facts, open product icon. #### Related issues <!-- - Add the issue number here. - If you haven't solved the issue completely use "Linked issue #{issue_number}. - If you have solved the issue completely use "Fixes #{issue_number}, example: "Fixes #123, #345". --> Linked Issue #4848 #### Related PRs <!-- Link to all the related PRs openfoodfacts-androidapp, openfoodfacts-server, openfoodfacts-ios, etc. --> #4908
- Loading branch information
Showing
68 changed files
with
472 additions
and
1,427 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
255 changes: 61 additions & 194 deletions
255
app/src/obf/res/drawable-night/ic_openfacts_logo_no_tagline.xml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,18 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="108dp" | ||
android:height="108dp" | ||
android:viewportWidth="108" | ||
android:viewportHeight="108"> | ||
<group | ||
android:scaleX="1.4210526" | ||
android:scaleY="1.4210526" | ||
android:translateX="13.5" | ||
android:translateY="13.5"> | ||
<group> | ||
<clip-path android:pathData="M0,0h57v57h-57z" /> | ||
<path | ||
android:fillColor="#ffffff" | ||
android:fillType="evenOdd" | ||
android:pathData="M47,0H10C4.8147,0 0.5511,3.9467 0.0494,9H0V10V47C0,52.5228 4.4771,57 10,57H47H48V56.9506C53.0533,56.4489 57,52.1853 57,47V10V9H56.9506C56.4816,4.2756 52.7244,0.5184 48,0.0494V0H47Z" /> | ||
<path | ||
android:fillColor="#FECB2F" | ||
android:fillType="evenOdd" | ||
android:pathData="M25.8693,19.0938H19.0682C17.995,19.0938 17.125,19.9444 17.125,20.9937V42.8438H27.8125V20.9937C27.8125,19.9444 26.9425,19.0938 25.8693,19.0938Z" /> | ||
<path | ||
android:fillColor="#21D225" | ||
android:fillType="evenOdd" | ||
android:pathData="M37.2649,15.3481H36.8355C36.8355,15.3481 36.8355,14.9098 35.9767,14.9098V16.3247C36.9774,16.5654 37.6943,17.2149 37.6943,17.9784C37.6943,17.9884 37.6942,17.9984 37.694,18.0083C38.4308,18.0717 39,18.4915 39,19V21.7639C40.2275,22.3132 41,23.1115 41,24V43H29V24C29,23.1115 29.7725,22.3132 31,21.7639V19C31,18.4477 31.6716,18 32.5,18C32.5139,18 32.5279,18.0001 32.5417,18.0004L32.5415,17.9784C32.5415,17.2149 33.2584,16.5654 34.2591,16.3247V14.812C33.5917,14.7808 32.8483,14.7821 32.1121,14.9098C31.4305,15.0279 30.3945,15.3481 30.3945,15.3481C30.3945,15.3481 30.3945,14.4714 30.8239,14.2522C31.2533,14.033 32.9709,13.5946 32.9709,13.5946C32.9709,13.5946 35.1179,13.1562 35.9767,13.1562H37.2649C37.2726,13.164 37.2806,13.1721 37.2889,13.1805C37.4377,13.3301 37.6943,13.5881 37.6943,14.2522C37.6943,14.9536 37.4081,15.3481 37.2649,15.3481Z" /> | ||
<path | ||
android:fillColor="#136BFB" | ||
android:fillType="evenOdd" | ||
android:pathData="M48,15.3482V42.8438H47.1412V15.3482C47.1412,15.106 47.3334,14.9098 47.5706,14.9098C47.8077,14.9098 48,15.106 48,15.3482ZM45.4236,15.3482H46.9265V15.5674H45.4236V15.3482ZM45.4236,15.7865H46.9265V16.0057H45.4236V15.7865ZM46.9265,16.2249H45.4236V16.4441H46.9265V16.2249ZM45.4236,16.6633H46.9265V16.8825H45.4236V16.6633ZM46.9265,17.1017H45.4236V17.3209H46.9265V17.1017ZM45.4236,17.54H46.9265V17.7592H45.4236V17.54ZM46.9265,17.9784H45.4236V18.1976H46.9265V17.9784Z" /> | ||
<path | ||
android:fillColor="#23CDFD" | ||
android:fillType="evenOdd" | ||
android:pathData="M44.9922,42.7625L46.079,22.7066H42.237L43.3238,42.7625H44.9922Z" /> | ||
<path | ||
android:fillColor="#FC0D1B" | ||
android:fillType="evenOdd" | ||
android:pathData="M11.5008,25.4622V21.0784C11.6439,20.3478 12.102,18.8865 12.789,18.8865C13.476,18.8865 15.0791,20.64 15.7948,21.5168V25.4622H16.2242V26.3389V28.9443V42.7938H10L10.2126,26.3389H10.642V25.4622H11.5008ZM14.0772,21.4213V25.8849H14.5066V21.8303C14.3639,21.6882 14.2196,21.5502 14.0772,21.4213Z" /> | ||
<path | ||
android:fillColor="#515151" | ||
android:pathData="M33.9359,30.9988L33.7894,30.852H33.582H32.7155C34.0397,29.1345 34.825,26.9849 34.825,24.662C34.825,19.0499 30.2751,14.5 24.663,14.5C19.0499,14.5 14.5,19.0498 14.5,24.662C14.5,30.2751 19.0499,34.825 24.663,34.825C26.9847,34.825 29.1339,34.0399 30.852,32.7161V33.582V33.7894L30.9988,33.9359L38.4318,41.3539L38.7854,41.7068L39.1386,41.3536L41.3536,39.1386L41.7067,38.7854L41.3539,38.4318L33.9359,30.9988ZM24.663,30.852C21.2371,30.852 18.473,28.0879 18.473,24.662C18.473,21.2372 21.2371,18.473 24.663,18.473C28.0879,18.473 30.852,21.2371 30.852,24.662C30.852,28.0879 28.0878,30.852 24.663,30.852Z" | ||
android:strokeWidth="1" | ||
android:strokeColor="#ffffff" /> | ||
</group> | ||
</group> | ||
android:width="244.92dp" | ||
android:height="244.92dp" | ||
android:viewportWidth="244.92" | ||
android:viewportHeight="244.92"> | ||
<path | ||
android:pathData="M122.46,61.16c6.61,0 12.97,1.06 18.93,3v-14.79c0,-1.28 -1.04,-2.31 -2.31,-2.31h-6.34v-15.59h10c1.68,0 3.05,-1.36 3.05,-3.05s-1.36,-3.05 -3.05,-3.05h-28.25c-1.28,0 -2.31,1.04 -2.31,2.31v19.36h-6.34c-1.28,0 -2.31,1.04 -2.31,2.31v14.79c5.96,-1.94 12.32,-3 18.93,-3Z" | ||
android:fillColor="#008c8c"/> | ||
<path | ||
android:fillColor="#FF000000" | ||
android:pathData="M92.72,175.96l-10.89,26.01 14.33,6.01 10.99,-26.23c4.89,1.26 10.02,1.93 15.31,1.93 33.81,0 61.31,-27.5 61.31,-61.31h-15.54c0,25.24 -20.53,45.77 -45.77,45.77s-45.77,-20.53 -45.77,-45.77h-15.54c0,23.02 12.76,43.11 31.58,53.59Z"/> | ||
<path | ||
android:pathData="M61.26,122.36c0,-33.8 27.4,-61.2 61.2,-61.2s61.2,27.4 61.2,61.2H61.26Z" | ||
android:fillColor="#82dcff"/> | ||
<path | ||
android:pathData="M168.23,122.36c0,25.28 -20.49,45.77 -45.77,45.77 -25.28,0 -45.77,-20.49 -45.77,-45.77h91.54Z" | ||
android:fillColor="#fff"/> | ||
</vector> |
258 changes: 64 additions & 194 deletions
258
app/src/obf/res/drawable/ic_openfacts_logo_no_tagline.xml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<background android:drawable="@color/ic_launcher_background" /> | ||
<foreground android:drawable="@drawable/ic_launcher_foreground" /> | ||
<background android:drawable="@color/ic_launcher_background"/> | ||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> | ||
</adaptive-icon> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<background android:drawable="@color/ic_launcher_background" /> | ||
<foreground android:drawable="@drawable/ic_launcher_foreground" /> | ||
<background android:drawable="@color/ic_launcher_background"/> | ||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> | ||
</adaptive-icon> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.