Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Failed attempt to do a git pull request #1597

Closed
wants to merge 1 commit into from

Conversation

PixelRuzt
Copy link
Contributor

Two new icons added

Two new icons added
@wwwwwwari
Copy link
Contributor

Hey @PixelRuzt! I'm not an actual reviewer/maintainer of this project but I think you'll probably need to adjust your changes a bit:

  1. In appfilter.xml, we don't put <appfilter> and </appfilter> around the new entries. Generally, we just add only 2 lines (excluding blank lines) for each new icon we add to the appfilter.xml like this:
  <!-- my app name -->
  <item component=blah blah...  />
  1. Your text editor changed appfilter.xml's line break characters to CRLF but it needs to be just LF. If you're on Windows, Notepad++ can be used convert CRLF to LF.
  2. I don't see any of your pull requests containing the actual icons (the .svg files). Did you perhaps forget to submit them?
  3. If this is your first time contributing, you might want to add yourself to app/src/main/res/xml/contributors.xml as well :)

@PixelRuzt
Copy link
Contributor Author

Hey @wwwwwwari ,
Thank you so much for reaching out to me and explaining all of this stuff.

I'm sorry about all this mess, I'm new to GitHub and I am struggling a bit to get a grasp of how things are and how they work. Just learning as I go about it.

I would appreciate if you could guide me to some tutorials or a channel that teaches all the basic stuff for GitHub.

  1. I'll correct my entry to appfilter.xml according to your suggestions. I also need to ask, if I'm working on a icon and want to add it to this. How should I attain it's package name? Do I need to install them on my phone first? No other way?

  2. I think I messed that up by using Notepad. I'll use Notepad++ or something next time.

  3. I just checked and I made the pull request to some other thread or repository I think. It is there but connected to some other. I'll redo that after I've sorted put together all the requirements properly.

  4. Thank you, I'll add myself to the list after I've made a proper contribution and not a mess.

Please feel free to correct me anywhere I make mistakes.

Thank you.

@wwwwwwari
Copy link
Contributor

wwwwwwari commented Jun 25, 2023

@PixelRuzt I'm a new contributor like you so no worries! Git can be very confusing when you're new. For your points:

  1. The only way I know is to install the app first and use the IconRequest app per the contributing guide, yes. But again, I'm also a new contributor myself so there might be another way I don't know about.
  2. Yes, Windows Notepad always convert any LF in the file to CRLF, and it also has problems reading files that use just LF instead of CRLF if I'm remembering correctly. I think if you already have VS Code you can use that to update the files too. Just avoid Notepad 😅
  3. Yeah, I saw your repository and basically you're making a separate branch for each change (one for requests, one for appfilter, one for icons). For the sake of simplicity, you actually only need to make all the changes in one branch then submit those changes in one pull request.

I don't really know any guides than just googling around, but this might work. They even have a FAQ.

@PixelRuzt
Copy link
Contributor Author

@wwwwwwari it is indeed quite confusing for a newbie like me.

  1. Oh alright, I'll do it that way then. I hope someone who's found a different and more simplified way can shed some light for us.
  2. Got it! I'll not use Notepad for this ever again.
  3. Yep, now that I think of it, I totally did that. I'll try to fix it in my next pull request.
    Thank you for providing the guide. I'll go through it and hopefully learn a lot more about this place.

@PixelRuzt
Copy link
Contributor Author

@wwwwwwari I am sorry for troubling you again. I have made some changes to my pull requests. Please go through it and my feed to see if I have made it in the correct place.
Thank you in advance.

@PixelRuzt PixelRuzt closed this Jul 1, 2023
@PixelRuzt PixelRuzt changed the title Update appfilter.xml Failed attempt to do a git pull request Jul 1, 2023
@PixelRuzt PixelRuzt deleted the PixelRuzt-1 branch July 4, 2023 07:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants