Awake vNext - `NOBLE_SIX_02162023` #24183

dend · 2023-02-17T23:47:32Z

Summary of the Pull Request

Implements quality-of-life improvements for Awake.

PR Checklist

Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
Tests: Added/updated and all pass
Localization: All end user facing strings can be localized
Dev docs: Added/updated
Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

src/settings-ui/Settings.UI/Views/AwakePage.xaml

Jay-o-Way

Idea: since a time interval and a specific date/time both boil down to a specific point in time, do you think it's possible to (in the background) use one and the same setting?

dend · 2023-02-20T19:28:05Z

Idea: since a time interval and a specific date/time both boil down to a specific point in time, do you think it's possible to (in the background) use one and the same setting?

@JayOWay - I mean, kinda? Today what I am doing is using Reactive Extensions (Rx) to set up the proper timer that is either a point-in-time (date/time) or interval. There is an interesting scenario here that we need to be cognizant of that Rx should handle automatically - clock changes.

If I set the interval to 15 minutes, I will get my 15 minutes and that's it. If I set the clock to 12:30PM and then I go ahead and change the clock, I'd want Awake to be able to recognize the time and either end or extend the session.

dend · 2023-03-07T17:31:39Z

@jaimecbernardo @crutkas @stefansjfw could you please test and try reproducing the Awake settings page issue? Doesn't seem like I can repro it on my end.

stefansjfw · 2023-03-08T10:00:31Z

@jaimecbernardo @crutkas @stefansjfw could you please test and try reproducing the Awake settings page issue? Doesn't seem like I can repro it on my end.

I can reproduce this. Trying to navigate to Awake page crashes the settings app (both when running runner and the settings app directly)

dend · 2023-03-08T17:17:21Z

@stefansjfw is this after pulling the latest changes and doing a full (clean) rebuild?

stefansjfw · 2023-03-08T17:21:02Z

@stefansjfw is this after pulling the latest changes and doing a full (clean) rebuild?

Yes.

pulled the code
git clean -xfd
built the solution from VS

dend · 2023-03-08T17:25:33Z

@stefansjfw sorry, not Git clean - clean from VS, then full rebuild. I am going to be fiddling with the code later to see if I can repro the scenario. Can you share the logs for Awake in the meantime (see inside %LOCALAPPDATA%/Microsoft/PowerToys)?

dend · 2023-03-08T17:47:09Z

Here is what I see when I go to the Awake screen in the latest branch, so logs would be helpful to diagnose any of the issues you might have @Jay-o-Way @stefansjfw

dend · 2023-03-09T16:39:38Z

@Jay-o-Way let me run this with your settings and see what happens.

dend · 2023-03-09T16:45:37Z

This is in AwakeProperties.cs @Jay-o-Way:

I just ran the code with your settings and I do not get an error - the settings automatically get updated to the latest version that includes the expiration time.

Syntax is this:

{
    "properties": {
        "keepDisplayOn": true,
        "mode": 3,
        "intervalHours": 0,
        "intervalMinutes": 0,
        "expirationDateTime": "2122-01-01T00:00:00.9188088-08:00",
        "customTrayTimes": {}
    },
    "name": "Awake",
    "version": "1.0"
}

awake_expire_at is also the old settings syntax - I've cleaned up that a bit, as you can see above, so you might still have an old snapshot of the code on your machine. In AwakeProperties.cs - what do you see as the JsonPropertyName for all assigned properties? A screenshot should be enough.

Then again, I just ran the code with your settings and they should auto-update to the new format.

dend · 2023-03-09T18:31:48Z

@Jay-o-Way looking at your logs, seems like old builds and new builds are mixed in. I see this, for example:

[2023-03-03 21:16:05.6646 INFO Awake.Program] Launching Awake...
[2023-03-03 21:16:05.6646 INFO Awake.Program] 0.0.1.0
[2023-03-03 21:16:05.6646 INFO Awake.Program] Build: ARBITER_01312022

The latest build is NOBLE_SIX_02162023. I am guessing this is because you're running the PR as well as the stable Awake on your machine. While nothing obvious stands out from the logs - are you running them separately or are they running at the same time? Wonder if the installed version is conflicting somehow with the new one.

Fix the build log name

src/settings-ui/Settings.UI.Library/AwakeProperties.cs

This specifically addresses the fact that the `ExpirationDateTime` property was incorrectly auto-initialized to `DateTime.MinValue` when it should've been set to `DateTimeOffset.MinValue` to be consistent with the underlying type and assumptions around date/time.

Update with date assignment fix

Update with latest date fix

stefansjfw

LGTM! I gave it a test, everything works well

Jay-o-Way · 2023-03-20T23:06:11Z

src/settings-ui/Settings.UI/Views/AwakePage.xaml

+                        x:Uid="Awake_ExpirationSettingsCard"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEC92;}"
+                        Visibility="{x:Bind ViewModel.IsExpirationConfigurationEnabled, Mode=OneWay}">
+                        <StackPanel Orientation="Horizontal">


@dend @niels9001 These controls stay horizontal and are not very responsive.

Jay-o-Way

Controls are not responsive for window width

dend · 2023-03-21T17:31:58Z

@Jay-o-Way will review and create another PR with the change.

