immadisairaj / prides

A package that helps in creating custom Slides and Presenting them.
https://pub.dev/packages/prides
BSD 3-Clause "New" or "Revised" License
5 stars 1 forks source link

feat: Added an option to view the current slide number #14

Closed morpheus-30 closed 1 year ago

morpheus-30 commented 1 year ago

Description

Added an optional parameter in PresentationWidget named "ShowCurrentSlideNumber". Then updated the stack in Presentation_widget.dart. Made a Container widget and used _currentslide.value+1, to display the current slidenumber.

Checks

Breaking Change

immadisairaj commented 1 year ago

.@morpheus-30 Can you see why the checks are failing and fix them meanwhile? I will review the code when I go near laptop.

morpheus-30 commented 1 year ago

Sure!

immadisairaj commented 1 year ago

You could also add something related to this inside the README too.

morpheus-30 commented 1 year ago

I've done those changes locally, but i cannot understand how to commit those new changes to this pull request. Should I make a new pull request with the new changes?

immadisairaj commented 1 year ago

I've done those changes locally, but i cannot understand how to commit those new changes to this pull request. Should I make a new pull request with the new changes?

No, a new pull request is not needed. You already have a branch named morpheus-30 from where you sent this PR. You can commit and push to the same branch. Changes will reflect in this PR.

morpheus-30 commented 1 year ago

image

I am getting this error while synchronizing changes to that branch after commiting

and this Current branch morpheus-30 is missing upstream upstream/morpheus-30

immadisairaj commented 1 year ago

image

I am getting this error while synchronizing changes to that branch after commiting

Can you pate the output of git remote -v and also tell me what command you are using to pull?

morpheus-30 commented 1 year ago

image

and

> git pull --tags upstream morpheus-30

immadisairaj commented 1 year ago

Okay, so the problem is upstream is my the current repository and origin is your forked repository on GitHub. morpheus-30 is there in origin but not in upstream.

If you are already in morpheus-30 branch in your local, you can simply use git pull origin morpheus-30. And then directly push to the origin using git push origin morpheus-30.

I wrote a small blog long back on git with most common commands. You can probably check that out too. -> https://www.immadisairaj.dev/blog/2019/git-with-open-source/

morpheus-30 commented 1 year ago

Oh, that worked, got that!

morpheus-30 commented 1 year ago

I've done the requested changes but cannot understand why the checks are failing. I am kinda new on this so cannot figure it out.

immadisairaj commented 1 year ago

I've done the requested changes but cannot understand why the checks are failing. I am kinda new on this so cannot figure it out.

Great! Don't worry, I will let you know about it. Currently going to bed, will look at it tomorrow.

immadisairaj commented 1 year ago

Ouch, forgot you were working on the same widget. I pushed some code today to main. Maybe you can check and fix merge conflicts if you can.

Make sure you fix the conflicts properly 😅

Commit link: https://github.com/immadisairaj/prides/commit/cf4945ddfcbf36b5d3cc892bddebf7457c04fc91

morpheus-30 commented 1 year ago

I've tried to resolve the conflict. I hope its fine now!

immadisairaj commented 1 year ago

I've tried to resolve the conflict. I hope its fine now!

What I meant was not do the changes just by committing, but also pull the main branch. I will do that for you for time being.

Or I am not sure what happened here, But, GitHub still shows me there is a merge conflict to main branch.

immadisairaj commented 1 year ago

but cannot understand why the checks are failing

.@morpheus-30 The checks are failing mainly because the formatting was not proper. I after resolved the conflict, pushed another commit which resolved most of the formatting issues (you can look at it here). Now that the package_scores is passing, there is flutter_package failing.

Why is that failing?

Screenshot 2023-04-14 at 16 00 57

From the checks error, you can see this there

Formatted test/prides_test.dart
Formatted 26 files (1 changed) in 0.38 seconds.
Formatting failed: 1

It means that the test/prides_test.dart is not formatted properly.

So, what you need to do is just fix the formatting in that file, and the checks will pass.

For more on flutter formatting, you can see -> https://docs.flutter.dev/development/tools/formatting

Don't forget to see the Automatically formatting code for your editor in that link. Will greatly be helpful further.

Lastly, for a beginner to be able to grasp things quickly, great job!

Edit: Note: Don't forget to first pull the changes before pushing the changes.

morpheus-30 commented 1 year ago

image Hello, I've done the formatting changes. but facing this error while pushing and pulling the changes, kindly help me out as I am still a newbie in this. Sorry for this :')

immadisairaj commented 1 year ago

As you already committed the changes. Your local and origin are different.

So, now you can pull with rebase

git pull origin morpheus-30 --rebase

What adding this rebase will do is get the commits from origin and add it in local while moving your local commits to the top.

Now, you can push freely.

morpheus-30 commented 1 year ago

I've committed the formatting changes, by following the link you provided, hope it'll pass now :')

morpheus-30 commented 1 year ago

Pushed the changes!