search

atsign-foundation / atmosphere_pro

A fully end-to-end encrypted, cross-platform file sharing app written in Flutter
BSD 3-Clause "New" or "Revised" License
57 stars 48 forks source link

trunk branch is way out of date #325

Open gkc opened 1 year ago

gkc commented 1 year ago

Describe the bug

Contrary to our normal development approach at Atsign, the trunk branch of this repo is very out of date and most recent activity is happening on multiple feature branches. I can see however that the ui_redesign branch appears to be the main branch that other branches are merging into - effectively it is acting as the trunk branch; this begs the question - why not just use the trunk branch?

Without a regularly updated trunk branch, it is difficult to get a clear picture of dependencies that atmosphere_pro has on the core at_client_mobile and at_client packages

@sonle-geekyants @sachins-geekyants @Sardar1208 Please bring trunk up to date and let's follow up with a conversation about why trunk-based development isn't currently feasible, and agree what approach we will take in future.

sachins-geekyants commented 1 year ago

During hacktoberfest 2022 we opened redesign of atPro for contributions and used ui_redesign as the base branch. The design was not migrated completely and we could not merge ui_redesign to trunk.

Few months back when atPro redesign came in priority, we picked up from where it was left. Until last week the design was not completely migrated for mobile and desktop platforms to be merged to trunk.

The idea was to support old version while new version is being developed and eventually have everything merged to trunk.

Somewhere down the line we started actively working on the new version and trunk was not maintained, which should have not been the case.

Next step: we will merge ui_redesign to trunk and use it as base branch.

ksanty commented 1 year ago

@sachins-geekyants thanks. What is the impact to test timelines for (each) mobile, desktop, and Windows? I know we have desktop and Windows deployed.

For desktop we have several bugs and missing features. Have you had a chance to review this ticket and assess how many new screens we will need? And here is the other ticket for desktop https://github.com/atsign-foundation/atmosphere_pro/issues/323

gkc commented 1 year ago

@sachins-geekyants thank you - I understand. I will try to merge trunk into ui_redesign locally, resolve merge conflicts where I can, and list here any merge conflicts where I am uncertain how to resolve them.

sachins-geekyants commented 1 year ago

@sachins-geekyants thanks. What is the impact to test timelines for (each) mobile, desktop, and Windows? I know we have desktop and Windows deployed.

For desktop we have several bugs and missing features. Have you had a chance to review this ticket and assess how many new screens we will need? And here is the other ticket for desktop #323

We already have atPro mobile(android, ios) and desktop (macOS, windows) available for testing with new UI.

We have started working on #323 bug and enhancements list. For missing features ticket, we need to discuss with Daria and add/redesign some of the screens.

sachins-geekyants commented 1 year ago

@gkc we had to release an android version to stores to support android 13. trunk branch is now updated with latest dependencies and dart SDK.

Can we wait till new design is ready to go to stores before merging ui_redesign to trunk.

gkc commented 1 year ago

Sure

Sardar1208 commented 10 months ago

moving to next sprint

Sardar1208 commented 10 months ago

moving to next sprint

Sardar1208 commented 9 months ago

moving to next sprint