* Initial scaffolding for expiration configuration * Simplifying the code and adding support for expiration events * Bit more cleanup * Initial support for expirable keep-awake * Update some of the threading logic * Logging and timing consistency * Initial UI scaffolding * Fix pathing issue for the icon when using config file * Add missing definitions * Update with basic interface * Cleanup redundant calls * Update name per convention * Simplify declaration * Proper binding to secondary Time property * Cleanup the terminology use * Standardize naming conventions. * More Awake cleanup * Ability to update the UI when the tray icon updates * Small tweaks before ViewModel refactor * Refactor the view model logic * Some consistency fixes * Remove the build props change * Add settings scaffolding when a file does not exist * Update expect.txt * Fix typos * Update build in logs * Updating based on discussion in microsoft#24183. This specifically addresses the fact that the `ExpirationDateTime` property was incorrectly auto-initialized to `DateTime.MinValue` when it should've been set to `DateTimeOffset.MinValue` to be consistent with the underlying type and assumptions around date/time. --------- Co-authored-by: Clint Rutkas <clint@rutkas.com>

dend and others added 14 commits February 16, 2023 20:55

Initial scaffolding for expiration configuration

b1a34fa

Simplifying the code and adding support for expiration events

111284c

Bit more cleanup

c4956cd

Initial support for expirable keep-awake

4dfa3b6

Update some of the threading logic

f8a9241

Logging and timing consistency

ad8a0a4

Initial UI scaffolding

bf48c12

Fix pathing issue for the icon when using config file

8af2557

Add missing definitions

eae52c4

Update with basic interface

62ec5e8

Cleanup redundant calls

6fdde8e

Update name per convention

6e367b1

Simplify declaration

b092416

Proper binding to secondary Time property

a38f95d

This was referenced Feb 18, 2023

Awake - issue with path when run from cmd with -c flag #22679

Closed

[Awake] idea: add date/time as method to end #11233

Closed

Jay-o-Way reviewed Feb 18, 2023

View reviewed changes

src/settings-ui/Settings.UI/Views/AwakePage.xaml Outdated Show resolved Hide resolved

Jay-o-Way reviewed Feb 18, 2023

View reviewed changes

Cleanup the terminology use

2c9fefa

This was referenced Feb 20, 2023

Awake crashing right after computer slept #19644

Closed

Awake fails to stay Awake #18427

Closed

Awake: Quicker way to Switch Mode #17343

Closed

dend added 2 commits February 20, 2023 12:50

Standardize naming conventions.

3cf519e

More Awake cleanup

4703273

This was referenced Feb 20, 2023

Toggling off Awake does not stop Awake #15052

Closed

Document the ability to customize tray time shortcuts #23586

Closed

[Awake] Keep Screen On icon looks too much like a distorted checkbox #22919

Closed

dend added 2 commits February 20, 2023 17:35

Ability to update the UI when the tray icon updates

e80802d

Small tweaks before ViewModel refactor

1157e5d

This comment was marked as resolved.

Sign in to view

Jay-o-Way requested review from crutkas, stefansjfw, davidegiacometti and yuyoyuppe March 9, 2023 17:15

Update build in logs

a32c2ab

Merge pull request #6 from dend/main

5c04c6d

Fix the build log name

stefansjfw reviewed Mar 10, 2023

View reviewed changes

src/settings-ui/Settings.UI.Library/AwakeProperties.cs Outdated Show resolved Hide resolved

dend and others added 3 commits March 10, 2023 09:43

Merge pull request #7 from dend/update-resx

3404a3f

Update with date assignment fix

Merge pull request #8 from dend/main

12b4ef3

Update with latest date fix

dend requested a review from stefansjfw March 10, 2023 17:46

stefansjfw approved these changes Mar 14, 2023

View reviewed changes

stefansjfw merged commit 4662527 into microsoft:main Mar 15, 2023

dend deleted the update-resx branch March 15, 2023 20:48

Jay-o-Way reviewed Mar 20, 2023

View reviewed changes

dend mentioned this pull request Mar 22, 2023

[PR Fix] Update the Awake settings to be responsive #24977

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Awake vNext - `NOBLE_SIX_02162023` #24183

Awake vNext - `NOBLE_SIX_02162023` #24183

dend commented Feb 17, 2023 •

edited

Loading

Jay-o-Way left a comment

dend commented Feb 20, 2023

dend commented Mar 7, 2023

stefansjfw commented Mar 8, 2023

dend commented Mar 8, 2023

stefansjfw commented Mar 8, 2023 •

edited

Loading

dend commented Mar 8, 2023

dend commented Mar 8, 2023

This comment was marked as resolved.

This comment was marked as resolved.

dend commented Mar 9, 2023

dend commented Mar 9, 2023

dend commented Mar 9, 2023

stefansjfw left a comment

Jay-o-Way Mar 20, 2023

Jay-o-Way left a comment

dend commented Mar 21, 2023

Awake vNext - NOBLE_SIX_02162023 #24183

Awake vNext - NOBLE_SIX_02162023 #24183

Conversation

dend commented Feb 17, 2023 • edited Loading

Summary of the Pull Request

PR Checklist

Jay-o-Way left a comment

Choose a reason for hiding this comment

dend commented Feb 20, 2023

dend commented Mar 7, 2023

stefansjfw commented Mar 8, 2023

dend commented Mar 8, 2023

stefansjfw commented Mar 8, 2023 • edited Loading

dend commented Mar 8, 2023

dend commented Mar 8, 2023

This comment was marked as resolved.

This comment was marked as resolved.

dend commented Mar 9, 2023

dend commented Mar 9, 2023

dend commented Mar 9, 2023

stefansjfw left a comment

Choose a reason for hiding this comment

Jay-o-Way Mar 20, 2023

Choose a reason for hiding this comment

Jay-o-Way left a comment

Choose a reason for hiding this comment

dend commented Mar 21, 2023

Awake vNext - `NOBLE_SIX_02162023` #24183

Awake vNext - `NOBLE_SIX_02162023` #24183

dend commented Feb 17, 2023 •

edited

Loading

stefansjfw commented Mar 8, 2023 •

edited

Loading