Skip to content

Ecosystem apps integration #11811

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
Merged
merged 23 commits into from
Aug 8, 2023
Merged

Ecosystem apps integration #11811

merged 23 commits into from
Aug 8, 2023

Conversation

@tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Jul 17, 2023 •
edited
Loading

See nextcloud/files-clients#10 (comment).

  • in Drawer as first row: Talk, Notes, "more apps"
  • use same "more" icon as Desktop
  • opens app if installed, if not open link to PlayStore or Fdroid
  • "more" -> open playstore/fdroid with filter for "Nextcloud"
  • with multi account: open another app with correct account

Closes #11744

  • send user/account to other apps
  • Tests written, or not not needed
  • add toggle for is_branded_client to brander
    • ecosystem apps always hidden when set to true
    • disables colouring of icon in PreviewMediaFragment

@ZetaTom ZetaTom force-pushed the wip/app-integration branch 4 times, most recently from 6bbffd4 to ccc7957 Compare July 27, 2023 10:54
@AndyScherzinger AndyScherzinger self-requested a review August 8, 2023 08:10
ZetaTom and others added 22 commits August 8, 2023 10:21
@ZetaTom @AndyScherzinger
Fix custom server name in drawer_header.xml
4b06cdb 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Add ecosystem icons
7531555 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Add ecosystem apps to drawer_header.xml
2b1b163 
- introduce is_branded_client variable
  - ecosystem apps will only be displayed in vanilla client
- fix layout of drawer_header.xml

Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Add actions for ecosystem apps
8506251 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Adapt layout in drawer_header
b978e03 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Fix intent to open ecosystem apps
f1c7661 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
WIP: adapt ecosystem icons
56b512b 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Adjusted design of ecosystem app buttons
de858ca 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Fix background and ripple effect
2272219 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Replace icon buttons with ImageView
f1197cf 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Add preference to hide ecosystem apps
2e1f756 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Clean up
18ad832 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Improve wording
47dcd85 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Switch accounts on intent
4a5b39f 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Use R-strings in DeepLinkLoginActivity
88a5884 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Switch accounts on intent
6a07bac 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Refactor DrawerActivity.java
d158a49 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Colour ecosystem app icons
8239b73 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Invert logic to hide app switcher
f05ec05 
- add summary to toggle in preferences

Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Clean up lint
591129e 
Signed-off-by: ZetaTom <[email protected]>
@ZetaTom @AndyScherzinger
Colour ecosystem app icons
1c64a42 
Signed-off-by: ZetaTom <[email protected]>
@tobiasKaminsky @AndyScherzinger
update screenshots
6863c1e 
Signed-off-by: tobiasKaminsky <[email protected]>
@AndyScherzinger
add empty lines on some xml files
b63fec2 
Signed-off-by: Andy Scherzinger <[email protected]>
@github-actions
Copy link

github-actions bot commented Aug 8, 2023

blue-Light-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/11811-Screenshot-blue-Light-15-27

@github-actions
Copy link

github-actions bot commented Aug 8, 2023

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/11811.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

AndyScherzinger
AndyScherzinger approved these changes Aug 8, 2023
View reviewed changes
Copy link
Member

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good and works as expected 👍

@AndyScherzinger AndyScherzinger merged commit cd070f9 into master Aug 8, 2023
@delete-merged-branch delete-merged-branch bot deleted the wip/app-integration branch August 8, 2023 16:21
@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.26.0 milestone Aug 8, 2023
@ZetaTom ZetaTom mentioned this pull request Sep 5, 2023
Merged
1 task
@joshtrichards joshtrichards mentioned this pull request Oct 10, 2023
Closed
@joshtrichards joshtrichards changed the title Wip/app integration Ecosystem apps integration Nov 18, 2023
@joshtrichards joshtrichards mentioned this pull request Dec 1, 2023
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

Assignees

No one assigned

Labels

4. to release

Projects

None yet

Milestone

Nextcloud App 3.26.0

Development

Successfully merging this pull request may close these issues.

Tighter integration on apps within Nextcloud ecosystem

4 participants

@tobiasKaminsky @AndyScherzinger @ZetaTom