Dark mode feature added

[SumitPareek2401]

Fixes:

18

Feature description: Dark Mode and Light Mode features added which can make the app more visually appealing while also offering benefits like battery saving and reduced eye strain.

Screen recording:

https://github.com/sanika391/SpoonShare/assets/122019171/f19697e6-96e3-44c6-a30b-5002fa746826

[sanika391]

I am currently facing a merge conflict issue with the lib/onboarding.dart file in my repository. Here is a screenshot of the conflict markers indicating the problem

[SumitPareek2401]

@sanika391 If a conflict arises due to one file lib/onboarding.dart. Can I remove this file from my pull request to merge it? In the future if onboarding.dart file needs to be fixed we can create another pull request.

[sanika391]

Sure, no problem.

On Tue, May 21, 2024, 8:25 PM SumitPareek2401 @.***> wrote:

@sanika391 https://github.com/sanika391 If a conflict arises due to one file lib/onboarding.dart. Can I remove this file from my pull request to merge it? In the future if onboarding.dart file needs to be fixed we can create another pull request.

— Reply to this email directly, view it on GitHub https://github.com/sanika391/SpoonShare/pull/40#issuecomment-2122826211, or unsubscribe https://github.com/notifications/unsubscribe-auth/A34TW2Y4S2IL6JW25MHGQKDZDNN6HAVCNFSM6AAAAABIAEVTOKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDCMRSHAZDMMRRGE . You are receiving this because you were mentioned.Message ID: @.***>

[SumitPareek2401]

@sanika391 Done from my side. Could you try to merge it?

[sanika391]

![Uploading image.png…]() Still the same

[SumitPareek2401]

This image is not visible. I had removed this onboarding.dart file.

[sanika391]

Please check now.

On Wed, May 22, 2024 at 5:41 PM SumitPareek2401 @.***> wrote:

This image is not visible.

— Reply to this email directly, view it on GitHub https://github.com/sanika391/SpoonShare/pull/40#issuecomment-2124639423, or unsubscribe https://github.com/notifications/unsubscribe-auth/A34TW2YB6MAHMQXQJI7APVTZDSDPVAVCNFSM6AAAAABIAEVTOKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDCMRUGYZTSNBSGM . You are receiving this because you were mentioned.Message ID: @.***>

[sanika391]

[SumitPareek2401]

@Saumya-28 and @sanika391 can you suggest the reason why these files are conflicting?

[sanika391]

Hello @SumitPareek2401,

The conflicts in the files lib/onboarding.dart, lib/screens/dashboard/dashboard_home.dart, and lib/screens/home/home_page.dart likely occur because these files have been modified in both the main branch and your feature branch (DarkModeFeatureAdded). When there are changes in the same lines or sections of the code in different branches, Git flags them as conflicts that need manual resolution.

Once you have resolved the conflicts and pushed the changes, please let me know so we can proceed with the review and merging of your pull request.

If you need any further assistance, feel free to ask.

Best regards, Sanika Chavan [https://www.linkedin.com/in/sanika-chavan-52457b236]