Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 671a1bb2947fa05286eeabc082e17bd1f3dc3184
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 15:23:18 2023 +0100

    kotlin format

commit 67d679a9e0a14d5a1d91069de99a83d2d619a305
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 15:13:11 2023 +0100

    this should not cast to TextVIew

commit b187e421b2a393be4bb3aefcaeb3c7514bc006c3
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 14:10:32 2023 +0100

    proper icon disabled color

commit c2e0bd307b1697fd3e89ec759618b65ff9f95f78
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 13:56:41 2023 +0100

    updated disabled color state for icons

commit d0e6e6a3a18bbc9633982295b52645fb6eea644f
Merge: 59401961f 5f861cdf4
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 13:05:35 2023 +0100

    Merge branch '01-10-feature/david/ads/navigation_icons' of github.com:duckduckgo/Android into 01-10-feature/david/ads/navigation_icons

commit 59401961fe6346b53c8b7ac39469f2bc431d570a
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 12:47:50 2023 +0100

    format

commit 5c150e1ee5b503715a32bd0a2bbdae92b918e9fa
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 11:44:12 2023 +0100

    update popup menu item

commit d99e3050e2d31f4c0ad46cf632ec860e57d6d9db
Author: David <malmstein@gmail.com>
Date:   Tue Jan 10 17:10:08 2023 +0100

    added new popup menu item to deal with popup menus

commit a30fd7f5e18e5b20945431eb6f18bd2e5c12ff5a
Author: David González <malmstein@gmail.com>
Date:   Tue Jan 10 11:31:25 2023 +0100

    feature/david/ads/navigation_icons

