Skip to content

Conversation

@Williamrai
Copy link
Collaborator

What does this do?

  • In Figma each slide have a cross button, so replacing the navigation left with the close button.

@dbrant dbrant merged commit 65cf748 into yir-re-design Oct 15, 2025
2 checks passed
@dbrant dbrant deleted the yir-remove-back-button-from-slide branch October 15, 2025 14:45
dbrant added a commit that referenced this pull request Oct 20, 2025
* YiR: Pre-design scaffolding

* Wire up API calls and put TODOs

* Put async for api calls

* Format for the headline/body text

* Revert "Format for the headline/body text"

This reverts commit 42f85eb.

* Separate initial screen out

* Onboarding

* Simplify a bit

* Initial thought about indivial screens

* Add temporary functions for slides

* Review comment

* clean up async

* Fix error

* Consolidate routes

* Update a bit

* Remove survey for now and refine the finish action for onboarding and
back arrow

* Fix preview

* YiR: update entry point in More menu. (#5964)

* YiR: Login dialog in the onboarding screen. (#5965)

* Model class

* use data class

* Create dataModel for YiR

* Update model

* Update model class and add todos

* Update query for top visited articles

* No longer use CenterAlignedTopAppBar with W icon.

* Wire up onboarding screen to PageActivity, with result.

* Update naming and fix lint

* Add two parameters for YearInReviewSlides

* Clean up outdated strings

* Add filterNotNull() for slide routes

* Fix translation test

* YiR: save YiR model data to preference (#5967)

* YiR: Create Most visited Categories slide (#5968)

* YiR: Create Most visited Categories slide

* Complete

* Use <br> for less spaces between titles

* Fix strings

* Rename

* Use db limit and update names

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Create Your Top Articles slide (#5969)

* YiR: Create Your Top Articles slide

* Add qq strings

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* YiR: Create Viewed Edits slide (#5970)

* YiR: Create Viewed Edits slide

* Finalize

* string to plural

* YiR: Add English most popular articles slide (#5971)

* YiR: Add English most popular articles slide

* Change string to plural

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Add Setting to enable/disable. (#5978)

* Introduce preference.

* Wire up setting.

* Clear data when disabled.

* qq.

* Remove developer setting.

* Remove duplicated preference from developer settings

* Swap donate icon with share icon and adjust the UI a bit

* YiR: Create Articles Saved slide (#5972)

* YiR: Create Articles Saved slide

* Rename the function

* string to plural

* Corrected the string and plural items

* Code review comment addressed

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Update # of articles edited slide (#5979)

* YiR: Update # of articles edited slide

* Complete

* oops

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* Use year constant instead of LocalDate.

* YiR: Custom app icon (#5974)

* Add new icons...

* Solidify.

* Strings.

* Wire up screen.

* Fix string.

* Further wire up.

* Whoops.

* Adapt.

* Adjust/update strings.

* Don't show Donate button in toolbar if bottom button shown.

* Make header background flexible and overridable.

* Tweak verbiage per design.

* YiR: Create Reading Patterns slide (#5982)

* YiR: Create Reading Patterns slide

* Custom screen data

* Build sql queries

* Final

* Condition

* Use simple if statement instead of %

* Use localtime for queries and minor code updates

* Update MW info links.

* Rename string items a bit

* Prioritize categories that have 2+ spaces.

* YiR: Create contributor slides (#5991)

* YiR: Create contributor slides

* Bump okHttpVersion from 5.2.0 to 5.2.1 (#5993)

Bumps `okHttpVersion` from 5.2.0 to 5.2.1.

Updates `com.squareup.okhttp3:mockwebserver` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp-tls` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:logging-interceptor` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:mockwebserver
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp-tls
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:logging-interceptor
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Code review comments addressed

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* YiR: Update personalized "articles read" slides (#5988)

* YiR: Update personalized "articles read" slides

* Finish slides

* Better number format

* Better number format

* Lint

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fully integrate with remote config.

* Correct color.

* Fetch remote config explicitly.

* Unnecessary intermediate vars.

* Update onboarding illustration.

* YiR: add a filter for the top visited articles to show if visited > 1 (#6000)

* - replaces navigation left button with close button in app bar (#6003)

* YiR: update local queries to accept time range to meet the feature requirement (#5998)

* YiR: update local queries to accept time range to meet the feature requirement

* Lint

* Add default for endDate

* Tweak string.

* Be explicit about units in parameter names.

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Wire up data start/end times from remote config.

* Fix calculation of time spent, and explitit units naming.

* YiR: Wire up actual total enabling/disabling based on configuration. (#6008)

* YiR: Wire up actual total enabling/disabling based on configuration.

* Custom app icon enabled independent of YiR as a whole.

* Update style of Donate button.

* Correct divider color.

* Don't actually need a BottomAppBar.

* Improve naming and thread allowDonate throughout.t

* Reinstitute rounded corner clipping.

* YiR: update app articles viewed times screen

* - ensures bottom bar is drawn above the navigation bar (#6013)

* Complete integration with isAccessible from remote config.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William Rai <[email protected]>
dbrant added a commit that referenced this pull request Oct 21, 2025
* YiR: Pre-design scaffolding

* Wire up API calls and put TODOs

* Put async for api calls

* Format for the headline/body text

* Revert "Format for the headline/body text"

This reverts commit 42f85eb.

* Separate initial screen out

* Onboarding

* Simplify a bit

* Initial thought about indivial screens

* Add temporary functions for slides

* Review comment

* clean up async

* Fix error

* Consolidate routes

* Update a bit

* Remove survey for now and refine the finish action for onboarding and
back arrow

* Fix preview

* YiR: update entry point in More menu. (#5964)

* YiR: Login dialog in the onboarding screen. (#5965)

* Model class

* use data class

* Create dataModel for YiR

* Update model

* Update model class and add todos

* Update query for top visited articles

* No longer use CenterAlignedTopAppBar with W icon.

* Wire up onboarding screen to PageActivity, with result.

* Update naming and fix lint

* Add two parameters for YearInReviewSlides

* Clean up outdated strings

* Add filterNotNull() for slide routes

* Fix translation test

* YiR: save YiR model data to preference (#5967)

* YiR: Create Most visited Categories slide (#5968)

* YiR: Create Most visited Categories slide

* Complete

* Use <br> for less spaces between titles

* Fix strings

* Rename

* Use db limit and update names

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Create Your Top Articles slide (#5969)

* YiR: Create Your Top Articles slide

* Add qq strings

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* YiR: Create Viewed Edits slide (#5970)

* YiR: Create Viewed Edits slide

* Finalize

* string to plural

* YiR: Add English most popular articles slide (#5971)

* YiR: Add English most popular articles slide

* Change string to plural

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Add Setting to enable/disable. (#5978)

* Introduce preference.

* Wire up setting.

* Clear data when disabled.

* qq.

* Remove developer setting.

* Remove duplicated preference from developer settings

* Swap donate icon with share icon and adjust the UI a bit

* YiR: Create Articles Saved slide (#5972)

* YiR: Create Articles Saved slide

* Rename the function

* string to plural

* Corrected the string and plural items

* Code review comment addressed

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Update # of articles edited slide (#5979)

* YiR: Update # of articles edited slide

* Complete

* oops

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* Use year constant instead of LocalDate.

* YiR: Custom app icon (#5974)

* Add new icons...

* Solidify.

* Strings.

* Wire up screen.

* Fix string.

* Further wire up.

* Whoops.

* Adapt.

* Adjust/update strings.

* Don't show Donate button in toolbar if bottom button shown.

* Make header background flexible and overridable.

* Tweak verbiage per design.

* YiR: Create Reading Patterns slide (#5982)

* YiR: Create Reading Patterns slide

* Custom screen data

* Build sql queries

* Final

* Condition

* Use simple if statement instead of %

* Use localtime for queries and minor code updates

* Update MW info links.

* Rename string items a bit

* Prioritize categories that have 2+ spaces.

* YiR: Create contributor slides (#5991)

* YiR: Create contributor slides

* Bump okHttpVersion from 5.2.0 to 5.2.1 (#5993)

Bumps `okHttpVersion` from 5.2.0 to 5.2.1.

Updates `com.squareup.okhttp3:mockwebserver` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp-tls` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:logging-interceptor` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:mockwebserver
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp-tls
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:logging-interceptor
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Code review comments addressed

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* YiR: Update personalized "articles read" slides (#5988)

* YiR: Update personalized "articles read" slides

* Finish slides

* Better number format

* Better number format

* Lint

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fully integrate with remote config.

* Correct color.

* Fetch remote config explicitly.

* Unnecessary intermediate vars.

* Update onboarding illustration.

* YiR: add a filter for the top visited articles to show if visited > 1 (#6000)

* - replaces navigation left button with close button in app bar (#6003)

* YiR: update local queries to accept time range to meet the feature requirement (#5998)

* YiR: update local queries to accept time range to meet the feature requirement

* Lint

* Add default for endDate

* Tweak string.

* Be explicit about units in parameter names.

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Wire up data start/end times from remote config.

* Fix calculation of time spent, and explitit units naming.

* YiR: Share flow for individual slides

* YiR: Wire up actual total enabling/disabling based on configuration. (#6008)

* YiR: Wire up actual total enabling/disabling based on configuration.

* Custom app icon enabled independent of YiR as a whole.

* Adjust paddings

* Adjust screenshot

* Update parameters for modifier

* Update style of Donate button.

* Correct divider color.

* Don't actually need a BottomAppBar.

* Improve naming and thread allowDonate throughout.t

* Reinstitute rounded corner clipping.

* YiR: update app articles viewed times screen

* - ensures bottom bar is drawn above the navigation bar (#6013)

* Lint

* Lint again

* Adjust paddings

* Update strings and naming

* Update subject and hashtag

* Complete integration with isAccessible from remote config.

* Remove header override

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William Rai <[email protected]>
Williamrai added a commit that referenced this pull request Oct 21, 2025
* YiR: Pre-design scaffolding

* Wire up API calls and put TODOs

* Put async for api calls

* Format for the headline/body text

* Revert "Format for the headline/body text"

This reverts commit 42f85eb.

* Separate initial screen out

* Onboarding

* Simplify a bit

* Initial thought about indivial screens

* Add temporary functions for slides

* Review comment

* clean up async

* Fix error

* Consolidate routes

* Update a bit

* Remove survey for now and refine the finish action for onboarding and
back arrow

* Fix preview

* YiR: update entry point in More menu. (#5964)

* YiR: Login dialog in the onboarding screen. (#5965)

* Model class

* use data class

* Create dataModel for YiR

* Update model

* Update model class and add todos

* Update query for top visited articles

* No longer use CenterAlignedTopAppBar with W icon.

* Wire up onboarding screen to PageActivity, with result.

* Update naming and fix lint

* Add two parameters for YearInReviewSlides

* Clean up outdated strings

* Add filterNotNull() for slide routes

* Fix translation test

* YiR: save YiR model data to preference (#5967)

* YiR: Create Most visited Categories slide (#5968)

* YiR: Create Most visited Categories slide

* Complete

* Use <br> for less spaces between titles

* Fix strings

* Rename

* Use db limit and update names

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Create Your Top Articles slide (#5969)

* YiR: Create Your Top Articles slide

* Add qq strings

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* YiR: Create Viewed Edits slide (#5970)

* YiR: Create Viewed Edits slide

* Finalize

* string to plural

* YiR: Add English most popular articles slide (#5971)

* YiR: Add English most popular articles slide

* Change string to plural

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Add Setting to enable/disable. (#5978)

* Introduce preference.

* Wire up setting.

* Clear data when disabled.

* qq.

* Remove developer setting.

* Remove duplicated preference from developer settings

* Swap donate icon with share icon and adjust the UI a bit

* YiR: Create Articles Saved slide (#5972)

* YiR: Create Articles Saved slide

* Rename the function

* string to plural

* Corrected the string and plural items

* Code review comment addressed

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Update # of articles edited slide (#5979)

* YiR: Update # of articles edited slide

* Complete

* oops

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* Use year constant instead of LocalDate.

* YiR: Custom app icon (#5974)

* Add new icons...

* Solidify.

* Strings.

* Wire up screen.

* Fix string.

* Further wire up.

* Whoops.

* Adapt.

* Adjust/update strings.

* Don't show Donate button in toolbar if bottom button shown.

* Make header background flexible and overridable.

* Tweak verbiage per design.

* YiR: Create Reading Patterns slide (#5982)

* YiR: Create Reading Patterns slide

* Custom screen data

* Build sql queries

* Final

* Condition

* Use simple if statement instead of %

* Use localtime for queries and minor code updates

* Update MW info links.

* Rename string items a bit

* Prioritize categories that have 2+ spaces.

* YiR: Create contributor slides (#5991)

* YiR: Create contributor slides

* Bump okHttpVersion from 5.2.0 to 5.2.1 (#5993)

Bumps `okHttpVersion` from 5.2.0 to 5.2.1.

Updates `com.squareup.okhttp3:mockwebserver` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp-tls` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:logging-interceptor` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:mockwebserver
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp-tls
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:logging-interceptor
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Code review comments addressed

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* YiR: Update personalized "articles read" slides (#5988)

* YiR: Update personalized "articles read" slides

* Finish slides

* Better number format

* Better number format

* Lint

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fully integrate with remote config.

* Correct color.

* Fetch remote config explicitly.

* Unnecessary intermediate vars.

* Update onboarding illustration.

* YiR: add a filter for the top visited articles to show if visited > 1 (#6000)

* - replaces navigation left button with close button in app bar (#6003)

* YiR: update local queries to accept time range to meet the feature requirement (#5998)

* YiR: update local queries to accept time range to meet the feature requirement

* Lint

* Add default for endDate

* Tweak string.

* Be explicit about units in parameter names.

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Wire up data start/end times from remote config.

* Fix calculation of time spent, and explitit units naming.

* YiR: Wire up actual total enabling/disabling based on configuration. (#6008)

* YiR: Wire up actual total enabling/disabling based on configuration.

* Custom app icon enabled independent of YiR as a whole.

* Update style of Donate button.

* Correct divider color.

* Don't actually need a BottomAppBar.

* Improve naming and thread allowDonate throughout.t

* Reinstitute rounded corner clipping.

* YiR: update app articles viewed times screen

* - ensures bottom bar is drawn above the navigation bar (#6013)

* Some ground work.

* Come on.

* Yep...

* Geo slide

* Fix up.

* Further tighten.

* Disable interactions with the MapView.

* Complete integration with isAccessible from remote config.

* Touch-up.

* Add start/end time to query.

* Whoops.

* Correctly zoom to extents of largest cluster.

* Unused const.

* Adapt.

* Do it.

* Nonnull bitmap in callback.

* Remove compass settings.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Cooltey Feng <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William Rai <[email protected]>
cooltey added a commit that referenced this pull request Oct 22, 2025
* YiR: Pre-design scaffolding

* Wire up API calls and put TODOs

* Put async for api calls

* Format for the headline/body text

* Revert "Format for the headline/body text"

This reverts commit 42f85eb.

* Separate initial screen out

* Onboarding

* Simplify a bit

* Initial thought about indivial screens

* Add temporary functions for slides

* Review comment

* clean up async

* Fix error

* Consolidate routes

* Update a bit

* Remove survey for now and refine the finish action for onboarding and
back arrow

* Fix preview

* YiR: update entry point in More menu. (#5964)

* YiR: Login dialog in the onboarding screen. (#5965)

* Model class

* use data class

* Create dataModel for YiR

* Update model

* Update model class and add todos

* Update query for top visited articles

* No longer use CenterAlignedTopAppBar with W icon.

* Wire up onboarding screen to PageActivity, with result.

* Update naming and fix lint

* Add two parameters for YearInReviewSlides

* Clean up outdated strings

* Add filterNotNull() for slide routes

* Fix translation test

* YiR: save YiR model data to preference (#5967)

* YiR: Create Most visited Categories slide (#5968)

* YiR: Create Most visited Categories slide

* Complete

* Use <br> for less spaces between titles

* Fix strings

* Rename

* Use db limit and update names

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Create Your Top Articles slide (#5969)

* YiR: Create Your Top Articles slide

* Add qq strings

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* YiR: Create Viewed Edits slide (#5970)

* YiR: Create Viewed Edits slide

* Finalize

* string to plural

* YiR: Add English most popular articles slide (#5971)

* YiR: Add English most popular articles slide

* Change string to plural

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Add Setting to enable/disable. (#5978)

* Introduce preference.

* Wire up setting.

* Clear data when disabled.

* qq.

* Remove developer setting.

* Remove duplicated preference from developer settings

* Swap donate icon with share icon and adjust the UI a bit

* YiR: Create Articles Saved slide (#5972)

* YiR: Create Articles Saved slide

* Rename the function

* string to plural

* Corrected the string and plural items

* Code review comment addressed

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Update # of articles edited slide (#5979)

* YiR: Update # of articles edited slide

* Complete

* oops

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* Use year constant instead of LocalDate.

* YiR: Custom app icon (#5974)

* Add new icons...

* Solidify.

* Strings.

* Wire up screen.

* Fix string.

* Further wire up.

* Whoops.

* Adapt.

* Adjust/update strings.

* Don't show Donate button in toolbar if bottom button shown.

* Make header background flexible and overridable.

* Tweak verbiage per design.

* YiR: Create Reading Patterns slide (#5982)

* YiR: Create Reading Patterns slide

* Custom screen data

* Build sql queries

* Final

* Condition

* Use simple if statement instead of %

* Use localtime for queries and minor code updates

* Update MW info links.

* Rename string items a bit

* Prioritize categories that have 2+ spaces.

* YiR: Create contributor slides (#5991)

* YiR: Create contributor slides

* Bump okHttpVersion from 5.2.0 to 5.2.1 (#5993)

Bumps `okHttpVersion` from 5.2.0 to 5.2.1.

Updates `com.squareup.okhttp3:mockwebserver` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp-tls` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:logging-interceptor` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:mockwebserver
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp-tls
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:logging-interceptor
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Code review comments addressed

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* YiR: Update personalized "articles read" slides (#5988)

* YiR: Update personalized "articles read" slides

* Finish slides

* Better number format

* Better number format

* Lint

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fully integrate with remote config.

* Correct color.

* Fetch remote config explicitly.

* Unnecessary intermediate vars.

* Update onboarding illustration.

* - adds logic to support year in review survey

* YiR: add a filter for the top visited articles to show if visited > 1 (#6000)

* - replaces navigation left button with close button in app bar (#6003)

* YiR: update local queries to accept time range to meet the feature requirement (#5998)

* YiR: update local queries to accept time range to meet the feature requirement

* Lint

* Add default for endDate

* Tweak string.

* Be explicit about units in parameter names.

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Wire up data start/end times from remote config.

* Fix calculation of time spent, and explitit units naming.

* YiR: Wire up actual total enabling/disabling based on configuration. (#6008)

* YiR: Wire up actual total enabling/disabling based on configuration.

* Custom app icon enabled independent of YiR as a whole.

* Update style of Donate button.

* Correct divider color.

* Don't actually need a BottomAppBar.

* Improve naming and thread allowDonate throughout.t

* Reinstitute rounded corner clipping.

* YiR: update app articles viewed times screen

* - ensures bottom bar is drawn above the navigation bar (#6013)

* - code merge fixes

* Complete integration with isAccessible from remote config.

* - adds an enum to manage survey state
- adds list preference as developer settings for year in review survey
- code fixes

* - merge conflict fix

* - code fixes

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Cooltey Feng <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dbrant added a commit that referenced this pull request Oct 29, 2025
* YiR: Pre-design scaffolding

* Wire up API calls and put TODOs

* Put async for api calls

* Format for the headline/body text

* Revert "Format for the headline/body text"

This reverts commit 42f85eb.

* Separate initial screen out

* Onboarding

* Simplify a bit

* Initial thought about indivial screens

* Add temporary functions for slides

* Review comment

* clean up async

* Fix error

* Consolidate routes

* Update a bit

* Remove survey for now and refine the finish action for onboarding and
back arrow

* Fix preview

* YiR: update entry point in More menu. (#5964)

* YiR: Login dialog in the onboarding screen. (#5965)

* Model class

* use data class

* Create dataModel for YiR

* Update model

* Update model class and add todos

* Update query for top visited articles

* No longer use CenterAlignedTopAppBar with W icon.

* Wire up onboarding screen to PageActivity, with result.

* Update naming and fix lint

* Add two parameters for YearInReviewSlides

* Clean up outdated strings

* Add filterNotNull() for slide routes

* Fix translation test

* YiR: save YiR model data to preference (#5967)

* YiR: Create Most visited Categories slide (#5968)

* YiR: Create Most visited Categories slide

* Complete

* Use <br> for less spaces between titles

* Fix strings

* Rename

* Use db limit and update names

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Create Your Top Articles slide (#5969)

* YiR: Create Your Top Articles slide

* Add qq strings

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* YiR: Create Viewed Edits slide (#5970)

* YiR: Create Viewed Edits slide

* Finalize

* string to plural

* YiR: Add English most popular articles slide (#5971)

* YiR: Add English most popular articles slide

* Change string to plural

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Add Setting to enable/disable. (#5978)

* Introduce preference.

* Wire up setting.

* Clear data when disabled.

* qq.

* Remove developer setting.

* Remove duplicated preference from developer settings

* Swap donate icon with share icon and adjust the UI a bit

* YiR: Create Articles Saved slide (#5972)

* YiR: Create Articles Saved slide

* Rename the function

* string to plural

* Corrected the string and plural items

* Code review comment addressed

---------

Co-authored-by: Dmitry Brant <[email protected]>

* YiR: Update # of articles edited slide (#5979)

* YiR: Update # of articles edited slide

* Complete

* oops

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fix translation

* Use year constant instead of LocalDate.

* YiR: Custom app icon (#5974)

* Add new icons...

* Solidify.

* Strings.

* Wire up screen.

* Fix string.

* Further wire up.

* Whoops.

* Adapt.

* Adjust/update strings.

* Don't show Donate button in toolbar if bottom button shown.

* Make header background flexible and overridable.

* Tweak verbiage per design.

* YiR: Create Reading Patterns slide (#5982)

* YiR: Create Reading Patterns slide

* Custom screen data

* Build sql queries

* Final

* Condition

* Use simple if statement instead of %

* Use localtime for queries and minor code updates

* Update MW info links.

* Rename string items a bit

* Prioritize categories that have 2+ spaces.

* YiR: Create contributor slides (#5991)

* YiR: Create contributor slides

* Bump okHttpVersion from 5.2.0 to 5.2.1 (#5993)

Bumps `okHttpVersion` from 5.2.0 to 5.2.1.

Updates `com.squareup.okhttp3:mockwebserver` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp-tls` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:logging-interceptor` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

Updates `com.squareup.okhttp3:okhttp` from 5.2.0 to 5.2.1
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-5.2.0...parent-5.2.1)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:mockwebserver
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp-tls
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:logging-interceptor
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-version: 5.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Code review comments addressed

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* YiR: Update personalized "articles read" slides (#5988)

* YiR: Update personalized "articles read" slides

* Finish slides

* Better number format

* Better number format

* Lint

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Fully integrate with remote config.

* Correct color.

* Fetch remote config explicitly.

* Unnecessary intermediate vars.

* Update onboarding illustration.

* YiR: add a filter for the top visited articles to show if visited > 1 (#6000)

* - replaces navigation left button with close button in app bar (#6003)

* YiR: update local queries to accept time range to meet the feature requirement (#5998)

* YiR: update local queries to accept time range to meet the feature requirement

* Lint

* Add default for endDate

* Tweak string.

* Be explicit about units in parameter names.

---------

Co-authored-by: Dmitry Brant <[email protected]>

* Wire up data start/end times from remote config.

* Fix calculation of time spent, and explitit units naming.

* - adds ui for highlight slide
- adds highlightItem data structure
- updates ui/code to support highlights slide

* YiR: Wire up actual total enabling/disabling based on configuration. (#6008)

* YiR: Wire up actual total enabling/disabling based on configuration.

* Custom app icon enabled independent of YiR as a whole.

* - adds proper data for all cases of highlights screen
- adds new HistoryEntryWithImageDao.kt query and string resources

* Update style of Donate button.

* Correct divider color.

* Don't actually need a BottomAppBar.

* Improve naming and thread allowDonate throughout.t

* Reinstitute rounded corner clipping.

* - code fixes and adds editor highlight

* YiR: update app articles viewed times screen

* - code merge fixes

* - ensures bottom bar is drawn above the navigation bar (#6013)

* - code fixes

* Complete integration with isAccessible from remote config.

* - adds screen capture handler
- adds screenshot composable for highlights screen
- code/ui fixes

* - code cleanup and fixes

* - code cleanup and fixes

* - code fixes

* - string fixes

* - code fixes

* - moving remember scroll state position

* - code fixes

* - update YearInReviewCaptureHandler to handle geo slide screenshot
- converts highlights string resource to plurals resource
- code/ui fixes

* - code fixes

* - code fixes

* - code fixes/merge conflict fix

* - merge conflict fix

* - Scale ShareableHighlightsCard height to fill remaining space between top text and button.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Cooltey Feng <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

2 participants