android
[usecases] Merge with main
Goal Merge the usecases branch (which is currently based on views) into the latest main branch, which likely contains updated architecture (possibly Jetpack Compose or refactored MVVM improvements).
Steps to Safely Merge usecases into main Checkout the usecases branch locally:
git checkout usecases Update your local main branch:
git fetch origin git checkout main git pull origin main Switch back to usecases:
git checkout usecases Merge main into usecases:
t git merge main Resolve Conflicts (if any):
Look out for changes in:
UI layer (Compose vs View)
UseCase injection or structure
TaskRepository / ViewModel changes
Prefer keeping UseCase logic as clean layers and adapt UI accordingly.
Test the App:
Make sure flows work with the updated architecture.
Run unit tests and integration tests.
Push the Updated usecases Branch:
git push origin usecases Optional: Submit a Pull Request to main If usecases is now stable and validated:
On GitHub
Create a Pull Request from usecases → main
Ensure the PR includes:
Clean commit history (rebase if necessary)
Notes on architectural integration
Highlight changes to ViewModel, UI, or DI structure
Final Recommendation Keep UseCases decoupled and testable. If main is now using Jetpack Compose or modular architecture, isolate UI updates and inject UseCases cleanly via ViewModel.