commit 5127ff0f81f9d3e2b5c9ef229abc3dc30861749a
Author: David González <malmstein@gmail.com>
Date:   Thu Dec 29 19:49:31 2022 +0100

    AppTP [1/2]: Trackers Screen (#2666)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203577953787622

    ### Description
    This PR updates the Tracker screen sections of AppTP to the latest
    designs

    ### Steps to test this PR
    Steps in https://app.asana.com/0/1174433894299346/1203578103740008

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>
    Co-authored-by: Aitor Viana <aitorvs@gmail.com>

commit 9cd31e16322f70d897bb58e94ef47b4387384d84
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Thu Dec 29 18:46:44 2022 +0100

    ADS: Share Feedback section (#2670)

    Task/Issue URL: https://app.asana.com/0/0/1203467500325943/f

    **Description**
    Migration of share feedback screens to new components

    **_Design Review_** in
    https://app.asana.com/0/1195897901771673/1203575646431883

commit ed33988f3963c04dad15d70697e7e9eb8aea1b03
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 28 23:59:50 2022 +0100

    ADS: Remote Messaging (#2674)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203411647299665

    ### Description
    PR to update the Remote Messaging views
    Design Review in
    https://app.asana.com/0/1174433894299346/1203593299114126

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>
    Co-authored-by: Aitor Viana <aitorvs@gmail.com>

commit e6b6a6bbb38eaa58d290b95e6e2cad39ac32f834
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 28 22:33:25 2022 +0100

    ADS: Voice Search (#2677)

    Task/Issue URL: https://app.asana.com/0/1174433894299346/1203514942123197

    ### Description
    PR to update Voice Search
    Design review in https://app.asana.com/0/1174433894299346/1203600732931512

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>
    Co-authored-by: Aitor Viana <aitorvs@gmail.com>

commit c84b04bc0afe7d0d397d14eb0d7b1b3af4516bc4
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Wed Dec 28 22:11:20 2022 +0100

    ADS: Browser Menu migration (#2682)

    Task/Issue URL: https://app.asana.com/0/1174433894299346/1203514942123199

    ### Description
    PR to update the Browser Menu specs
    Design review in https://app.asana.com/0/1174433894299346/1203600732931519

commit d67358cf313dd750863d269ac92ae10acc12e69a
Author: nalcalag <nalcalag@gmail.com>
Date:   Tue Dec 27 13:43:56 2022 +0000

    Updated back arrow resource

commit b989c578c0a2c489d2f0f1ff8e1972cfa4406f0d
Author: David González <malmstein@gmail.com>
Date:   Thu Dec 22 11:48:35 2022 +0100

    fix rebasing conflict

commit 713aefa43a3a6449e5d4415e13c3a136e27bc2ba
Author: David González <malmstein@gmail.com>
Date:   Fri Dec 16 16:22:30 2022 +0100

    ADS: AppTP - Onboarding (#2648)

    Task/Issue URL: https://app.asana.com/0/72649045549333/1203568096239636

    ### Description
    Update Onboarding screens and related:
    - Onboarding carrousel
    - FAQ page
    -
    Design Review in task

commit bcbfd73b4324bcf3c3a599babb3ffe119a426db0
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 16 14:39:42 2022 +0000

    ADS: Mic and Camera permissions dialogs migration (#2649)

    Task/Issue URL: https://app.asana.com/0/0/1203553010470144/f

    ### Description
    Migrate camera and microphone permission request dialogs to new
    components

    ### Steps to test this PR

    - Install from this branch
    - Go to a website which requests mic, camera or both permissions
    - [ ] Check dialog looks as expected
    - Go to Apps > DDG > Permissions and disable microphone permission
    - Go back to a website which requests microphone permission and allow it
    - [ ] Check Settings dialog look as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221215_105042_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207844534-5409bae5-f954-4e88-aae0-bb35a6e4aac6.jpg)|![Screenshot_20221215_105631_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207844480-779e7b23-3c12-451e-98f2-ecee718a8286.jpg)|

    ![Screenshot_20221215_105136_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207844545-c1c09176-6932-49c3-b7c7-64b7f02c0ddc.jpg)|![Screenshot_20221215_105649_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207844497-a2f2c435-b83c-4373-b545-ce1a72eeff04.jpg)|

commit 6777724c4210da068b113892abb7839f867cc94b
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 16 14:39:26 2022 +0000

    ADS: Update Bottom Sheets styles in Browser (#2653)

    Task/Issue URL: https://app.asana.com/0/0/1203464345362360/f

    ### Description
    Migrate bottom sheets in Browser to new styling

    ### Steps to test this PR
    **_Downloads_**
    - Install from this branch
    - Download a file
    - [x] Check bottom sheet looks as expected

    **_Fire Dialog_**
    - Install from this branch
    - Tap Fire Button
    - [x] Check bottom sheet looks as expected

    **_Email Tooltip_**
    - Install from this branch
    - Sign in on Duck Email Protection
    - Go to any sign in website
    - Tap on the duck icon in the login input element
    - [x] Check bottom sheet looks as expected

    **_Navigation History_**
    - Install from this branch
    - Navigate to few sites
    - Long tap on back button (nav bar)
    - [x] Check bottom sheet looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![downloads-bottom-sheet](https://user-images.githubusercontent.com/20798495/208082681-a25cb7bf-e61c-413a-a0c7-d5e0b1fdbfa0.jpg)|![Screenshot_20221215_165818_DuckDuckGo](https://user-images.githubusercontent.com/20798495/208082801-4f45cab9-6958-40a3-8681-d018d0ccd418.jpg)|

    ![fire-bottom-sheet](https://user-images.githubusercontent.com/20798495/208082702-2365ad4c-447c-4fd0-8bd2-32c3d01a38b6.jpg)|![Screenshot_20221215_162950_DuckDuckGo](https://user-images.githubusercontent.com/20798495/208082945-402c2760-5e70-40ee-9b39-a295eac74789.jpg)|

    ![email-bottom-sheet](https://user-images.githubusercontent.com/20798495/208082724-7f508b28-06f6-45ff-8e7c-9efac06862f1.jpg)|![Screenshot_20221215_162704_DuckDuckGo](https://user-images.githubusercontent.com/20798495/208082998-73a33ff2-3109-429d-87d1-58d84a1e14f3.jpg)|

    ![navigation-history-bottom-sheet](https://user-images.githubusercontent.com/20798495/208082746-0ffca4dd-8863-4001-bc45-624a11f530d2.jpg)|![Screenshot_20221215_145128_DuckDuckGo](https://user-images.githubusercontent.com/20798495/208082862-3406af9b-233b-4fc6-9c5c-d091d34153bb.jpg)|

    Co-authored-by: David <malmstein@gmail.com>

commit e4e6f6ce17edbe6ff92e787346705777998f5fdd
Author: David González <malmstein@gmail.com>
Date:   Mon Dec 19 20:47:50 2022 +0100

    ADS: Tab Switcher (#2657)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203411647299664
    Design Review Task: https://app.asana.com/0/0/1203569245422155/f

    ### Description
    Update Tab switcher screen

    Co-authored-by: Aitor Viana <aitorvs@gmail.com>

commit 5615bf7d483f9fa17d151acdae1a641a66fa9fe9
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Thu Dec 15 11:21:54 2022 +0000

    ADS: Dialogs (#2642)

    Task/Issue URL:  https://app.asana.com/0/1174433894299346/1203464673670509

    ### Description
    Update Browser dialogs to latest spec, check task for details

    Co-authored-by: Aitor Viana <aitorvs@gmail.com>
    Co-authored-by: David <malmstein@gmail.com>

commit 50eadb659ac3cc14b524d568d120d854b45cbf32
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Wed Dec 14 15:39:50 2022 +0000

    ADS: Report Broken Sites migration (#2636)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299659/f

    ### Description
    Migrate Report Broken Sites screen to new ADS components

    ### Steps to test this PR

    - Install from this branch
    - Navigate to a website
    - Go to "Report Broken Site" option in the overflow menu
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot_20221214_100927_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207567541-c38fcdc0-d4d0-4c0e-af76-8196b4c2eded.jpg)|![Screenshot_20221214_101312_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207568133-0e988815-aec5-45ec-9c7f-581fa229d37f.jpg)|
    ![Screenshot_20221213_155234_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207567691-afec6e7b-dcca-4cbe-8e55-565ebe76d617.jpg)|![Screenshot_20221214_094609_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207567568-e79b8424-9335-4119-9ef9-8ae8870a83aa.jpg)|

commit cf8209778889993d68b3c75604235884c1adf238
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Wed Dec 14 15:05:53 2022 +0000

    ADS: Bookmarks migration (#2629)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299662/f

    ### Description
    Migrate Bookmarks section to new ADS components

    ### Steps to test this PR

    - Install from this branch
    - Go to Bookmarks
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221213_102855_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207294198-efb78249-b069-4a3d-a4ee-5f41ff8044f9.jpg)|![Screenshot_20221213_101924_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207294348-58141c01-061a-4110-b134-12d7eba25224.jpg)|

    ![Screenshot_20221213_102953_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207294220-4b51fb2c-51fa-4a98-8a89-01f5982ff1d8.jpg)|![Screenshot_20221213_101956_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207294301-fcd41476-a7e5-4dc4-a6c1-90920bb35321.jpg)|

commit 25513eadba196f3ee7f2e4a59556bb7a9e910f1b
Author: David González <malmstein@gmail.com>
Date:   Tue Dec 13 17:07:08 2022 +0100

    ADS: System Search (#2634)

    Task/Issue URL:
    https://app.asana.com/0/inbox/1157893581871899/1203455585574665/1203472619504664

    ### Description
    System Search changes

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit 61eb69a59fdc0caf88c3c27429228a64ec3e9247
Author: David González <malmstein@gmail.com>
Date:   Fri Dec 9 16:33:43 2022 +0100

    ADS: DaxTextInput specs (#2622)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203501746286791

    Description
    Update TextInput to latest specs

commit bdec8913a46e9642eb014dc002f975edb9c56d0d
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 9 10:28:41 2022 +0000

    ADS: Downloads screen migration (#2610)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299663/f

    ### Description
    Migrate Downloads screen to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Downloads
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221207_140218_DuckDuckGo](https://user-images.githubusercontent.com/20798495/206199425-9fbdb8a9-3b6e-4796-975d-ed1d0ed603bf.jpg)|![Screenshot_20221207_132951_DuckDuckGo](https://user-images.githubusercontent.com/20798495/206198560-ce6a6c45-16f2-4fb0-9f20-aed5c9e219ce.jpg)|

commit 1cb595ef866c072a5e9a3022102badad3689b7ff
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 9 10:28:09 2022 +0000

    ADS: Unprotected Sites migration (#2606)

    Task/Issue URL: https://app.asana.com/0/0/1203467500325941/f

    ### Description

    - Migrate Unprotected Sites screen to new components
    - Created new CustomAlertDialog component

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Unprotected Sites
    - [ ] Check screen look as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot_20221206_180155_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205987523-0e85ae6f-3fb7-4e9a-a71c-23f396584966.jpg)|![Screenshot_20221206_141121_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205987409-c1bfbb9e-2ef6-439a-95e2-87bd28ba24e8.jpg)|

commit 1f3b4ff2e0391eb17149c97a76477f29e5b04ccc
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 9 10:27:49 2022 +0000

    ADS: Site Permissions section migration (#2588)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299660/f

    ### Description
    Migrate Site permissions section to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Site Permissions
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot_20221202-114739_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205287199-ca0c20df-0df7-41f5-aac0-3d617553f16c.jpg)|![Screenshot_20221201-142533_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205286967-24cc6b46-9d94-4324-9556-c179803167eb.jpg)|
    ![Screenshot_20221202-114756_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205287213-f2fdb15d-2750-42f0-9def-7897eedb2fdc.jpg)|![Screenshot_20221201-142543_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205286917-a6a9160c-1bb7-4e48-8255-22a2458b2a31.jpg)|

commit 5891cac697bedfab261f9ccfd364113091f6cfc7
Author: David González <malmstein@gmail.com>
Date:   Fri Dec 9 10:50:22 2022 +0100

    ADS: Divider Color in Dark Mode (#2616)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203501746286788

    ### Description
    Update divider color attribute in dark mode

commit e96317aa2004478b69cfc0fc19dda749b58ea9e6
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 9 09:19:38 2022 +0000

    ADS: Scrollable RadioGroup in RadioListAlertDialog (#2609)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203480450171661/f

    ### Description
    Fix for making radiogroup scrollable if content is too long

    ### Steps to test this PR

    - Install from this branch
    - Change your device language to Russian
    - Go to Settings > Clear On...
    - [ ] Check content is scrollable

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot 2022-12-02 at 16 01
    19](https://user-images.githubusercontent.com/20798495/206157601-c569514b-e322-492c-a5aa-1e0c04955b9d.png)|https://user-images.githubusercontent.com/20798495/206157619-bab38fb5-90bb-486a-b3ba-efd61b334d31.mp4|

commit a81fb1f2b6cfd98464f2407a3d2b2b763e0918e8
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Tue Dec 6 11:07:43 2022 +0000

    ADS: Settings Screen migration (#2590)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299661/f

    Migrate Settings screen and small section to new components

    - Main Settings menu
    - Theme Dialog
    - App Icon Screen
    - Fire Button Animation Dialog
    - Automatically Clear... Dialog
    - Clear On... Dialog
    - Open Links in Apps Dialog
    - DuckSuckGo Desktop App Screen
    - About DuckDuckGo Screen

    - Install from this branch
    - Go to Settings
    - [ ] Check settings menu, dialogs and screens mention in description
    look as expected

    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221130-181442_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204876902-c02e41a3-6ff4-40a9-9b04-82cf8206b2d6.jpg)|![Screenshot_20221130-181455_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204876842-55c26244-32c1-4c54-adb6-7572b8862d90.jpg)|

    Co-authored-by: David González <malmstein@gmail.com>

commit 093089fc0fc79a47513cd514229a7e4243bfeb6b
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Tue Dec 6 10:55:54 2022 +0000

    ADS: Fireproof Websites screen migration (#2594)

    Task/Issue URL: https://app.asana.com/0/0/1203467500325942/f

    ### Description
    Migration of Fireproof Websites screen to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Fireproof Websites
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221202-114053_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205285445-88b27ff9-1484-4bf0-9545-e65b64691feb.jpg)|![Screenshot_20221202-104630_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205285481-7c150f58-5735-49b7-90de-d002faac2b15.jpg)|

    ![Screenshot_20221202-114120_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205285469-b0e3c39d-0def-434f-b036-61b8f812a2e0.jpg)|![Screenshot_20221202-112656_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205285511-bb3525b3-c251-42bf-9b20-ef571f6f1151.jpg)|

commit c1bb53220e4e7454a0e0ac2b9a46ac1160b881f7
Author: David González <malmstein@gmail.com>
Date:   Tue Dec 6 11:54:46 2022 +0100

    ADS: Browser Toolbar and Overlays (#2589)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203310952591148

    Design Review in
    https://app.asana.com/0/1174433894299346/1203455585574660

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit a8918ef6b7837b570d8c0029270804b7cea25dd7
Author: David González <malmstein@gmail.com>
Date:   Wed Nov 30 11:16:25 2022 +0100

    ADS: Typography Review (#2572)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203438184524173

    ### Description
    Update typograhpy to use lineHeight instead of lineSpacingExtra

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit 052a99610b92b507f9b3fc8d580aa621ec483186
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Tue Nov 29 17:25:34 2022 +0000

    ADS: Internal Features Settings migration (#2576)

    Task/Issue URL: https://app.asana.com/0/0/1203418963160800/f

    ### Description
    Migrate internal features settings section to new components

commit a270a10e00ffe090c54afb4393bd6abf5f1657c3
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Tue Nov 29 17:25:05 2022 +0000

    ADS: Fix selected option in RadioListDialog (#2577)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203456015669172/f

    ### Description

    - Selected option was not working for RadioListAlertDialogBuilder
    - Disable positive button if no option is selected by default

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221129-115404_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204546959-54f42f96-fffc-42bc-9821-b39f7d201146.jpg)|![Screenshot_20221129-134905_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204546976-cbda520d-e338-4636-aa99-57b358f89599.jpg)|

    ![Screenshot_20221129-115404_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204546959-54f42f96-fffc-42bc-9821-b39f7d201146.jpg)|![Screenshot_20221129-143842_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204576904-e45e9893-87c3-4ec3-aeb6-4676d0563261.jpg)|

commit f1db79fc1dc95bc11bbb0458c6e0b9392ca0db44
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Mon Nov 28 14:43:04 2022 +0000

    ADS: Framework related colors 2 (#2574)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203412677059168

    ### Description
    Update toolbar, statusbar and navigation bar colors to latest spec

    ### UI changes

    | Light  | Dark|
    | ------ | ----- |

    ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)|

    Co-authored-by: David González <malmstein@gmail.com>

commit 1b38239beddc31b20d6a2838dd25935a46d2a09d
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 15:11:56 2022 +0100

    Revert "ADS: Framework related colors" (#2573)

    Reverts duckduckgo/Android#2567

commit a0d8321ac9364fca3e3618af42aacebbe2f6edea
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 14:10:10 2022 +0100

    ADS: Framework related colors (#2567)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203412677059168

    ### Description
    Update toolbar, statusbar and navigation bar colors to latest spec

    ### UI changes

    | Light  | Dark|
    | ------ | ----- |

    ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)|

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit 120c3405a630bc500b0f2376bc2bc35e1bd0d561
Author: David <malmstein@gmail.com>
Date:   Mon Nov 28 14:01:04 2022 +0100

    rollback GPL

commit c0252ae9640e1fffc24c73f39e54ddda687a0d70
Author: David González <malmstein@gmail.com>
Date:   Fri Nov 25 14:42:26 2022 +0100

    ADS: Onboarding (#2556)

    Task/Issue URL: https://app.asana.com/0/488551667048375/1203325011590293

    Update Onboarding to ADS

    | Onboarding | Onboarding | Onboarding | Onboarding |
    | ------ | ----- | ------ | ----- |

    ![Screenshot_20221124_105952](https://user-images.githubusercontent.com/531613/203755369-9dcee675-b819-428f-a1b3-8351a910ba24.png)|![Screenshot_20221124_105927](https://user-images.githubusercontent.com/531613/203755382-ad2b4346-82b1-4aab-ab50-766530e9ec7b.png)|![Screenshot_20221124_110004](https://user-images.githubusercontent.com/531613/203755362-3d2069d2-5395-467a-8d6f-3575fcd3fff0.png)|![Screenshot_20221124_105912](https://user-images.githubusercontent.com/531613/203755392-191034c5-fde4-475b-9d34-818fcf22f331.png)|

commit ae24d39216991ff167dcb4bf4fc3d1d00fdcc005
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Mon Nov 28 14:43:04 2022 +0000

    ADS: Framework related colors 2 (#2574)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203412677059168

    ### Description
    Update toolbar, statusbar and navigation bar colors to latest spec

    ### UI changes

    | Light  | Dark|
    | ------ | ----- |

    ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)|

    Co-authored-by: David González <malmstein@gmail.com>

commit 33f9b24f96ea391abde8d0da5f22e0ae34da58d8
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 15:11:56 2022 +0100

    Revert "ADS: Framework related colors" (#2573)

    Reverts duckduckgo/Android#2567

commit dc11b20b62f5679f6ad9990a2637323ab0994308
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 14:10:10 2022 +0100

    ADS: Framework related colors (#2567)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203412677059168

    ### Description
    Update toolbar, statusbar and navigation bar colors to latest spec

    ### UI changes

    | Light  | Dark|
    | ------ | ----- |

    ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)|

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit a9caf488da1eb0a90089021e5f54f3941717ea6f
Author: David <malmstein@gmail.com>
Date:   Mon Nov 28 14:01:04 2022 +0100

    rollback GPL

commit 1ec983becb8d1eb2dd0d19403bda14b1e0bd7697
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Nov 25 16:44:15 2022 +0000

    ADS: Accessibility screen migration (#2553)

    Task/Issue URL: https://app.asana.com/0/0/1203418963160797/f

    ### Description
    Accessibility screen 100% migrated to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Accessibility
    - [ ] Check screen looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot_20221123-171045_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203611688-2e940e30-79a6-46b6-b641-02c162f975a7.jpg)|![Screenshot_20221124-101518_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759185-7398bb92-b372-4182-bf36-266dde6f555c.jpg)|
    ![Screenshot_20221124-101542_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759120-a2230381-80c3-4648-a79b-e6d79f0a624d.jpg)|![Screenshot_20221124-101507_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759152-68b12852-8705-4c4b-9c6a-6930cefca7c1.jpg)|

commit 53b7c7d9b94f7d703392e0d6f181be809ba65068
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Nov 25 15:49:37 2022 +0000

    ADS: Manage Cookie Pop-ups migration (#2559)

    <!--
    Note: This checklist is a reminder of our shared engineering
    expectations.
    The items in Bold are required
    If your PR involves UI changes:
    1. Upload screenshots or screencasts that illustrate the changes before
    / after
    2. Add them under the UI changes section (feel free to add more columns
    if needed)
        3. Make sure these changes are tested in API 23 and API 26
    If your PR does not involve UI changes, you can remove the **UI
    changes** section
    -->

    Task/Issue URL: https://app.asana.com/0/0/1203418963160799/f

    ### Description
    Manage Cookie Pop-ups screen 100% migrated to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Manage Cookie Pop-ups
    - [ ] Check screen looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![autoconsent_old_light](https://user-images.githubusercontent.com/20798495/203774974-082d4088-f957-4be8-81aa-7e8735eed21e.jpg)|![autoconsent_new_light](https://user-images.githubusercontent.com/20798495/203776081-2ea13174-f709-4b34-9473-933438dc33b6.jpg)|

    ![autoconsent_old_dark](https://user-images.githubusercontent.com/20798495/203774991-473012a1-a9c7-40a4-b97d-be230f07614a.jpg)|![autoconsent_new_dark](https://user-images.githubusercontent.com/20798495/203776142-97517f5c-c4c4-431d-a8b1-cf10dad3887d.jpg)|

commit ff764c9ac72a65a7d6b50a91e96022a4c025bac8
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Nov 25 15:43:52 2022 +0000

    ADS: GPC screen migration (#2557)

    <!--
    Note: This checklist is a reminder of our shared engineering
    expectations.
    The items in Bold are required
    If your PR involves UI changes:
    1. Upload screenshots or screencasts that illustrate the changes before
    / after
    2. Add them under the UI changes section (feel free to add more columns
    if needed)
        3. Make sure these changes are tested in API 23 and API 26
    If your PR does not involve UI changes, you can remove the **UI
    changes** section
    -->

    Task/Issue URL: https://app.asana.com/0/0/1203418963160798/f

    ### Description
    Global Privacy Control screen 100% migrated to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Global Privacy Control (GPC)
    - [ ] Check screen looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221124-100149_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203757021-1b931a7a-dfbb-41fb-92af-e30c6faa88f9.jpg)|![Screenshot_20221124-100405_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203757276-10fd5129-0a87-45ae-a864-695c2b1c6793.jpg)|

    ![Screenshot_20221124-100341_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203757037-57eb0cff-cd1b-4342-bece-42d22f06ea46.jpg)|![Screenshot_20221124-100356_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203757306-54f4072d-22c1-4bd5-91a7-dc9fc4b73851.jpg)|

commit 95d88bd00102dbc0774bfbb576eb1131b3597e96
Author: David González <malmstein@gmail.com>
Date:   Wed Nov 23 17:15:33 2022 +0100

    ADS: Add a custom CardView for DaxDialogs (#2550)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203425281067996

    ### Description
    The top triangle in the DaxDialog doesn't respect elevation. The outline
    around it is not consistent with the rest of the Card.

    ### UI changes

    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221122_174516](https://user-images.githubusercontent.com/531613/203578300-1a80b73e-cb28-441c-831c-cb9a1307319f.png)|![Screenshot_20221123_140401](https://user-images.githubusercontent.com/531613/203578315-8778a408-8158-40f3-ae88-d1bc3039937a.png)|

commit a7884ce04d9c02a25fcc3415eceb9213cbee340f
Author: David González <malmstein@gmail.com>
Date:   Fri Nov 25 14:42:26 2022 +0100

    ADS: Onboarding (#2556)

    Task/Issue URL: https://app.asana.com/0/488551667048375/1203325011590293

    ### Description
    Update Onboarding to ADS

    ### UI changes
    | Onboarding | Onboarding | Onboarding | Onboarding |
    | ------ | ----- | ------ | ----- |

    ![Screenshot_20221124_105952](https://user-images.githubusercontent.com/531613/203755369-9dcee675-b819-428f-a1b3-8351a910ba24.png)|![Screenshot_20221124_105927](https://user-images.githubusercontent.com/531613/203755382-ad2b4346-82b1-4aab-ab50-766530e9ec7b.png)|![Screenshot_20221124_110004](https://user-images.githubusercontent.com/531613/203755362-3d2069d2-5395-467a-8d6f-3575fcd3fff0.png)|![Screenshot_20221124_105912](https://user-images.githubusercontent.com/531613/203755392-191034c5-fde4-475b-9d34-818fcf22f331.png)|

commit 7a54368b0ff70740517a6b3a3ae104ba18ebe575
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Thu Nov 24 15:00:36 2022 +0000

    ADS: Edit padding-end toggle in ListItems (#2560)

    <!--
    Note: This checklist is a reminder of our shared engineering
    expectations.
    The items in Bold are required
    If your PR involves UI changes:
    1. Upload screenshots or screencasts that illustrate the changes before
    / after
    2. Add them under the UI changes section (feel free to add more columns
    if needed)
        3. Make sure these changes are tested in API 23 and API 26
    If your PR does not involve UI changes, you can remove the **UI
    changes** section
    -->

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203433424223914/f

    ### Description
    Increase padding-end for OneLineListItem and TwoLineListItem when
    showing switch

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Design Preview
    - [ ] Check List Items with toggle look as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![autoconsent_old_light](https://user-images.githubusercontent.com/20798495/203793730-c9d9883e-c2a8-48bd-8a9e-6c19288f2f92.jpg)|![padding-end_16dp](https://user-images.githubusercontent.com/20798495/203793656-dae94b23-c40c-4d3b-8dce-65f8f9a4f539.jpg)|

commit ec0d74218d8ae4829d2b193d7a7b9e6eeba3c030
Author: David González <malmstein@gmail.com>
Date:   Wed Nov 23 17:15:33 2022 +0100

    ADS: Add a custom CardView for DaxDialogs (#2550)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203425281067996

    ### Description
    The top triangle in the DaxDialog doesn't respect elevation. The outline
    around it is not consistent with the rest of the Card.

    ### UI changes

    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221122_174516](https://user-images.githubusercontent.com/531613/203578300-1a80b73e-cb28-441c-831c-cb9a1307319f.png)|![Screenshot_20221123_140401](https://user-images.githubusercontent.com/531613/203578315-8778a408-8158-40f3-ae88-d1bc3039937a.png)|

commit 211ac16c334323fd81519dc0c7fe4c7afd5c8b3e
Author: David González <malmstein@gmail.com>
Date:   Wed Nov 23 12:51:33 2022 +0100

    ADS DaxTextView: Support for android:textColor (#2546)

    Task/Issue URL: https://app.asana.com/0/1202857801505092/1203418290512953

    ### Description

    - Support the textColor attribute from Android
    - When textType and textColor are both set, textType will take priority.

commit 5f861cdf4f27be297f7efa671bfa44ee2203370c
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 12:47:50 2023 +0100

    format

commit a4f7f23002e140252afc434b6887fb792ed6b219
Author: David González <malmstein@gmail.com>
Date:   Wed Jan 11 11:44:12 2023 +0100

    update popup menu item

commit 2d61103344a9851b3e1498ae81de06986d30d1a4
Author: David <malmstein@gmail.com>
Date:   Tue Jan 10 17:10:08 2023 +0100

    added new popup menu item to deal with popup menus

commit af3e1032b34270d8952479d85881c5c8b423c3d8
Author: David González <malmstein@gmail.com>
Date:   Tue Jan 10 11:31:25 2023 +0100

    feature/david/ads/navigation_icons

commit 38a607993a93c10f1a2370b7b94aeaf865ca99ed
Author: David González <malmstein@gmail.com>
Date:   Thu Dec 29 19:49:31 2022 +0100

    AppTP [1/2]: Trackers Screen (#2666)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203577953787622

    ### Description
    This PR updates the Tracker screen sections of AppTP to the latest
    designs

    ### Steps to test this PR
    Steps in https://app.asana.com/0/1174433894299346/1203578103740008

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>
    Co-authored-by: Aitor Viana <aitorvs@gmail.com>

commit f4059be162b78cba610563f4e7079d706dec093b
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Thu Dec 29 18:46:44 2022 +0100

    ADS: Share Feedback section (#2670)

    Task/Issue URL: https://app.asana.com/0/0/1203467500325943/f

    **Description**
    Migration of share feedback screens to new components

    **_Design Review_** in
    https://app.asana.com/0/1195897901771673/1203575646431883

commit 51437bed94168f6269d886382dfe0c27356bf0e9
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 28 23:59:50 2022 +0100

    ADS: Remote Messaging (#2674)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203411647299665

    ### Description
    PR to update the Remote Messaging views
    Design Review in
    https://app.asana.com/0/1174433894299346/1203593299114126

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>
    Co-authored-by: Aitor Viana <aitorvs@gmail.com>

commit 5b76cf99e002d023f23c7f024e76c799bcf8ca2b
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 28 22:33:25 2022 +0100

    ADS: Voice Search (#2677)

    Task/Issue URL: https://app.asana.com/0/1174433894299346/1203514942123197

    ### Description
    PR to update Voice Search
    Design review in https://app.asana.com/0/1174433894299346/1203600732931512

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>
    Co-authored-by: Aitor Viana <aitorvs@gmail.com>

commit 0e42d817279b31775338d6f643b8c2ffe60560e2
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Wed Dec 28 22:11:20 2022 +0100

    ADS: Browser Menu migration (#2682)

    Task/Issue URL: https://app.asana.com/0/1174433894299346/1203514942123199

    ### Description
    PR to update the Browser Menu specs
    Design review in https://app.asana.com/0/1174433894299346/1203600732931519

commit a575edcc1f3d7bd86f86ed6537a900faadd32b96
Author: nalcalag <nalcalag@gmail.com>
Date:   Tue Dec 27 13:43:56 2022 +0000

    Updated back arrow resource

commit bb176f25f2870703868485cbf0595b3c92b2d5bd
Author: David González <malmstein@gmail.com>
Date:   Thu Dec 22 11:48:35 2022 +0100

    fix rebasing conflict

commit 45601347247f5d3ab88ba8897acb1fa7aff2637e
Author: David González <malmstein@gmail.com>
Date:   Fri Dec 16 16:22:30 2022 +0100

    ADS: AppTP - Onboarding (#2648)

    Task/Issue URL: https://app.asana.com/0/72649045549333/1203568096239636

    ### Description
    Update Onboarding screens and related:
    - Onboarding carrousel
    - FAQ page
    -
    Design Review in task

commit d8ce7c75484ec5b77bbb5e986ddedbd6c278d424
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 16 14:39:42 2022 +0000

    ADS: Mic and Camera permissions dialogs migration (#2649)

    Task/Issue URL: https://app.asana.com/0/0/1203553010470144/f

    ### Description
    Migrate camera and microphone permission request dialogs to new
    components

    ### Steps to test this PR

    - Install from this branch
    - Go to a website which requests mic, camera or both permissions
    - [ ] Check dialog looks as expected
    - Go to Apps > DDG > Permissions and disable microphone permission
    - Go back to a website which requests microphone permission and allow it
    - [ ] Check Settings dialog look as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221215_105042_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207844534-5409bae5-f954-4e88-aae0-bb35a6e4aac6.jpg)|![Screenshot_20221215_105631_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207844480-779e7b23-3c12-451e-98f2-ecee718a8286.jpg)|

    ![Screenshot_20221215_105136_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207844545-c1c09176-6932-49c3-b7c7-64b7f02c0ddc.jpg)|![Screenshot_20221215_105649_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207844497-a2f2c435-b83c-4373-b545-ce1a72eeff04.jpg)|

commit 27845850a3e14421b7c0d0c615d5f6db2dc022ef
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 16 14:39:26 2022 +0000

    ADS: Update Bottom Sheets styles in Browser (#2653)

    Task/Issue URL: https://app.asana.com/0/0/1203464345362360/f

    ### Description
    Migrate bottom sheets in Browser to new styling

    ### Steps to test this PR
    **_Downloads_**
    - Install from this branch
    - Download a file
    - [x] Check bottom sheet looks as expected

    **_Fire Dialog_**
    - Install from this branch
    - Tap Fire Button
    - [x] Check bottom sheet looks as expected

    **_Email Tooltip_**
    - Install from this branch
    - Sign in on Duck Email Protection
    - Go to any sign in website
    - Tap on the duck icon in the login input element
    - [x] Check bottom sheet looks as expected

    **_Navigation History_**
    - Install from this branch
    - Navigate to few sites
    - Long tap on back button (nav bar)
    - [x] Check bottom sheet looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![downloads-bottom-sheet](https://user-images.githubusercontent.com/20798495/208082681-a25cb7bf-e61c-413a-a0c7-d5e0b1fdbfa0.jpg)|![Screenshot_20221215_165818_DuckDuckGo](https://user-images.githubusercontent.com/20798495/208082801-4f45cab9-6958-40a3-8681-d018d0ccd418.jpg)|

    ![fire-bottom-sheet](https://user-images.githubusercontent.com/20798495/208082702-2365ad4c-447c-4fd0-8bd2-32c3d01a38b6.jpg)|![Screenshot_20221215_162950_DuckDuckGo](https://user-images.githubusercontent.com/20798495/208082945-402c2760-5e70-40ee-9b39-a295eac74789.jpg)|

    ![email-bottom-sheet](https://user-images.githubusercontent.com/20798495/208082724-7f508b28-06f6-45ff-8e7c-9efac06862f1.jpg)|![Screenshot_20221215_162704_DuckDuckGo](https://user-images.githubusercontent.com/20798495/208082998-73a33ff2-3109-429d-87d1-58d84a1e14f3.jpg)|

    ![navigation-history-bottom-sheet](https://user-images.githubusercontent.com/20798495/208082746-0ffca4dd-8863-4001-bc45-624a11f530d2.jpg)|![Screenshot_20221215_145128_DuckDuckGo](https://user-images.githubusercontent.com/20798495/208082862-3406af9b-233b-4fc6-9c5c-d091d34153bb.jpg)|

    Co-authored-by: David <malmstein@gmail.com>

commit 86d3d0cd28667159f2caefbd7b35d0dbce98fd8c
Author: David González <malmstein@gmail.com>
Date:   Mon Dec 19 20:47:50 2022 +0100

    ADS: Tab Switcher (#2657)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203411647299664
    Design Review Task: https://app.asana.com/0/0/1203569245422155/f

    ### Description
    Update Tab switcher screen

    Co-authored-by: Aitor Viana <aitorvs@gmail.com>

commit 983304019a7188d00bb34f17e417f59352e5d5ec
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Thu Dec 15 11:21:54 2022 +0000

    ADS: Dialogs (#2642)

    Task/Issue URL:  https://app.asana.com/0/1174433894299346/1203464673670509

    ### Description
    Update Browser dialogs to latest spec, check task for details

    Co-authored-by: Aitor Viana <aitorvs@gmail.com>
    Co-authored-by: David <malmstein@gmail.com>

commit 273d45c05bcd28c52a2fc479464f2eb097dde0df
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Wed Dec 14 15:39:50 2022 +0000

    ADS: Report Broken Sites migration (#2636)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299659/f

    ### Description
    Migrate Report Broken Sites screen to new ADS components

    ### Steps to test this PR

    - Install from this branch
    - Navigate to a website
    - Go to "Report Broken Site" option in the overflow menu
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot_20221214_100927_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207567541-c38fcdc0-d4d0-4c0e-af76-8196b4c2eded.jpg)|![Screenshot_20221214_101312_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207568133-0e988815-aec5-45ec-9c7f-581fa229d37f.jpg)|
    ![Screenshot_20221213_155234_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207567691-afec6e7b-dcca-4cbe-8e55-565ebe76d617.jpg)|![Screenshot_20221214_094609_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207567568-e79b8424-9335-4119-9ef9-8ae8870a83aa.jpg)|

commit 123d840fd760968c3ee08be07bc0ed07152bdbe6
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Wed Dec 14 15:05:53 2022 +0000

    ADS: Bookmarks migration (#2629)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299662/f

    ### Description
    Migrate Bookmarks section to new ADS components

    ### Steps to test this PR

    - Install from this branch
    - Go to Bookmarks
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221213_102855_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207294198-efb78249-b069-4a3d-a4ee-5f41ff8044f9.jpg)|![Screenshot_20221213_101924_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207294348-58141c01-061a-4110-b134-12d7eba25224.jpg)|

    ![Screenshot_20221213_102953_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207294220-4b51fb2c-51fa-4a98-8a89-01f5982ff1d8.jpg)|![Screenshot_20221213_101956_DuckDuckGo](https://user-images.githubusercontent.com/20798495/207294301-fcd41476-a7e5-4dc4-a6c1-90920bb35321.jpg)|

commit f9243880869f91137e6a102c99c53bc10a0d124f
Author: David González <malmstein@gmail.com>
Date:   Tue Dec 13 17:07:08 2022 +0100

    ADS: System Search (#2634)

    Task/Issue URL:
    https://app.asana.com/0/inbox/1157893581871899/1203455585574665/1203472619504664

    ### Description
    System Search changes

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit 8a5d5a5ac73541be454885497691326980b478e7
Author: David González <malmstein@gmail.com>
Date:   Fri Dec 9 16:33:43 2022 +0100

    ADS: DaxTextInput specs (#2622)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203501746286791

    Description
    Update TextInput to latest specs

commit e7ea9b9dbe164665d042898ed0666e518e6bac19
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 9 10:28:41 2022 +0000

    ADS: Downloads screen migration (#2610)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299663/f

    ### Description
    Migrate Downloads screen to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Downloads
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221207_140218_DuckDuckGo](https://user-images.githubusercontent.com/20798495/206199425-9fbdb8a9-3b6e-4796-975d-ed1d0ed603bf.jpg)|![Screenshot_20221207_132951_DuckDuckGo](https://user-images.githubusercontent.com/20798495/206198560-ce6a6c45-16f2-4fb0-9f20-aed5c9e219ce.jpg)|

commit 274c2fde189f504f57795c22bb823ae8eb4e1c80
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 9 10:28:09 2022 +0000

    ADS: Unprotected Sites migration (#2606)

    Task/Issue URL: https://app.asana.com/0/0/1203467500325941/f

    ### Description

    - Migrate Unprotected Sites screen to new components
    - Created new CustomAlertDialog component

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Unprotected Sites
    - [ ] Check screen look as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot_20221206_180155_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205987523-0e85ae6f-3fb7-4e9a-a71c-23f396584966.jpg)|![Screenshot_20221206_141121_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205987409-c1bfbb9e-2ef6-439a-95e2-87bd28ba24e8.jpg)|

commit 75b3074dcf3ff1b01364ba4ee5752f66afdc40f3
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 9 10:27:49 2022 +0000

    ADS: Site Permissions section migration (#2588)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299660/f

    ### Description
    Migrate Site permissions section to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Site Permissions
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot_20221202-114739_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205287199-ca0c20df-0df7-41f5-aac0-3d617553f16c.jpg)|![Screenshot_20221201-142533_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205286967-24cc6b46-9d94-4324-9556-c179803167eb.jpg)|
    ![Screenshot_20221202-114756_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205287213-f2fdb15d-2750-42f0-9def-7897eedb2fdc.jpg)|![Screenshot_20221201-142543_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205286917-a6a9160c-1bb7-4e48-8255-22a2458b2a31.jpg)|

commit 1271f3f18ed71c2cf9a4869c0924e573681013c7
Author: David González <malmstein@gmail.com>
Date:   Fri Dec 9 10:50:22 2022 +0100

    ADS: Divider Color in Dark Mode (#2616)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203501746286788

    ### Description
    Update divider color attribute in dark mode

commit c53de89c01b8c345f0fef9e882ce5fcdafd244d7
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Dec 9 09:19:38 2022 +0000

    ADS: Scrollable RadioGroup in RadioListAlertDialog (#2609)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203480450171661/f

    ### Description
    Fix for making radiogroup scrollable if content is too long

    ### Steps to test this PR

    - Install from this branch
    - Change your device language to Russian
    - Go to Settings > Clear On...
    - [ ] Check content is scrollable

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot 2022-12-02 at 16 01
    19](https://user-images.githubusercontent.com/20798495/206157601-c569514b-e322-492c-a5aa-1e0c04955b9d.png)|https://user-images.githubusercontent.com/20798495/206157619-bab38fb5-90bb-486a-b3ba-efd61b334d31.mp4|

commit 61a889eee3d28cc6fa0056bfda9142539f2de95b
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Tue Dec 6 11:07:43 2022 +0000

    ADS: Settings Screen migration (#2590)

    Task/Issue URL: https://app.asana.com/0/0/1203411647299661/f

    Migrate Settings screen and small section to new components

    - Main Settings menu
    - Theme Dialog
    - App Icon Screen
    - Fire Button Animation Dialog
    - Automatically Clear... Dialog
    - Clear On... Dialog
    - Open Links in Apps Dialog
    - DuckSuckGo Desktop App Screen
    - About DuckDuckGo Screen

    - Install from this branch
    - Go to Settings
    - [ ] Check settings menu, dialogs and screens mention in description
    look as expected

    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221130-181442_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204876902-c02e41a3-6ff4-40a9-9b04-82cf8206b2d6.jpg)|![Screenshot_20221130-181455_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204876842-55c26244-32c1-4c54-adb6-7572b8862d90.jpg)|

    Co-authored-by: David González <malmstein@gmail.com>

commit 1c740a262ac90703362dd89c097da7c15ce7bf7c
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Tue Dec 6 10:55:54 2022 +0000

    ADS: Fireproof Websites screen migration (#2594)

    Task/Issue URL: https://app.asana.com/0/0/1203467500325942/f

    ### Description
    Migration of Fireproof Websites screen to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Fireproof Websites
    - [ ] Check everything looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221202-114053_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205285445-88b27ff9-1484-4bf0-9545-e65b64691feb.jpg)|![Screenshot_20221202-104630_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205285481-7c150f58-5735-49b7-90de-d002faac2b15.jpg)|

    ![Screenshot_20221202-114120_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205285469-b0e3c39d-0def-434f-b036-61b8f812a2e0.jpg)|![Screenshot_20221202-112656_DuckDuckGo](https://user-images.githubusercontent.com/20798495/205285511-bb3525b3-c251-42bf-9b20-ef571f6f1151.jpg)|

commit 11f14187aa3e28feb8d2be1a84ffe3c35f59d47d
Author: David González <malmstein@gmail.com>
Date:   Tue Dec 6 11:54:46 2022 +0100

    ADS: Browser Toolbar and Overlays (#2589)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203310952591148

    Design Review in
    https://app.asana.com/0/1174433894299346/1203455585574660

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit a1779611888eda4e7a95afbbcda7eca65f4ddb40
Author: David González <malmstein@gmail.com>
Date:   Wed Nov 30 11:16:25 2022 +0100

    ADS: Typography Review (#2572)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203438184524173

    ### Description
    Update typograhpy to use lineHeight instead of lineSpacingExtra

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit b3ac06a3694fdda850fb222a5683dde9a5357062
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Tue Nov 29 17:25:34 2022 +0000

    ADS: Internal Features Settings migration (#2576)

    Task/Issue URL: https://app.asana.com/0/0/1203418963160800/f

    ### Description
    Migrate internal features settings section to new components

commit 424a02d0d593f88b8a17f133389a9b7ff4ce0077
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Tue Nov 29 17:25:05 2022 +0000

    ADS: Fix selected option in RadioListDialog (#2577)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203456015669172/f

    ### Description

    - Selected option was not working for RadioListAlertDialogBuilder
    - Disable positive button if no option is selected by default

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221129-115404_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204546959-54f42f96-fffc-42bc-9821-b39f7d201146.jpg)|![Screenshot_20221129-134905_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204546976-cbda520d-e338-4636-aa99-57b358f89599.jpg)|

    ![Screenshot_20221129-115404_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204546959-54f42f96-fffc-42bc-9821-b39f7d201146.jpg)|![Screenshot_20221129-143842_DuckDuckGo](https://user-images.githubusercontent.com/20798495/204576904-e45e9893-87c3-4ec3-aeb6-4676d0563261.jpg)|

commit f90e3191c84d4418f994cb6712d84f7fba4efe8b
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Mon Nov 28 14:43:04 2022 +0000

    ADS: Framework related colors 2 (#2574)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203412677059168

    ### Description
    Update toolbar, statusbar and navigation bar colors to latest spec

    ### UI changes

    | Light  | Dark|
    | ------ | ----- |

    ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)|

    Co-authored-by: David González <malmstein@gmail.com>

commit f4efab17bc0904e81908e70ad86b9df2bac9a623
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 15:11:56 2022 +0100

    Revert "ADS: Framework related colors" (#2573)

    Reverts duckduckgo/Android#2567

commit ba89a7cb24c7093f46bc0ddd170f0d5ff816edcb
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 14:10:10 2022 +0100

    ADS: Framework related colors (#2567)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203412677059168

    ### Description
    Update toolbar, statusbar and navigation bar colors to latest spec

    ### UI changes

    | Light  | Dark|
    | ------ | ----- |

    ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)|

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit 758cfc56ec32160162de9469283b1018d5fbcfd4
Author: David <malmstein@gmail.com>
Date:   Mon Nov 28 14:01:04 2022 +0100

    rollback GPL

commit 982fa724e9af73c4c97b2c5a858d8c966c6f346a
Author: David González <malmstein@gmail.com>
Date:   Fri Nov 25 14:42:26 2022 +0100

    ADS: Onboarding (#2556)

    Task/Issue URL: https://app.asana.com/0/488551667048375/1203325011590293

    Update Onboarding to ADS

    | Onboarding | Onboarding | Onboarding | Onboarding |
    | ------ | ----- | ------ | ----- |

    ![Screenshot_20221124_105952](https://user-images.githubusercontent.com/531613/203755369-9dcee675-b819-428f-a1b3-8351a910ba24.png)|![Screenshot_20221124_105927](https://user-images.githubusercontent.com/531613/203755382-ad2b4346-82b1-4aab-ab50-766530e9ec7b.png)|![Screenshot_20221124_110004](https://user-images.githubusercontent.com/531613/203755362-3d2069d2-5395-467a-8d6f-3575fcd3fff0.png)|![Screenshot_20221124_105912](https://user-images.githubusercontent.com/531613/203755392-191034c5-fde4-475b-9d34-818fcf22f331.png)|

commit e7fa489584c46efe8cb167edc2f1eac9b345a8b8
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Mon Nov 28 14:43:04 2022 +0000

    ADS: Framework related colors 2 (#2574)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203412677059168

    ### Description
    Update toolbar, statusbar and navigation bar colors to latest spec

    ### UI changes

    | Light  | Dark|
    | ------ | ----- |

    ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)|

    Co-authored-by: David González <malmstein@gmail.com>

commit dfbc24edd4d0a8248f988a11b496120a18983ccf
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 15:11:56 2022 +0100

    Revert "ADS: Framework related colors" (#2573)

    Reverts duckduckgo/Android#2567

commit 3f1b375a847303d4c9c42525c5cb542b4c5caea4
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 14:10:10 2022 +0100

    ADS: Framework related colors (#2567)

    Task/Issue URL:
    https://app.asana.com/0/1174433894299346/1203412677059168

    ### Description
    Update toolbar, statusbar and navigation bar colors to latest spec

    ### UI changes

    | Light  | Dark|
    | ------ | ----- |

    ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)|

    Co-authored-by: Noelia Alcala <nalcalag@gmail.com>

commit 26c02fd226b34b53bbec14f65f83388368433577
Author: David <malmstein@gmail.com>
Date:   Mon Nov 28 14:01:04 2022 +0100

    rollback GPL

commit aca472a1aacc131bbace1aa461a2622a4c07d9f5
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Nov 25 16:44:15 2022 +0000

    ADS: Accessibility screen migration (#2553)

    Task/Issue URL: https://app.asana.com/0/0/1203418963160797/f

    ### Description
    Accessibility screen 100% migrated to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Accessibility
    - [ ] Check screen looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |
    ![Screenshot_20221123-171045_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203611688-2e940e30-79a6-46b6-b641-02c162f975a7.jpg)|![Screenshot_20221124-101518_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759185-7398bb92-b372-4182-bf36-266dde6f555c.jpg)|
    ![Screenshot_20221124-101542_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759120-a2230381-80c3-4648-a79b-e6d79f0a624d.jpg)|![Screenshot_20221124-101507_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203759152-68b12852-8705-4c4b-9c6a-6930cefca7c1.jpg)|

commit 47d5ac465bffa8ee221aadb6773561db7726f88c
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Nov 25 15:49:37 2022 +0000

    ADS: Manage Cookie Pop-ups migration (#2559)

    <!--
    Note: This checklist is a reminder of our shared engineering
    expectations.
    The items in Bold are required
    If your PR involves UI changes:
    1. Upload screenshots or screencasts that illustrate the changes before
    / after
    2. Add them under the UI changes section (feel free to add more columns
    if needed)
        3. Make sure these changes are tested in API 23 and API 26
    If your PR does not involve UI changes, you can remove the **UI
    changes** section
    -->

    Task/Issue URL: https://app.asana.com/0/0/1203418963160799/f

    ### Description
    Manage Cookie Pop-ups screen 100% migrated to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Manage Cookie Pop-ups
    - [ ] Check screen looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![autoconsent_old_light](https://user-images.githubusercontent.com/20798495/203774974-082d4088-f957-4be8-81aa-7e8735eed21e.jpg)|![autoconsent_new_light](https://user-images.githubusercontent.com/20798495/203776081-2ea13174-f709-4b34-9473-933438dc33b6.jpg)|

    ![autoconsent_old_dark](https://user-images.githubusercontent.com/20798495/203774991-473012a1-a9c7-40a4-b97d-be230f07614a.jpg)|![autoconsent_new_dark](https://user-images.githubusercontent.com/20798495/203776142-97517f5c-c4c4-431d-a8b1-cf10dad3887d.jpg)|

commit ced857b8398d03e2e41505788a5b994616be9bf4
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Fri Nov 25 15:43:52 2022 +0000

    ADS: GPC screen migration (#2557)

    <!--
    Note: This checklist is a reminder of our shared engineering
    expectations.
    The items in Bold are required
    If your PR involves UI changes:
    1. Upload screenshots or screencasts that illustrate the changes before
    / after
    2. Add them under the UI changes section (feel free to add more columns
    if needed)
        3. Make sure these changes are tested in API 23 and API 26
    If your PR does not involve UI changes, you can remove the **UI
    changes** section
    -->

    Task/Issue URL: https://app.asana.com/0/0/1203418963160798/f

    ### Description
    Global Privacy Control screen 100% migrated to new components

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Global Privacy Control (GPC)
    - [ ] Check screen looks as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221124-100149_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203757021-1b931a7a-dfbb-41fb-92af-e30c6faa88f9.jpg)|![Screenshot_20221124-100405_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203757276-10fd5129-0a87-45ae-a864-695c2b1c6793.jpg)|

    ![Screenshot_20221124-100341_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203757037-57eb0cff-cd1b-4342-bece-42d22f06ea46.jpg)|![Screenshot_20221124-100356_DuckDuckGo](https://user-images.githubusercontent.com/20798495/203757306-54f4072d-22c1-4bd5-91a7-dc9fc4b73851.jpg)|

commit 4bd004e14ce0f9a783a7708e5ce86fd72244bca9
Author: David González <malmstein@gmail.com>
Date:   Wed Nov 23 17:15:33 2022 +0100

    ADS: Add a custom CardView for DaxDialogs (#2550)

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203425281067996

    ### Description
    The top triangle in the DaxDialog doesn't respect elevation. The outline
    around it is not consistent with the rest of the Card.

    ### UI changes

    | Before  | After |
    | ------ | ----- |

    ![Screenshot_20221122_174516](https://user-images.githubusercontent.com/531613/203578300-1a80b73e-cb28-441c-831c-cb9a1307319f.png)|![Screenshot_20221123_140401](https://user-images.githubusercontent.com/531613/203578315-8778a408-8158-40f3-ae88-d1bc3039937a.png)|

commit 68258a3da1be35d8717bc38d2811b42e623b8b71
Author: David González <malmstein@gmail.com>
Date:   Fri Nov 25 14:42:26 2022 +0100

    ADS: Onboarding (#2556)

    Task/Issue URL: https://app.asana.com/0/488551667048375/1203325011590293

    ### Description
    Update Onboarding to ADS

    ### UI changes
    | Onboarding | Onboarding | Onboarding | Onboarding |
    | ------ | ----- | ------ | ----- |

    ![Screenshot_20221124_105952](https://user-images.githubusercontent.com/531613/203755369-9dcee675-b819-428f-a1b3-8351a910ba24.png)|![Screenshot_20221124_105927](https://user-images.githubusercontent.com/531613/203755382-ad2b4346-82b1-4aab-ab50-766530e9ec7b.png)|![Screenshot_20221124_110004](https://user-images.githubusercontent.com/531613/203755362-3d2069d2-5395-467a-8d6f-3575fcd3fff0.png)|![Screenshot_20221124_105912](https://user-images.githubusercontent.com/531613/203755392-191034c5-fde4-475b-9d34-818fcf22f331.png)|

commit 893233954bb0afc95332b054c846c72ef5bac661
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Thu Nov 24 15:00:36 2022 +0000

    ADS: Edit padding-end toggle in ListItems (#2560)

    <!--
    Note: This checklist is a reminder of our shared engineering
    expectations.
    The items in Bold are required
    If your PR involves UI changes:
    1. Upload screenshots or screencasts that illustrate the changes before
    / after
    2. Add them under the UI changes section (feel free to add more columns
    if needed)
        3. Make sure these changes are tested in API 23 and API 26
    If your PR does not involve UI changes, you can remove the **UI
    changes** section
    -->

    Task/Issue URL:
    https://app.asana.com/0/1202857801505092/1203433424223914/f

    ### Description
    Increase padding-end for OneLineListItem and TwoLineListItem when
    showing switch

    ### Steps to test this PR

    - Install from this branch
    - Go to Settings > Design Preview
    - [ ] Check List Items with toggle look as expected

    ### UI changes
    | Before  | After |
    | ------ | ----- |

    ![autoconsent_old_light](https://user-images.githubusercontent.com/20798495/203793730-c9d9883e-c2a8-48bd-8a9e-6c19288f2f92.jpg)|![padding-end_16dp](https://user-images.githubusercontent.com/20798495/203793656-dae94b23-c40c-4d3b-8dce-65f8f9a4f539.jpg)|

commit b1eeda4de44a159f00b896d1a634cf97ca412a1b
Author: David González <malmstein@gmail.com>
Date:   Wed Nov 23 17:15:33 2022 +0100

…
  • Loading branch information
malmstein committed Jan 13, 2023
1 parent 1131135 commit bb3341d
Show file tree
Hide file tree
Showing 88 changed files with 394 additions and 302 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ internal class TrackersLottieAssetDelegate(
}

private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = context.getColorFromAttr(com.duckduckgo.mobile.android.R.attr.daxColorSurface)
color = context.getColorFromAttr(com.duckduckgo.mobile.android.R.attr.daxColorContainer)
typeface = Typeface.SANS_SERIF
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.CompoundButton
import android.widget.TextView
import androidx.annotation.StringRes
import androidx.appcompat.content.res.AppCompatResources
import androidx.lifecycle.LifecycleOwner
Expand Down Expand Up @@ -48,7 +47,9 @@ import com.duckduckgo.app.sitepermissions.SitePermissionsListViewType.SITE_ALLOW
import com.duckduckgo.app.sitepermissions.SitePermissionsListViewType.TOGGLE
import com.duckduckgo.mobile.android.databinding.RowOneLineListItemBinding
import com.duckduckgo.mobile.android.ui.menu.PopupMenu
import com.duckduckgo.mobile.android.ui.view.PopupMenuItemView
import com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
import com.duckduckgo.mobile.android.ui.view.setEnabledOpacity
import kotlinx.coroutines.launch

class SitePermissionsAdapter(
Expand Down Expand Up @@ -163,8 +164,11 @@ class SitePermissionsAdapter(

private fun showOverflowMenu(removeDisabled: Boolean) {
val popupMenu = PopupMenu(layoutInflater, layout.popup_window_remove_all_menu)
val menuItem = popupMenu.contentView.findViewById<TextView>(R.id.removeAll)
if (removeDisabled) menuItem.isEnabled = false
val menuItem = popupMenu.contentView.findViewById<PopupMenuItemView>(R.id.removeAll)
if (removeDisabled) {
menuItem.isEnabled = false
menuItem.setEnabledOpacity(false)
}
popupMenu.apply {
onMenuItemClicked(menuItem) { viewModel.removeAllSitesSelected() }
show(binding.root, binding.sitePermissionsSectionHeader)
Expand Down
26 changes: 0 additions & 26 deletions app/src/main/res/drawable/ic_find_search_20_dark.xml

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/drawable/network_logo_adform.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:viewportHeight="24">
<path
android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
android:fillColor="?attr/daxColorSurface"/>
android:fillColor="?attr/daxColorContainer"/>
<path
android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12ZM9.5491,9.4178C9.6288,8.9399 9.899,8.6545 10.4179,8.7842C10.7171,8.8588 10.7661,8.6755 10.8105,8.5094L10.8105,8.5094C10.8227,8.4638 10.8346,8.4195 10.8511,8.3822C10.9542,8.1497 10.7699,8.1067 10.6201,8.0717C10.5913,8.0649 10.5638,8.0585 10.5398,8.0511C9.7405,7.8037 8.8578,8.487 8.8385,9.4091C8.8196,10.3205 8.823,11.2323 8.8264,12.1441V12.1442V12.1442V12.1442V12.1442V12.1442C8.8281,12.6026 8.8298,13.0611 8.8287,13.5194C8.8282,13.7709 8.8326,13.9813 9.1875,13.9609C9.5126,13.942 9.548,13.763 9.5449,13.4983C9.5348,12.6623 9.535,11.8263 9.5466,10.9903C9.5471,10.9552 9.5422,10.9157 9.5372,10.875L9.5372,10.8749C9.5194,10.7292 9.4995,10.5677 9.7169,10.5361C10.0431,10.4885 10.1072,10.2672 10.1722,10.0425C10.1873,9.9903 10.2025,9.938 10.221,9.8875C10.1452,9.8145 10.0225,9.8096 9.902,9.8048C9.6914,9.7965 9.4872,9.7884 9.5491,9.4178ZM21.9887,11.0877C21.9544,9.9745 20.8841,9.3622 19.8987,9.9065C19.6342,10.0526 19.4883,10.0499 19.2266,9.9108C18.1995,9.3647 17.1586,9.9837 17.108,11.1484C17.0962,11.4203 17.0994,11.693 17.1026,11.9656C17.104,12.0893 17.1055,12.213 17.1055,12.3367C17.1056,12.4335 17.1059,12.5303 17.1061,12.6271C17.1069,12.8799 17.1076,13.1327 17.1048,13.3853C17.1045,13.412 17.1038,13.4388 17.103,13.4654C17.0958,13.717 17.0891,13.95 17.4901,13.9525C17.856,13.9546 17.8398,13.746 17.8242,13.5454V13.5453C17.8208,13.5017 17.8175,13.4585 17.8181,13.4179C17.8248,12.9689 17.8237,12.5198 17.8227,12.0706V12.0706V12.0706V12.0697C17.8221,11.7967 17.8214,11.5237 17.8225,11.2507C17.8244,10.7973 18.0208,10.4402 18.4938,10.4328C19.0059,10.4249 19.2055,10.7815 19.1985,11.2764C19.1924,11.6887 19.1933,12.101 19.1942,12.5133V12.5137C19.1949,12.8237 19.1956,13.1337 19.1933,13.4437L19.1932,13.4519C19.1914,13.7214 19.1898,13.953 19.5795,13.9373C19.9106,13.9243 19.9077,13.7268 19.9047,13.5196C19.9045,13.5043 19.9043,13.489 19.9042,13.4737C19.9041,13.4672 19.9041,13.4607 19.9041,13.4542C19.906,12.7318 19.9058,12.0094 19.9039,11.2869C19.9025,10.8033 20.0984,10.4245 20.6088,10.4318C21.1173,10.4389 21.2983,10.8142 21.289,11.3043C21.279,11.8294 21.281,12.3548 21.283,12.8802C21.2839,13.1006 21.2847,13.321 21.2847,13.5413L21.2846,13.5721C21.2838,13.7762 21.2831,13.9658 21.5979,13.9512C21.885,13.9379 22.0065,13.8419 21.9997,13.5342C21.9914,13.1539 21.9939,12.7733 21.9964,12.3927V12.3925V12.3925V12.3925V12.3925V12.3925V12.3924C21.9992,11.9573 22.002,11.5223 21.9887,11.0877ZM13.4538,10.926C13.2566,10.6297 13.1874,10.3032 13.4521,10.1254C13.6526,9.9906 13.8029,10.1934 13.933,10.3688L13.933,10.3689L13.933,10.3689L13.933,10.3689C13.9661,10.4135 13.9978,10.4563 14.0288,10.4914C14.6372,11.1817 14.7329,12.1341 14.3085,12.963C13.8856,13.789 13.0762,14.2308 12.1235,14.1559C11.1998,14.0833 10.5255,13.4946 10.2117,12.487L10.2098,12.478C10.2065,12.466 10.2041,12.4541 10.2017,12.4422L10.2017,12.4422L10.2017,12.4421C10.1998,12.4329 10.1979,12.4237 10.1956,12.4145L10.1942,12.4085C10.186,12.3753 10.1777,12.3418 10.1721,12.309C9.947,11.1503 10.6324,10.0849 11.8207,9.8C12.0317,9.6772 12.2631,9.6797 12.4943,9.693C12.5219,9.6945 12.5515,9.695 12.5819,9.6955C12.7485,9.6981 12.9381,9.7011 12.9525,9.89C12.9698,10.1168 12.8147,10.3825 12.5501,10.3735C11.8306,10.3492 11.3639,10.7718 10.897,11.2158C10.6538,11.8924 10.9184,12.473 11.242,13.0425C12.1082,13.5951 12.817,13.5833 13.3964,13.0068C13.9714,12.4345 14.0059,11.7555 13.4538,10.926ZM16.6127,9.7153C15.8341,9.5794 15.0833,10.1881 15.0245,11.0085C15.0028,11.3117 15.0083,11.6169 15.0139,11.9222V11.9222V11.9222V11.9222C15.0164,12.06 15.0189,12.1977 15.0189,12.3353H15.0162C15.0162,12.4537 15.0174,12.5722 15.0186,12.6906C15.0214,12.9682 15.0243,13.2457 15.0116,13.5225C14.9987,13.8012 15.061,13.9633 15.3803,13.9673C15.7288,13.9717 15.7342,13.7559 15.7324,13.505C15.73,13.1641 15.7303,12.8232 15.7307,12.4823V12.4823C15.731,12.1246 15.7314,11.767 15.7286,11.4094C15.724,10.8217 15.8858,10.3789 16.5909,10.4433C16.9263,10.474 16.9924,10.1956 17.0347,10.0173L17.0363,10.0108C17.0962,9.7588 16.8871,9.7412 16.7166,9.7268C16.679,9.7236 16.6432,9.7206 16.6127,9.7153ZM6.8255,13.4408C7.2439,13.4327 7.526,13.2139 7.5484,12.7626C7.5577,12.5751 7.5555,12.387 7.5534,12.1989V12.1989C7.5524,12.109 7.5514,12.0192 7.5516,11.9294C7.5524,11.6749 7.5529,11.4201 7.5523,11.1656C7.5513,10.6758 7.2607,10.4294 6.8161,10.425C6.3776,10.4208 6.0634,10.6411 6.0618,11.1411L6.0606,11.4341C6.0589,11.8688 6.0571,12.3035 6.0636,12.7382C6.071,13.2319 6.3734,13.4494 6.8255,13.4408ZM7.8837,8.26C8.1382,8.2571 8.2696,8.3327 8.2651,8.6152C8.2572,9.1203 8.2586,9.6255 8.26,10.1307V10.1307C8.2606,10.3462 8.2612,10.5617 8.2611,10.7772C8.2609,10.9881 8.2623,11.199 8.2637,11.4099V11.41V11.41C8.2668,11.8733 8.2699,12.3367 8.2567,12.7995C8.2335,13.6201 7.6445,14.1588 6.8065,14.1595C5.9642,14.1603 5.3788,13.6233 5.3543,12.8047C5.3393,12.3028 5.3452,11.8004 5.351,11.2983L5.3522,11.2007C5.3636,10.197 6.031,9.5478 7.0119,9.7313C7.5838,9.8383 7.5753,9.6088 7.553,9.2181C7.5466,9.1053 7.5486,8.992 7.5506,8.8787V8.8786C7.5522,8.7826 7.5539,8.6865 7.5505,8.5907C7.5421,8.3537 7.6494,8.2627 7.8837,8.26ZM3.4266,13.4424C3.0402,13.4409 2.7434,13.2422 2.7211,12.8273C2.7033,12.4984 3.4526,12.0701 3.9453,12.0775C4.2316,12.0819 4.2038,12.2313 4.179,12.3644C4.1652,12.4385 4.1523,12.5076 4.1952,12.5436C4.2219,13.1363 3.9694,13.4444 3.4266,13.4424ZM4.1099,9.8435C3.5886,9.5911 3.0654,9.6416 2.5839,9.9637C2.5628,9.9779 2.5384,9.9922 2.5129,10.0071L2.5129,10.0071C2.3768,10.0868 2.2112,10.1838 2.3558,10.3677C2.3664,10.3812 2.3772,10.3954 2.3884,10.4101L2.3884,10.4102C2.5064,10.5654 2.663,10.7712 2.928,10.6021C3.1522,10.4591 3.3854,10.3596 3.652,10.4436C3.9344,10.5326 4.1707,10.696 4.1863,11.0177C4.1988,11.2807 4.0144,11.3181 3.8332,11.3549L3.8331,11.3549C3.7839,11.3649 3.7348,11.3748 3.6901,11.3892C3.5951,11.4198 3.4985,11.447 3.4019,11.4743L3.4018,11.4743C3.1836,11.5358 2.9653,11.5974 2.7662,11.6973C1.8529,12.1566 1.7329,13.2909 2.5314,13.8686C3.0219,14.2236 3.5662,14.2715 4.1178,14.0157C4.6578,13.7654 4.9161,13.3301 4.9014,12.7323C4.8972,12.5565 4.8983,12.3807 4.8994,12.2048V12.2048L4.8994,12.2046C4.9,12.1243 4.9005,12.044 4.9005,11.9638H4.9035C4.9035,11.8756 4.9029,11.7873 4.9022,11.6991C4.9008,11.5078 4.8993,11.3165 4.9047,11.1255C4.922,10.521 4.6335,10.0974 4.1099,9.8435Z"
android:fillColor="?attr/toolbarIconColor"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/network_logo_adobe_inc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:viewportHeight="24">
<path
android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
android:fillColor="?attr/daxColorSurface"/>
android:fillColor="?attr/daxColorContainer"/>
<path
android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12ZM5,18.3704V6H10.1852L5,18.3704ZM12.1111,15.8518H9.7407L11.9629,10.5185L15.2963,18.3704H13.1481L12.1111,15.8518ZM19,18.3706V6.0002H13.8148L19,18.3706Z"
android:fillColor="?attr/toolbarIconColor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:viewportHeight="24">
<path
android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
android:fillColor="?attr/daxColorSurface"/>
android:fillColor="?attr/daxColorContainer"/>
<path
android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12ZM12.8188,9.0844C11.2969,9.1406 7.5219,9.5688 7.5219,12.7563C7.5219,16.1781 11.8438,16.3188 13.2563,14.1062C13.4594,14.425 14.3625,15.2781 14.6719,15.5688L16.4469,13.8188C16.4469,13.8188 15.4375,13.0281 15.4375,12.1687V7.5719C15.4375,6.7813 14.6719,5 11.9281,5C9.1781,5 7.7188,6.7188 7.7188,8.2594L10.0156,8.4719C10.525,6.925 11.7094,6.925 11.7094,6.925C12.8477,6.9222 12.8371,7.6704 12.8223,8.708V8.7081C12.8205,8.8298 12.8188,8.9555 12.8188,9.0844ZM12.8188,11.7969C12.8188,14.2969 10.1875,13.9219 10.1875,12.3344C10.1875,10.8594 11.7656,10.5625 12.8188,10.5281V11.7969ZM11.6156,19C14.8813,19 16.8281,17.2188 17.0688,16.9062C17.3125,16.5938 17.1313,16.4156 16.8969,16.5312C11.2294,19.2162 7.6771,17.0562 5.3819,15.6607L5.2562,15.5844C5.1156,15.4906 4.8719,15.6031 5.0844,15.8438C5.85,16.7656 8.35,19 11.6156,19ZM18.3125,16.975C18.1094,17.4688 17.8125,17.8125 17.65,17.9438C17.4781,18.0844 17.3531,18.0281 17.4469,17.825C17.5406,17.6219 18.05,16.3719 17.8438,16.1063C17.6566,15.8673 16.8329,15.9546 16.4356,15.9967C16.4016,16.0003 16.3708,16.0035 16.3438,16.0063C16.2639,16.0136 16.199,16.021 16.1462,16.0271L16.1461,16.0271C15.9758,16.0465 15.9301,16.0517 15.9062,15.9969C15.8344,15.8188 16.5844,15.5125 17.0781,15.45C17.5688,15.3938 18.3594,15.425 18.5156,15.6281C18.6313,15.7875 18.5156,16.475 18.3125,16.975Z"
android:fillColor="?attr/toolbarIconColor"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/network_logo_amobee_inc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:viewportHeight="24">
<path
android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
android:fillColor="?attr/daxColorSurface"/>
android:fillColor="?attr/daxColorContainer"/>
<path
android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12ZM11.1667,12.4299C10.7083,12.4299 10.3368,12.0584 10.3368,11.6C10.3368,11.1417 10.7083,10.7701 11.1667,10.7701C11.625,10.7701 11.9965,11.1417 11.9965,11.6C11.9965,12.0584 11.625,12.4299 11.1667,12.4299ZM11.1667,10C10.2826,10 9.5667,10.716 9.5667,11.6C9.5667,12.4841 10.2833,13.2 11.1667,13.2C12.0507,13.2 12.7667,12.4833 12.7667,11.6C12.7667,10.716 12.05,10 11.1667,10ZM20.3333,12.4063V11.9139H21.8229V11.2355H20.3333V10.7653H21.9778V10.0341H19.4868V13.1375H22V12.4063H20.3333ZM7.4278,11.2355L6.6875,10.0341H5.7791V13.1368H6.6257V11.3639L7.2965,12.3924L7.309,12.4112L7.3354,12.4466C7.3555,12.4743 7.3847,12.4896 7.4222,12.4896C7.4597,12.4896 7.4895,12.475 7.5097,12.4466L7.5396,12.4007L8.2208,11.3549V13.1368H9.0764V10.0341H8.168L7.4278,11.2355ZM18.8368,11.9139H17.3472V12.4063H19.0139V13.1375H16.5007V10.0341H18.9917V10.7653H17.3472V11.2355H18.8368V11.9139ZM4.0594,11.9264L3.7166,11.0507L3.3687,11.9264H4.0594ZM2,13.1368L3.3118,10.0341H4.1347L5.4458,13.1368H4.5305L4.3062,12.5869H3.118L2.8979,13.1368H2ZM15.1771,12.1625C15.1771,12.2542 15.1416,12.3243 15.0708,12.3729C15,12.4215 14.8979,12.4459 14.7653,12.4459H14.1V11.8743H14.7562C14.9007,11.8743 15.0069,11.9 15.075,11.95C15.143,12 15.1771,12.0681 15.1771,12.1535V12.1625ZM14.1,10.725H14.6583C14.7882,10.725 14.8854,10.7479 14.9507,10.7938C15.0159,10.8396 15.0486,10.9056 15.0486,10.991V11C15.0486,11.0917 15.0138,11.1598 14.9444,11.2042C14.875,11.2486 14.7736,11.2709 14.641,11.2709L14.1,11.2702V10.725ZM15.4194,11.5153C15.5576,11.4563 15.6715,11.3709 15.7611,11.2604C15.8507,11.1493 15.8958,11.0042 15.8958,10.8237V10.8146C15.8958,10.7076 15.8778,10.6132 15.8423,10.5306C15.8069,10.4479 15.7583,10.375 15.6965,10.3132C15.6048,10.2216 15.4902,10.1521 15.3514,10.1049C15.2125,10.0576 15.0458,10.0341 14.8513,10.0341H13.2625V13.1368H14.8625C15.2347,13.1368 15.5236,13.0618 15.7291,12.9111C15.9347,12.7605 16.0375,12.5507 16.0375,12.2819V12.273C16.0375,12.0632 15.9819,11.9 15.8708,11.7834C15.7597,11.6667 15.609,11.5771 15.4194,11.5153Z"
android:fillColor="?attr/toolbarIconColor"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/network_logo_appnexus_inc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:viewportHeight="24">
<path
android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
android:fillColor="?attr/daxColorSurface"/>
android:fillColor="?attr/daxColorContainer"/>
<path
android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12ZM13.2467,12.192C14.811,13.4728 16.6284,14.1256 18.6402,14.2624C18.9234,14.2817 19.0452,14.2387 19.0391,13.9024C19.0158,12.6152 19.0236,11.3273 19.035,10.0398C19.0372,9.7821 18.983,9.6675 18.6979,9.6633C18.4237,9.6592 18.145,9.6034 17.8778,9.5335C15.884,9.0123 14.4957,7.3461 14.3428,5.2892C14.3264,5.0681 14.259,4.9951 14.0323,5.0002C13.5573,5.0112 13.0821,5.0092 12.6069,5.0072H12.6068C12.4209,5.0065 12.2349,5.0057 12.0489,5.0057L11.4225,5.0057L10.1697,5.0057C9.7239,5.0057 9.7124,5.0066 9.7448,5.4559C9.9423,8.2043 11.1211,10.4517 13.2467,12.192ZM13.902,16.3019C12.7893,12.6953 9.4361,9.8478 5.2888,9.6887C5.0367,9.679 5.0021,9.764 5.0055,9.978C5.013,10.4623 5.0117,10.9466 5.0104,11.431C5.0098,11.6194 5.0093,11.8078 5.0093,11.9962C5.0093,12.178 5.01,12.3599 5.0107,12.5418C5.0125,12.9979 5.0142,13.454 5.005,13.9099C5.0002,14.1524 5.033,14.2585 5.3272,14.2826C6.9362,14.4143 8.1728,15.1872 9.035,16.5486C9.465,17.2281 9.6702,17.9846 9.7249,18.7826C9.734,18.915 9.7474,18.996 9.9138,18.9953C11.3172,18.9903 12.7205,18.9912 14.1242,18.9945C14.27,18.9947 14.3306,18.9539 14.3213,18.7953C14.2709,17.9487 14.153,17.1152 13.902,16.3019ZM18.7381,15.468L18.7606,15.4689C18.9621,15.477 19.0364,15.5554 19.0342,15.7664C19.024,16.7514 19.0243,17.7366 19.034,18.7217C19.0359,18.9318 18.9784,18.9998 18.7616,18.9975C17.7651,18.9865 16.7683,18.9902 15.7715,18.9952C15.607,18.996 15.5184,18.9701 15.5182,18.7728C15.5166,17.3031 15.1567,15.9118 14.5776,14.5704C14.5563,14.5412 14.5427,14.5101 14.5818,14.4875C14.5862,14.485 14.599,14.4972 14.6118,14.5093C14.6177,14.5149 14.6236,14.5205 14.6286,14.5247V14.5245C15.6382,14.9348 16.667,15.2792 17.7557,15.4045C18.0815,15.442 18.4103,15.455 18.7381,15.468H18.7381ZM5.2264,8.4777C5.4923,8.4787 5.759,8.4967 6.024,8.5229C7.2089,8.6393 8.3406,8.9568 9.4401,9.461C9.4458,9.4332 9.4515,9.4122 9.456,9.396C9.4628,9.3708 9.4666,9.357 9.4622,9.3469C8.8668,8.0325 8.5527,6.6532 8.515,5.212C8.5104,5.0344 8.4337,5.003 8.2809,5.0035C7.2601,5.0076 6.2392,5.0091 5.2183,5.0026C5.0434,5.0013 5.006,5.0715 5.0068,5.229C5.0118,6.2383 5.0123,7.2476 5.0065,8.2567C5.0056,8.4225 5.061,8.477 5.2264,8.4777ZM5.0035,15.8352C4.9913,15.5642 5.0624,15.4803 5.346,15.5004C6.7799,15.6023 8.1401,16.7857 8.4195,18.1984C8.5766,18.9927 8.5766,18.9927 7.7656,18.9927M5.0035,15.8352C5.0184,16.1601 5.0152,16.4859 5.012,16.8117L5.0035,15.8352ZM5.012,16.8117C5.0106,16.9491 5.0093,17.0864 5.0093,17.2237L5.012,16.8117ZM5.0093,17.2237C5.0093,17.3651 5.0111,17.5066 5.0129,17.6481L5.0093,17.2237ZM5.0129,17.6481L5.0129,17.6482L5.0129,17.6481ZM5.0129,17.6482C5.0173,17.9816 5.0216,18.3149 5.0019,18.6469L5.0129,17.6482ZM5.0019,18.6469C4.984,18.9498 5.0915,19.0062 5.3701,18.9995L5.0019,18.6469ZM5.3701,18.9995C5.9433,18.9857 6.517,18.9882 7.0906,18.9907L5.3701,18.9995ZM18.7022,8.4671C18.9227,8.4881 19.0399,8.4577 19.0357,8.1861C19.0208,7.2244 19.0212,6.2623 19.0356,5.3008C19.0395,5.0412 18.9387,4.9942 18.7106,5.0011C18.3724,5.0115 18.0337,5.0093 17.6951,5.0072H17.6951C17.5585,5.0064 17.4219,5.0055 17.2854,5.0054H16.138C15.8023,5.0054 15.635,5.0054 15.5679,5.0874C15.5013,5.1688 15.5335,5.331 15.5977,5.6543L15.5977,5.6543C15.8938,7.1478 17.1955,8.3242 18.7022,8.4671Z"
android:fillColor="?attr/toolbarIconColor"
Expand Down
Loading

0 comments on commit bb3341d

Please sign in to comment.