-
-
Notifications
You must be signed in to change notification settings - Fork 315
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
Entries from requests.txt for which icons exist already #1914
Conversation
I do feel like there has to be a better way avoiding a maintenance nightmare given that previously covered Icons become available for request again every time the main activity changes. Why ?
|
@TotallyAvailable Yeah, I think we must find a way to minimize the workload for the long-term, but I think we should rather open up a thread in the discussions pane for this issue. I'm just going to work through my personal list in this pull-request. We have to find a solution that works for both Donno and the icon creators. |
Wow, thanks for going through the requests! |
@Donnnno how do I do this? I edited the file in GitHub here in the browser... |
As #1902 isn't merged yet probably https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github Also appears that several of the currently open PRs have merge conflicts. |
I did delete all the svgs, but there is still a problem apparently. Do I have to go through the appfilter file and delete my 28 entries from the other commit? Or make a fresh new updated branch and add my 100+ commits from from this branch to it? 🤔 I was hoping that Git could help it. |
This comment was marked as resolved.
This comment was marked as resolved.
@alchemiker I cloned your branch and did a local merge using
Undoing just your changes to those entries should allow an automatic merge if you want to avoid merging on the command-line. You can restore the icon files since those aren't causing the conflict. |
No new icons, only added those from requests that already have an icon in the arcticons base already.
Added more
5c95962
to
0237258
Compare
Removed my added entries for alts of Domino's, Google WebView DevTools and Recorder in an attempt to resolve the merge conflict
Co-Authored-By: alchemiker <[email protected]>
oof, lots of merge errors. I've added all your changes in a newer commit. I'd suggest using different branches for different PRs, that avoids merging errors like this. Also GitHub desktop is really easy to use too :) |
Thank you very much for your patience, this whole story was definitely a lesson for me to make new branches in the future 😅 I am very sorry for all this mess! I'll try to make it better next time. |
No worries, I also made a mess of it with my attempt to rebase 😆. |
INFO: I somehow failed at creating a new accurate branch without my previous commits, please discard the commits before 09.01.2024, they are in another pull request of mine already
No new icons, only added those to appfilter from requests that already have an icon in the arcticons base already. Those are often language versions, renamed apps, apps from other places than the Play Store and thus with slightly different app pathes, flavours like "pro" or "lite" with no difference in icons (at least in black-and-white-rendition) - stuff like this.
I made a search between appfilter.xml and requests.txt file to find apps that have the same name of the launch activity. I looked up how the apps are called and if the names were different or something else was suspicious I looked the apps up on the internet, and compared their icons with the ones in the Arcticons app.
So far I came to the letter F (update: L). To be continued... but if you are going to release a new version somewhere soon, you can merge, too.
The aim is that more people see Arcticons Icons on their screen straight upon installation of the icon pack without the need to search for them, and not to waste the time of contributors by designing icons that already exist.