Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Self-hosted user UI #21275

Merged
merged 71 commits into from
Oct 7, 2024
Merged

Self-hosted user UI #21275

merged 71 commits into from
Oct 7, 2024

Commits on Sep 25, 2024

  1. First pass at copying users from rs example app

    @nbradbury
    nbradbury committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    b877d80 View commit details
    Browse the repository at this point in the history

  2. First pass at user list screen

    @nbradbury
    nbradbury committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    7ecfd02 View commit details
    Browse the repository at this point in the history

  3. First pass at user list screen

    @nbradbury
    nbradbury committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    d51bc76 View commit details
    Browse the repository at this point in the history

  4. Minor tweaks

    @nbradbury
    nbradbury committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    e2d80b2 View commit details
    Browse the repository at this point in the history

  5. Changed to FeatureConfig

    @nbradbury
    nbradbury committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    027adcf View commit details
    Browse the repository at this point in the history

  6. Use isEnabled

    @nbradbury
    nbradbury committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    876f567 View commit details
    Browse the repository at this point in the history

  7. Added activity to manifest

    @nbradbury
    nbradbury committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    14d6da5 View commit details
    Browse the repository at this point in the history

  8. Added test account

    @nbradbury
    nbradbury committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    cc4e2c7 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Updated from prior branch

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    5c8da51 View commit details
    Browse the repository at this point in the history

  2. Fleshed out viewModel and user list screen

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    eb703ed View commit details
    Browse the repository at this point in the history

  3. Fleshed out viewModel and user list screen

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    05caacf View commit details
    Browse the repository at this point in the history

  4. Temporarily removed test account data

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    5dffecc View commit details
    Browse the repository at this point in the history

  5. Added user icon

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    b6f083e View commit details
    Browse the repository at this point in the history

  6. Renamed val

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0d2c70b View commit details
    Browse the repository at this point in the history

  7. Expand sample user list

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    09b88e8 View commit details
    Browse the repository at this point in the history

  8. Mimic existing people layour

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    defb4b1 View commit details
    Browse the repository at this point in the history

  9. Added dividers

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    6feee8b View commit details
    Browse the repository at this point in the history

  10. Moved avatar to it's own composable

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0fafc7b View commit details
    Browse the repository at this point in the history

  11. Converted to use LazyRow

    @nbradbury
    nbradbury committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    c9fe06a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Added even more sample users

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    ba74377 View commit details
    Browse the repository at this point in the history

  2. Reworked sample users to resolve SonarCloud warnings

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    a59abb3 View commit details
    Browse the repository at this point in the history

  3. Added third sample user with multiple roles

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    d3ef147 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'trunk' into issue/self-hosted-userlist

    @nbradbury
    nbradbury authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    7434664 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/issue/self-hosted-userlist' into… 

    … issue/self-hosted-userlist
    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    9e85e4a View commit details
    Browse the repository at this point in the history

  6. Fixed detekt warnings

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    16e28ae View commit details
    Browse the repository at this point in the history

  7. Fixed failing test

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    1e1ba0e View commit details
    Browse the repository at this point in the history

  8. Assign unique IDs

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    fdc882e View commit details
    Browse the repository at this point in the history

  9. Added getSampleUserById

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    80111cb View commit details
    Browse the repository at this point in the history

  10. Simplified onCloseClick

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    a307286 View commit details
    Browse the repository at this point in the history

  11. Added onUserClick

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    10c9a0b View commit details
    Browse the repository at this point in the history

  12. Refined onUserClick

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    2079e24 View commit details
    Browse the repository at this point in the history

  13. Created UserComposables for re-using Composables

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    1f87535 View commit details
    Browse the repository at this point in the history

  14. Minor tweaks

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    374aeb6 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'issue/self-hosted-userlist' of https://github.com/wordp… 

    …ress-mobile/WordPress-Android into issue/self-hosted-user-detail

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/UserListScreen.kt
    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    224f6ee View commit details
    Browse the repository at this point in the history

  16. Resolved conflicts

    @nbradbury
    nbradbury committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    d5f646b View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Reworked self hosted user screen to make future screens easier to add

    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    8b5414c View commit details
    Browse the repository at this point in the history

  2. Updated manifest

    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    54469ea View commit details
    Browse the repository at this point in the history

  3. Merge branch 'issue/self-hosted-userlist' of https://github.com/wordp… 

    …ress-mobile/WordPress-Android into issue/self-hosted-user-detail

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
	WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersScreen.kt
	WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/UserListViewModel.kt
    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f87c7b4 View commit details
    Browse the repository at this point in the history

  4. Added user click event

    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    3835a7b View commit details
    Browse the repository at this point in the history

  5. Handle onUserClick

    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    68d12ee View commit details
    Browse the repository at this point in the history

  6. Use separate close icon for detail, go back to user list when leaving… 

    … detail
    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    fc5422d View commit details
    Browse the repository at this point in the history

  7. First pass at detail

    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    4f5adeb View commit details
    Browse the repository at this point in the history

  8. Second pass at detail

    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    fb003fb View commit details
    Browse the repository at this point in the history

  9. Third pass at detail

    @nbradbury
    nbradbury committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    5cc702d View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch 'trunk' into issue/self-hosted-user-detail

    @nbradbury
    nbradbury authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    ae58458 View commit details
    Browse the repository at this point in the history

  2. Added offline view

    @nbradbury
    nbradbury committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    6207191 View commit details
    Browse the repository at this point in the history

  3. Added large avatar view

    @nbradbury
    nbradbury committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    6355c5e View commit details
    Browse the repository at this point in the history

  4. Don't handle avatar clicks in list view

    @nbradbury
    nbradbury committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    aeab663 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Enable scrolling detail screen

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    e918bf2 View commit details
    Browse the repository at this point in the history

  2. Don't enable scrolling empty list screen

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    282e451 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'issue/self-hosted-user-avatar' of https://github.com/wo… 

    …rdpress-mobile/WordPress-Android into issue/self-hosted-user-detail

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SelfHostedUsersViewModel.kt
    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    a6d9dec View commit details
    Browse the repository at this point in the history

  4. Show large avatar when clicked

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    55be759 View commit details
    Browse the repository at this point in the history

  5. Added comments to view model

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    ef49726 View commit details
    Browse the repository at this point in the history

  6. Moved var

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    8b2f1b3 View commit details
    Browse the repository at this point in the history

  7. Imported SelfHostedUsersViewModel.SelfHostedUserState to shorten refe… 

    …rences to it
    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    b528d7c View commit details
    Browse the repository at this point in the history

  8. Don't pass user to avatar composables

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4f54cbc View commit details
    Browse the repository at this point in the history

  9. Simplified empty/offline views

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    48b4a5b View commit details
    Browse the repository at this point in the history

  10. Simplified modifier on composable Screen

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    5eed1ac View commit details
    Browse the repository at this point in the history

  11. Don't handle clicks on empty avatar

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    093c07c View commit details
    Browse the repository at this point in the history

  12. Make full list row clickable

    @nbradbury
    nbradbury committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    7e8dbe4 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Added comments

    @nbradbury
    nbradbury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    59585ca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into issue/self-hosted-user-ui

    @nbradbury
    nbradbury authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    1dfd403 View commit details
    Browse the repository at this point in the history

  3. Renamed & removed composable functions for better re-usability

    @nbradbury
    nbradbury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    8564766 View commit details
    Browse the repository at this point in the history

  4. Made previews private, added offline preview

    @nbradbury
    nbradbury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    c7e3017 View commit details
    Browse the repository at this point in the history

  5. Make content the last param on ScreenWithTopBar

    @nbradbury
    nbradbury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    0ea0d7e View commit details
    Browse the repository at this point in the history

  6. Added crossfade animation

    @nbradbury
    nbradbury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    79e3246 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Merge branch 'trunk' into issue/self-hosted-user-ui

    @nbradbury
    nbradbury authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    8db998b View commit details
    Browse the repository at this point in the history

  2. Increased crossfade animation duration

    @nbradbury
    nbradbury committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    452106d View commit details
    Browse the repository at this point in the history

  3. Fixed logic for showing empty list

    @nbradbury
    nbradbury committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    5bc4ea5 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Merge branch 'trunk' into issue/self-hosted-user-ui

    @nbradbury
    nbradbury authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    2575d0e View commit details
    Browse the repository at this point in the history

  2. Removed avatar from preview

    @nbradbury
    nbradbury committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    f53dcf6 View commit details
    Browse the repository at this point in the history