Login screen initialMerge Jose → Sarah and align to design (keep StatusBar dark)

[adilkabbariBVC]

Summary
Merged login-screen-update (Jose) into login-screen-initial (Sarah) and aligned the login screen to the provided design. Final choice: StatusBar uses dark.

What the PR Diff shows

• Net diff vs main: none (0 files). This is expected because the final resolved code matches main after we aligned to the design.
• Commit history documents the merge steps:
  • Sarah: set StatusBar light
  • Jose: set StatusBar auto
  • Resolve: keep dark per design

Branch-to-branch differences (Sarah vs Jose)
Using the Compare view (login-screen-initial…login-screen-update), the only change was in App.tsx:

• Jose: <StatusBar animated translucent style="auto" />
• Sarah: <StatusBar animated translucent style="light" />
• Final (design): <StatusBar animated translucent style="dark" />

Conflicts encountered & resolution

• App.tsx: conflicting StatusBar style between branches.
  • Resolution: chose dark to match the Figma design. Fonts and ActionSheet provider unchanged.

Verification

• App compiles and runs after moving the project out of OneDrive (Metro cache issue).
• Expo shows the login flow with StatusBar in dark mode.

Resources

• Repo link: TechSkillsBVC/assignment-task1
• Task Requirements diagram / Task Overview / Figma Prototype & Design: per assignment.