Waitlist for WD #2831

cmonfortep · 2023-02-09T11:47:50Z

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

Description

Adds a new waitlist in settings. Similar to the one we had for macOS.

Steps to test this PR

Follow instructions in https://app.asana.com/0/0/1203975737540623/f

UI changes

Before	After
!(Upload before screenshot)	(Upload after screenshot)

cmonfortep · 2023-02-09T11:48:03Z

Current dependencies on/for this PR:

develop
- PR Waitlist for WD #2831 👈
  - PR Add notifyme to waitlist #2843
    - PR FeatureFlag waitlist #2844

This comment was auto-generated by Graphite.

macos/macos-api/build.gradle

aitorvs · 2023-02-09T12:14:14Z

windows/windows-api/src/main/java/com/duckduckgo/windows.api/WindowsSettingsNav.kt

+ * Public interface to provide navigation Intents related to Windows App Settings
+ */
+interface WindowsSettingsNav {
+    fun openWindowsSettings(context: Context): Intent


I would rename this to activityContext and even probably annotated with ActivityContext. That's the only reason you need a context here, if it was the app context you would not need it as a parameter

Sounds good 👍

macos/macos-api/src/main/java/com/duckduckgo/macos_api/MacOsNav.kt

common-ui/src/main/res/drawable/ic_platform_macos_16.xml

nalcalag · 2023-02-09T12:38:54Z

common-ui/src/main/res/drawable/ic_platform_windows_16.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M7.5,1.5H1.5V7.5H7.5V1.5Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.84"/>
+  <path
+      android:pathData="M7.5,8.5H1.5V14.5H7.5V8.5Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.84"/>
+  <path
+      android:pathData="M8.5,1.5H14.5V7.5H8.5V1.5Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.84"/>
+  <path
+      android:pathData="M14.5,8.5H8.5V14.5H14.5V8.5Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.84"/>
+</vector>


Same as before, you need to replace fillColor attribute with ?attr/daxColorPrimaryIcon and remove alpha in all <paths/>

thanks for the check @nalcalag 👍

marcosholgado

LGTM except that PendingIntent crash

marcosholgado · 2023-02-16T14:47:50Z

...indows-impl/src/main/java/com/duckduckgo/windows/impl/waitlist/ui/WindowsWaitlistActivity.kt

+            putExtra(Intent.EXTRA_TITLE, getString(R.string.windows_waitlist_share_invite))
+        }
+
+        val pi = PendingIntent.getBroadcast(


This is making the app crash with

java.lang.IllegalArgumentException: com.duckduckgo.mobile.android.debug: Targeting S+ (version 31 and above) requires that one of FLAG_IMMUTABLE or FLAG_MUTABLE be specified when creating a PendingIntent. Strongly consider using FLAG_IMMUTABLE, only use FLAG_MUTABLE if some functionality depends on the PendingIntent being mutable, e.g. if it needs to be used with inline replies or bubbles.

In reality that pi variable is not used so you can delete and this should work again.

marcosholgado · 2023-02-16T14:51:36Z

macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsActivity.kt

    private fun executeCommand(command: Command) {
        when (command) {
            is ShareLink -> launchSharePageChooser()
+            GoToWindowsClientSettings -> launchWindowsClientSettings()


is this missing an is ?

marcosholgado · 2023-02-16T14:52:44Z

macos/macos-impl/src/main/res/values/donottranslate.xml

  -->

 <resources>
-    <string name="macos_app">DuckDuckGo Desktop App</string>


Just as a reminder when we get the translations would be good to translate these strings as well.

marcosholgado · 2023-02-16T14:57:35Z

...ndows-impl/src/main/java/com/duckduckgo/windows/impl/waitlist/ui/WindowsWaitlistViewModel.kt

+        }
+    }
+
+    fun onDialogDismissed() {


This function is not used anywhere so we can delete it.

cmonfortep · 2023-02-17T12:53:12Z

common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/TextExtensions.kt

            setSpan(
                ForegroundColorSpan(
-                    ContextCompat.getColor(context, R.color.cornflowerBlue),
+                    context.getColorFromAttr(R.attr.daxColorAccentBlue),


updated spannable links colors (reported by sveta, discussed with @malmstein )

Task/Issue URL: https://app.asana.com/0/488551667048375/1203975081655927/f ### Description Adds notify me component to waitlist ### Steps to test this PR _Feature 1_ - [ ] fresh install - [ ] go to settings waitlist - [ ] join the waitlist - [ ] if notifications enabled, notifyme component shouldn't appear. If disabled, ensure it appears. ### UI changes | Before | After | | ------ | ----- | !(Upload before screenshot)|(Upload after screenshot)|

Task/Issue URL: https://app.asana.com/0/0/1202843599939263/f ### Description Adds a new waitlist in settings. Similar to the one we had for macOS. ### Steps to test this PR Follow instructions in https://app.asana.com/0/0/1203975737540623/f ### UI changes | Before | After | | ------ | ----- | !(Upload before screenshot)|(Upload after screenshot)| Co-authored-by: Marcos <marcosh@duckduckgo.com>

cmonfortep commented Feb 9, 2023

View reviewed changes

macos/macos-api/build.gradle Show resolved Hide resolved

aitorvs reviewed Feb 9, 2023

View reviewed changes

macos/macos-api/src/main/java/com/duckduckgo/macos_api/MacOsNav.kt Outdated Show resolved Hide resolved

nalcalag reviewed Feb 9, 2023

View reviewed changes

common-ui/src/main/res/drawable/ic_platform_macos_16.xml Outdated Show resolved Hide resolved

nalcalag reviewed Feb 9, 2023

View reviewed changes

common-ui/src/main/res/drawable/ic_platform_macos_16.xml Outdated Show resolved Hide resolved

nalcalag reviewed Feb 9, 2023

View reviewed changes

common-ui/src/main/res/drawable/ic_platform_macos_16.xml Outdated Show resolved Hide resolved

nalcalag reviewed Feb 9, 2023

View reviewed changes

cmonfortep force-pushed the feature/cristian/windows_waitlist branch 2 times, most recently from 3ec563c to 38b46a9 Compare February 15, 2023 08:38

This was referenced Feb 15, 2023

Add notifyme to waitlist #2843

Merged

FeatureFlag waitlist #2844

Merged

cmonfortep assigned marcosholgado Feb 15, 2023

cmonfortep marked this pull request as ready for review February 15, 2023 13:10

marcosholgado approved these changes Feb 16, 2023

View reviewed changes

marcosholgado and others added 15 commits February 17, 2023 11:08

Add waitlist for Windows

efb93ed

Add waitlist for Windows

45d066c

udpate copies and add footer link to windows screen

2a60408

add final copies

511bd4f

hide/show footer

b100b18

layout fixes

7e45ba4

hardcode invite code style in xml (will suppress lint)

4c9c506

add 2 new ic to common-ui. Use them from waitlist screen

415cb35

navigate to macos screen from windows flow

f1887d4

update copy

e344667

suppress content description

01f138f

show macos footer link in joined state

dca75c7

copies changed on macos screen

d2e1f13

new footer

791d27f

remove icon, not fully supported when match_parent

c7b76f1

cmonfortep added 21 commits February 17, 2023 11:08

macos screen, update screen title.

22ebbb9

fix wrong reference to string

edeee9b

add missing test to cover navigation between mac/wind flows

e197b7e

refer to activitycontext

65f35ca

minSdk is 23, we can remove

a12ad0e

avoid using retrofit in di module, use contributesserviceapi

579e7f0

unused resource

605c010

remove hardcoded color

ff68da2

no content description

df2dc5c

use right color in invite code

6fc2e17

Add lint baseline. Adding exception to use textview on the invite code.

b6aa883

tidy up imports

610d078

make icons compatible with dark theme

d724b02

fix: footer note doesn't appear in macos screen

0cc018f

fix domain override by retrofit default service

9c6bde9

fix share button crash

6f44e12

add is in when

d4af0e2

unused method remove

f76059b

remove test using removed method

1ca5719

formatkotlin

8e07d9b

update notification channel copy

2b866fe

cmonfortep force-pushed the feature/cristian/windows_waitlist branch from 0dfc124 to 2b866fe Compare February 17, 2023 10:15

cmonfortep added 3 commits February 17, 2023 12:12

UI review changes (removed icon from buttons, macos icon changed)

12bdc7f

use daxColorAccentBlue on spannable links

ba612a9

formatkotlin

6ad6d9d

cmonfortep commented Feb 17, 2023

View reviewed changes

cmonfortep merged commit d0212bb into develop Feb 21, 2023

cmonfortep deleted the feature/cristian/windows_waitlist branch February 21, 2023 16:00

Waitlist for WD #2831

Waitlist for WD #2831

Uh oh!

Conversation

cmonfortep commented Feb 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Steps to test this PR

UI changes

Uh oh!

cmonfortep commented Feb 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marcosholgado left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cmonfortep commented Feb 9, 2023 •

edited

Loading

cmonfortep commented Feb 9, 2023 •

edited

Loading

marcosholgado left a comment •

edited

Loading