Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 95f7347
Merge: 98dd39c a470d7e
Author: David <malmstein@gmail.com>
Date:   Wed Dec 14 17:11:53 2022 +0100

    Merge branch 'feature/david/ads/browser_dialogs' of ssh://github.com/duckduckgo/Android into feature/david/ads/browser_dialogs

    � Conflicts:
    �	app/src/main/res/drawable-w600dp/onboarding_background.xml
    �	app/src/main/res/drawable/ic_bookmark_20.xml
    �	app/src/main/res/drawable/ic_broken_sites_down_arrow.xml
    �	app/src/main/res/drawable/ic_chevron_down_24_small.xml
    �	app/src/main/res/drawable/ic_chevron_up_24.xml
    �	app/src/main/res/drawable/ic_document_24.xml
    �	app/src/main/res/drawable/ic_find_search_20.xml
    �	app/src/main/res/drawable/ic_find_search_24.xml
    �	app/src/main/res/drawable/ic_keyboard_arrow_down_24dp.xml
    �	app/src/main/res/drawable/ic_location_24.xml
    �	app/src/main/res/drawable/ic_loupe_24dp.xml
    �	app/src/main/res/drawable/ic_loupe_24dp_dark.xml
    �	app/src/main/res/drawable/ic_loupe_24dp_light.xml
    �	app/src/main/res/layout/activity_system_search.xml
    �	app/src/main/res/layout/include_find_in_page.xml
    �	app/src/main/res/layout/include_omnibar_toolbar.xml
    �	app/src/main/res/layout/include_omnibar_toolbar_mockup.xml
    �	app/src/main/res/layout/view_bookmark_folder_entry.xml
    �	common-ui/src/main/res/drawable/ic_add_24.xml
    �	common-ui/src/main/res/drawable/ic_back_24.xml
    �	common-ui/src/main/res/drawable/ic_close.xml
    �	common-ui/src/main/res/layout/dialog_single_choice_alert.xml
    �	common-ui/src/main/res/values/widgets.xml

commit 98dd39c
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 12:48:00 2022 +0100

    remove unnecessary padding in system dialog

commit a6c92d7
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 10:29:58 2022 +0100

    Update common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/dialog/TextAlertDialogBuilder.kt

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

commit 756df2d
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 11:47:17 2022 +0100

    remove location dialogs in favor of ads ones

commit 5dd39bd
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 10:05:08 2022 +0100

    Update common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/dialog/StackedAlertDialogBuilder.kt

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

commit 640fe07
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 10:04:58 2022 +0100

    Update common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/dialog/RadioListAlertDialogBuilder.kt

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

commit 31ba8b7
Author: David <malmstein@gmail.com>
Date:   Tue Dec 13 17:24:29 2022 +0100

    dialog padding

commit 040738d
Author: David <malmstein@gmail.com>
Date:   Tue Dec 13 14:03:04 2022 +0100

    code formatting

commit 1909133
Author: Aitor Viana <aitorvs@gmail.com>
Date:   Tue Dec 13 12:29:23 2022 +0000

    browser_dialogs

commit a470d7e
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 12:48:00 2022 +0100

    remove unnecessary padding in system dialog

commit 35f2d43
Merge: c3bd101 8345e20
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 11:47:42 2022 +0100

    Merge branch 'feature/david/ads/browser_dialogs' of github.com:duckduckgo/Android into feature/david/ads/browser_dialogs

commit c3bd101
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 11:47:17 2022 +0100

    remove location dialogs in favor of ads ones

commit 8345e20
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 10:29:58 2022 +0100

    Update common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/dialog/TextAlertDialogBuilder.kt

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

commit f91bae6
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 10:05:08 2022 +0100

    Update common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/dialog/StackedAlertDialogBuilder.kt

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

commit d2fcadd
Author: David González <malmstein@gmail.com>
Date:   Wed Dec 14 10:04:58 2022 +0100

    Update common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/dialog/RadioListAlertDialogBuilder.kt

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

