Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit c565bd1a081b84117cc84a8fb1bf06aa87f0ba5f
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Thu Jan 12 13:42:09 2023 +0000

    Edited side paddings for survey title

commit ba4d0164a6f0ccfe6f5b76f6c21d77c3f5ca871a
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Thu Jan 12 12:41:08 2023 +0000

    Changes in survey activity after design review

commit 438bb2fdfb287fbec081125ee431182584afb93c
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Wed Jan 11 17:29:09 2023 +0000

    Changed cta buttons after design review

commit deb4fde7e84e929008eac6f597151b5e35db1064
Author: Noelia Alcala <nalcalag@gmail.com>
Date:   Wed Jan 11 15:49:29 2023 +0000

    Survey migration to new components

commit 40fe7372f61bd6fd45f6df77446c96d3ae46fab1
Author: David González <malmstein@gmail.com>
Date:   Thu Jan 12 09:44:32 2023 +0100

    ADS: Fix Dax Bubble (#2706)

    <!--
    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/1157893581871903/1203641318924982

    ### Description
    This PR fixes. the issue in Android 8 where the dax bubble wasn't
    appearing

    ### Steps to test this PR

    _Fresh install_
    - [ ] Fresh install
    - [ ] Ensure Dax Bubble appears during onboarding

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

    ADS: Destructive Colors (#2703)

    <!--
    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/1203560741717081

    ### Description
    This PR updates the colors of destructive primary and ghost buttons

commit 43911b5dd8b8da350755b21e5cd9a914b3152349
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 a2fbec1e7b6c3799d9d794a415f28820ab651776
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 a85726ff0caf36af9168be8f40a4123053dff11f
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 c16f11613a2a88ab324f6b078651d30c28181025
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 a8ee5dd9d01d1af0e689eecd98f462d7eb91e281
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 e77ff2884a31dbbc097e31938b26d2aeabe49d96
Author: nalcalag <nalcalag@gmail.com>
Date:   Tue Dec 27 13:43:56 2022 +0000

    Updated back arrow resource

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

    fix rebasing conflict

commit e484829808246d8c110b0902ef84c08186ec4c8e
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 c6cc886a670def8b650888e7d0e3f449fd90462c
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 204ba4eedb473ca736b3cef35b67acd949556fba
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 d47d3e46ba737d16b5550a42bed4730890862992
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 dd68f36a60a7aa8da948657fb7a74f0e82093b1a
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 de881669e67907a4e50d0b615983fcf56dbe9b82
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 e59e298ebb8e0e41398ae1022efd29b82735418f
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 bc5c2d9684d52e0d9e86b6b3e66c82de25db3a02
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 f0e3911f099ec10f6423a0a8c091119e256f479f
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 711e42360441fb551076271cbffad4dec5ea77b8
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 2c1c865f4c711252d6b1efbd42b145327c238919
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 88ea96a4b411f0271e3b43bad55d1c48e88713b3
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 ecd3909b91ad48834cc68dd84b992d14e9c675b5
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 f27b6a1a85c7ff28cf2dac9ecbd33e9a7f84979d
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 49cb159ad426a27836364f91e4a8acd89315aa2e
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 3ca79c3a7f7a6b5b96fe96f5193712909e6fe028
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 2678f707dc33bbbe24bf78c28558413ea6c8835e
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 58b07285b73b2b2cefa124d5f130bcdccc791c5d
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 82c1763026212d02de294fa8a7d07943cd3f7311
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 f831bd4a6a3b70d3665407ef2634de297559217e
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 26262dd3788f3813c1c4f755137388da8e1b3181
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 810577e7addbed5a4e3e19fc62228acc97743501
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 15:11:56 2022 +0100

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

    Reverts #2567

commit b8285dbd3a549bf522a02fd4af273fb828f010fd
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 69a4a11af1f6152a65ee98487e00cc3be34dbbc9
Author: David <malmstein@gmail.com>
Date:   Mon Nov 28 14:01:04 2022 +0100

    rollback GPL

commit 8b69faf922f167cd4efb9fd434a5e6622f30096a
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 590ea0352cb406f32660c35cf8116dc7c8260265
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 1f8be32e66616d434eb87f3efe271dd8390d9a09
Author: David González <malmstein@gmail.com>
Date:   Mon Nov 28 15:11:56 2022 +0100

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

    Reverts #2567

commit 48c8706b1341d2b1d16481c4bb603a47a6be6a66
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 b483e5e559af2988b6ac3bfe4a88027f272d467d
Author: David <malmstein@gmail.com>
Date:   Mon Nov 28 14:01:04 2022 +0100

    rollback GPL

commit 625d74261a4f8f2617eb62a0db5014a3a1fb1c69
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 2513a9d1c1345ba454a170e0547f8402b7e949a4
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 44f0950f063238b4252df848da18e837b65a6333
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 350ee7783222cca0f111961a4ea3378108e7ed24
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 3197ed39e48befb6587615ea1e91770f3a4fd7df
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 577290a520a5ecfe13f825d5c722b7f93dd4c6cf
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 1a5fd7b81e6181f2bdb1e0813323399aa7439865
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 88f52e927acbe8080bdbb5a590fcae0c1c72695d
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.
  • Loading branch information
nalcalag committed Jan 12, 2023
1 parent 33cfac4 commit 946f992
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 125 deletions.
23 changes: 0 additions & 23 deletions app/src/main/res/drawable/button_contained_bg.xml

This file was deleted.

22 changes: 0 additions & 22 deletions app/src/main/res/drawable/button_outlined_bg.xml

This file was deleted.

9 changes: 3 additions & 6 deletions app/src/main/res/drawable/survey_background.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/cornflowerBlue" />
<stroke
android:width="1dp"
android:color="@color/cornflowerBlue" />
<solid android:color="?attr/daxColorAccentBlue" />
<corners
android:topLeftRadius="12dp"
android:topRightRadius="12dp" />
android:topLeftRadius="@dimen/mediumShapeCornerRadius"
android:topRightRadius="@dimen/mediumShapeCornerRadius" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/layout-w600dp/include_cta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:id="@+id/cta"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="@drawable/rounded_top_corners_bottom_sheet_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
Expand Down
64 changes: 25 additions & 39 deletions app/src/main/res/layout/activity_user_survey.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,48 +18,40 @@

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.duckduckgo.app.feedback.ui.common.FeedbackActivity">
android:layout_height="match_parent">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/surveyActivityContainerViewGroup"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/survey_background">

<TextView
<com.duckduckgo.mobile.android.ui.view.text.DaxTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:gravity="center_horizontal"
android:letterSpacing="0.18"
android:paddingStart="30dp"
android:paddingEnd="30dp"
android:paddingTop="22dp"
android:paddingBottom="22dp"
android:layout_height="56dp"
android:gravity="center"
android:paddingStart="@dimen/keyline_4"
android:paddingEnd="@dimen/keyline_4"
android:text="@string/surveyTitle"
android:textAllCaps="true"
android:textColor="@color/white"
android:textSize="12sp"
android:textStyle="normal"
android:textColor="?daxColorWhite"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:typography="h2" />

<com.duckduckgo.mobile.android.ui.view.button.IconButton
<ImageView
android:id="@+id/dismissButton"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
app:srcCompat="@drawable/ic_close_24"
app:backgroundTint="@color/carolinaBlue"
android:layout_marginEnd="@dimen/keyline_4"
android:background="?attr/selectableItemBackgroundBorderless"
app:contentDescription="@string/surveyDismissContentDescription"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/title" />
app:layout_constraintTop_toTopOf="@id/title"
app:srcCompat="@drawable/ic_close_24"
app:tint="?attr/daxColorWhite" />

<WebView
android:id="@+id/webView"
Expand All @@ -72,12 +64,12 @@

<ProgressBar
android:id="@+id/progress"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminateTint="@color/white"
android:indeterminateTint="?daxColorWhite"
android:indeterminateTintMode="src_in"
android:secondaryProgressTint="@color/white"
android:secondaryProgressTint="?daxColorWhite"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -86,42 +78,36 @@

<LinearLayout
android:id="@+id/errorView"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="30dp"
android:paddingTop="16dp"
android:paddingEnd="30dp"
android:paddingBottom="16dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintVertical_bias="0.34">

<TextView
<com.duckduckgo.mobile.android.ui.view.text.DaxTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:fontFamily="sans-serif-medium"
android:lineSpacingExtra="-4sp"
android:text="@string/surveyLoadingErrorTitle"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="28sp"
android:textStyle="normal" />
android:textColor="?daxColorWhite"
app:typography="h1" />

<TextView
<com.duckduckgo.mobile.android.ui.view.text.DaxTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:lineSpacingExtra="8sp"
android:text="@string/surveyLoadingErrorText"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="normal" />
android:textColor="?daxColorWhite"
app:typography="body1" />

</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/include_cta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:id="@+id/cta"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?toolbarBgColor"
android:background="@drawable/rounded_top_corners_bottom_sheet_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
Expand Down
37 changes: 13 additions & 24 deletions app/src/main/res/layout/include_cta_buttons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,25 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end"
android:orientation="horizontal">

<com.duckduckgo.mobile.android.ui.view.button.ButtonGhostLarge
<com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
android:id="@+id/ctaDismissButton"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_marginStart="16dp"
android:layout_marginTop="22dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
android:layout_weight="1"
android:background="@drawable/button_outlined_bg"
android:foreground="?attr/selectableItemBackgroundBorderless"
android:textColor="?attr/buttonOutlinedTextColor"
android:textSize="13sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_4"
android:layout_marginEnd="@dimen/keyline_2"
android:layout_marginBottom="@dimen/keyline_4"
tools:text="@string/surveyCtaDismissButton" />

<com.duckduckgo.mobile.android.ui.view.button.ButtonGhostLarge
<com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
android:id="@+id/ctaOkButton"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_marginStart="8dp"
android:layout_marginTop="22dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:layout_weight="1"
android:background="@drawable/button_contained_bg"
android:foreground="?attr/selectableItemBackgroundBorderless"
android:textColor="@color/white"
android:textSize="13sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_4"
android:layout_marginEnd="@dimen/keyline_4"
android:layout_marginBottom="@dimen/keyline_4"
tools:text="@string/surveyCtaLaunchButton" />

</LinearLayout>
14 changes: 5 additions & 9 deletions app/src/main/res/layout/include_cta_content.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,31 @@
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/survey_cta_icon" />

<TextView
<com.duckduckgo.mobile.android.ui.view.text.DaxTextView
android:id="@+id/ctaTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginTop="22dp"
android:layout_marginEnd="30dp"
android:textColor="?attr/callToActionTitleColor"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/ctaIcon"
app:layout_constraintTop_toTopOf="parent"
app:typography="h3"
tools:text="@string/surveyCtaTitle" />

<TextView
<com.duckduckgo.mobile.android.ui.view.text.DaxTextView
android:id="@+id/ctaSubtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="30dp"
android:gravity="top"
android:lineSpacingExtra="4sp"
android:textColor="?attr/callToActionSubtitleColor"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/ctaIcon"
app:layout_constraintTop_toBottomOf="@id/ctaTitle"
app:textType="secondary"
app:typography="body2"
tools:text="@string/surveyCtaDescription" />

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 946f992

Please sign in to comment.