commit 3e0e985
Author: David <malmstein@gmail.com>
Date:   Tue Dec 13 17:24:29 2022 +0100

    dialog padding

commit 0f71cf9
Author: David <malmstein@gmail.com>
Date:   Tue Dec 13 14:03:04 2022 +0100

    code formatting

commit fc1bda5
Author: Aitor Viana <aitorvs@gmail.com>
Date:   Tue Dec 13 12:29:23 2022 +0000

    browser_dialogs

commit 3e9debe
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 e834e4f
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 554b333
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 fe9e68b
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 cddd415
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 c4e5556
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 d158ef1
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 8d679ee
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 bf33458
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

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

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

commit 326e18e
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 8dd1019
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 b4c9f30
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 cdb6505
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 3ee3561
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 5350187
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 e7d13af
Author: David <malmstein@gmail.com>
Date:   Mon Nov 28 14:01:04 2022 +0100

    rollback GPL

commit 9c56912
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 b8b20dd
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 f55aa5b
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 8ecc230
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 6c2c9f5
Author: David <malmstein@gmail.com>
Date:   Mon Nov 28 14:01:04 2022 +0100

    rollback GPL

commit 4db21e6
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 dee1454
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 8fdee27
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 a333c53
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 9fc2c34
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 ee741b3
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 ed3344e
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 5684692
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
malmstein committed Dec 14, 2022
1 parent a69bf8f commit 4f2cc07
Show file tree
Hide file tree
Showing 41 changed files with 793 additions and 1,122 deletions.
83 changes: 77 additions & 6 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ import com.duckduckgo.app.browser.BrowserViewModel.Command.Query
import com.duckduckgo.app.browser.BrowserViewModel.Command.Refresh
import com.duckduckgo.app.browser.databinding.ActivityBrowserBinding
import com.duckduckgo.app.browser.databinding.IncludeOmnibarToolbarMockupBinding
import com.duckduckgo.app.browser.rating.ui.AppEnjoymentDialogFragment
import com.duckduckgo.app.browser.rating.ui.GiveFeedbackDialogFragment
import com.duckduckgo.app.browser.rating.ui.RateAppDialogFragment
import com.duckduckgo.app.browser.shortcut.ShortcutBuilder
import com.duckduckgo.app.cta.ui.CtaViewModel
import com.duckduckgo.app.di.AppCoroutineScope
Expand All @@ -52,6 +49,7 @@ import com.duckduckgo.app.global.ApplicationClearDataState
import com.duckduckgo.app.global.DuckDuckGoActivity
import com.duckduckgo.app.global.events.db.UserEventsStore
import com.duckduckgo.app.global.intentText
import com.duckduckgo.app.global.rating.PromptCount
import com.duckduckgo.app.global.sanitize
import com.duckduckgo.app.global.view.ClearDataAction
import com.duckduckgo.app.global.view.FireDialog
Expand All @@ -68,6 +66,7 @@ import com.duckduckgo.app.statistics.VariantManager
import com.duckduckgo.app.statistics.pixels.Pixel
import com.duckduckgo.app.tabs.model.TabEntity
import com.duckduckgo.di.scopes.ActivityScope
import com.duckduckgo.mobile.android.ui.view.dialog.TextAlertDialogBuilder
import com.duckduckgo.mobile.android.ui.view.gone
import com.duckduckgo.mobile.android.ui.view.show
import com.duckduckgo.mobile.android.ui.viewbinding.viewBinding
Expand Down Expand Up @@ -387,9 +386,9 @@ open class BrowserActivity : DuckDuckGoActivity(), CoroutineScope by MainScope()
is Query -> currentTab?.submitQuery(command.query)
is Refresh -> currentTab?.onRefreshRequested()
is Command.LaunchPlayStore -> launchPlayStore()
is Command.ShowAppEnjoymentPrompt -> showAppEnjoymentPrompt(AppEnjoymentDialogFragment.create(command.promptCount, viewModel))
is Command.ShowAppRatingPrompt -> showAppEnjoymentPrompt(RateAppDialogFragment.create(command.promptCount, viewModel))
is Command.ShowAppFeedbackPrompt -> showAppEnjoymentPrompt(GiveFeedbackDialogFragment.create(command.promptCount, viewModel))
is Command.ShowAppEnjoymentPrompt -> showAppEnjoymentDialog(command.promptCount)
is Command.ShowAppRatingPrompt -> showAppRatingDialog(command.promptCount)
is Command.ShowAppFeedbackPrompt -> showGiveFeedbackDialog(command.promptCount)
is Command.LaunchFeedbackView -> startActivity(FeedbackActivity.intent(this))
}
}
Expand Down Expand Up @@ -572,6 +571,78 @@ open class BrowserActivity : DuckDuckGoActivity(), CoroutineScope by MainScope()
private val Intent.launchedFromRecents: Boolean
get() = (flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY

private fun showAppEnjoymentDialog(promptCount: PromptCount) {
TextAlertDialogBuilder(this)
.setTitle(R.string.appEnjoymentDialogTitle)
.setMessage(R.string.appEnjoymentDialogMessage)
.setPositiveButton(R.string.appEnjoymentDialogPositiveButton)
.setNegativeButton(R.string.appEnjoymentDialogNegativeButton)
.addEventListener(
object : TextAlertDialogBuilder.EventListener() {
override fun onPositiveButtonClicked() {
viewModel.onUserSelectedAppIsEnjoyed(promptCount)
}

override fun onNegativeButtonClicked() {
viewModel.onUserSelectedAppIsNotEnjoyed(promptCount)
}

override fun onDialogShown() {
viewModel.onAppEnjoymentDialogShown(promptCount)
}
},
)
.show()
}

private fun showAppRatingDialog(promptCount: PromptCount) {
TextAlertDialogBuilder(this)
.setTitle(R.string.rateAppDialogTitle)
.setMessage(R.string.rateAppDialogMessage)
.setPositiveButton(R.string.rateAppDialogPositiveButton)
.setNegativeButton(R.string.rateAppDialogNegativeButton)
.addEventListener(
object : TextAlertDialogBuilder.EventListener() {
override fun onPositiveButtonClicked() {
viewModel.onUserSelectedToRateApp(promptCount)
}

override fun onNegativeButtonClicked() {
viewModel.onUserDeclinedToRateApp(promptCount)
}

override fun onDialogShown() {
viewModel.onAppRatingDialogShown(promptCount)
}
},
)
.show()
}

private fun showGiveFeedbackDialog(promptCount: PromptCount) {
TextAlertDialogBuilder(this)
.setTitle(R.string.giveFeedbackDialogTitle)
.setMessage(R.string.giveFeedbackDialogMessage)
.setPositiveButton(R.string.giveFeedbackDialogPositiveButton)
.setNegativeButton(R.string.giveFeedbackDialogNegativeButton)
.addEventListener(
object : TextAlertDialogBuilder.EventListener() {
override fun onPositiveButtonClicked() {
viewModel.onUserSelectedToGiveFeedback(promptCount)
}

override fun onNegativeButtonClicked() {
viewModel.onUserDeclinedToGiveFeedback(promptCount)
}

override fun onDialogShown() {
viewModel.onGiveFeedbackDialogShown(promptCount)
}
},
)
.show()
}

private fun showAppEnjoymentPrompt(prompt: DialogFragment) {
(supportFragmentManager.findFragmentByTag(APP_ENJOYMENT_DIALOG_TAG) as? DialogFragment)?.dismissNow()
prompt.show(supportFragmentManager, APP_ENJOYMENT_DIALOG_TAG)
Expand Down
Loading

0 comments on commit 4f2cc07

Please sign in to comment.