-
-
Notifications
You must be signed in to change notification settings - Fork 122
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
List ordered by amount of contributions and profile name #127
List ordered by amount of contributions and profile name #127
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A small change, for your actual issue, and then some issues with the pbxproj
file, you're almost there! Thanks!
Basic-Car-Maintenance/Shared/Settings/Views/ContributorsListView.swift
Outdated
Show resolved
Hide resolved
...-Maintenance.xcodeproj/xcshareddata/xcschemes/Basic-Car-Maintenance-WidgetExtension.xcscheme
Outdated
Show resolved
Hide resolved
Ohhhh ok, got it Sent from my iPhoneOn Oct 10, 2023, at 10:50 PM, Mikaela Caron ***@***.***> wrote:
@mikaelacaron commented on this pull request.
In Basic-Car-Maintenance.xcodeproj/project.pbxproj:
+ "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "com.andrewmuniz.Basic-Car-Maintenance";
+ "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "com.andrewmuniz.Basic-Car-Maintenance";
@am2089 NO!! the pbxproj must be there, this is basically what makes the xcodeproj file. You need to manually use a text editor and fix these parts that were added, because they shouldn't have been added
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>
|
…to settingsviewmodel
I just pushed the changes to the branch, thanks again for being so patient!
On Tue, Oct 10, 2023 at 10:56 PM Andrew Muniz ***@***.***>
wrote:
… Ohhhh ok, got it
Sent from my iPhone
On Oct 10, 2023, at 10:50 PM, Mikaela Caron ***@***.***>
wrote:
***@***.**** commented on this pull request.
------------------------------
In Basic-Car-Maintenance.xcodeproj/project.pbxproj
<#127 (comment)>
:
> + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "com.andrewmuniz.Basic-Car-Maintenance";
+ "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "com.andrewmuniz.Basic-Car-Maintenance";
@am2089 <https://github.com/am2089> *NO!!* the pbxproj must be there,
this is basically what makes the xcodeproj file. You need to manually use a
text editor and fix these parts that were added, because they shouldn't
have been added
—
Reply to this email directly, view it on GitHub
<#127 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/APDFTAWI3H6BLPM4G5SH7KDX6YCQTAVCNFSM6AAAAAA5ZVIQC6VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTMNRZGY4TQMRUGA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a few small changes, and you're almost there! thanks!
@@ -101,7 +101,7 @@ | |||
E58499692ACDDAFF00634660 /* Contributor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contributor.swift; sourceTree = "<group>"; }; | |||
FF0813562AD0A83000910EFA /* UITests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UITests.xcconfig; sourceTree = "<group>"; }; | |||
FF0813572AD0A92700910EFA /* Widget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Widget.xcconfig; sourceTree = "<group>"; }; | |||
FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Basic-Car-Maintenance.xcconfig"; sourceTree = SOURCE_ROOT; }; | |||
FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Basic-Car-Maintenance.xcconfig"; path = "Configurations/Basic-Car-Maintenance.xcconfig"; sourceTree = SOURCE_ROOT; }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like you moved the config file, but you shouldn't have
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@am2089 Can you please fix this?
if let contributors = viewModel.contributors, !contributors.isEmpty { | ||
ForEach(contributors) { contributor in | ||
if !viewModel.sortedContributors.isEmpty { | ||
ForEach(viewModel.sortedContributors, id: \.id) { contributor in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you don't need the id: \.id
because it conforms to Identifiable
...-Maintenance.xcodeproj/xcshareddata/xcschemes/Basic-Car-Maintenance-WidgetExtension.xcscheme
Outdated
Show resolved
Hide resolved
viewModel.urls["Basic-Car-Maintenance"]!) { | ||
ContributorsProfileView(name: contributor.login, url: contributor.avatarURL) | ||
} | ||
viewModel.urls["Basic-Car-Maintenance"]!) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All the indentation is off
You can do Cmd + A
to select everything and Ctrl + i
to indent everything properly
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -101,7 +101,7 @@ | |||
E58499692ACDDAFF00634660 /* Contributor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contributor.swift; sourceTree = "<group>"; }; | |||
FF0813562AD0A83000910EFA /* UITests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UITests.xcconfig; sourceTree = "<group>"; }; | |||
FF0813572AD0A92700910EFA /* Widget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Widget.xcconfig; sourceTree = "<group>"; }; | |||
FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Basic-Car-Maintenance.xcconfig"; sourceTree = SOURCE_ROOT; }; | |||
FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Basic-Car-Maintenance.xcconfig"; path = "Configurations/Basic-Car-Maintenance.xcconfig"; sourceTree = SOURCE_ROOT; }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@am2089 Can you please fix this?
Ok so I moved the file to its original place lol
…On Thu, Oct 12, 2023 at 7:49 PM Mikaela Caron ***@***.***> wrote:
***@***.**** requested changes on this pull request.
There's still several changes that are unresolved, please fix those and I
can merge this, thanks! Afterwards click the re-review button
[image: Re-review button]
<https://user-images.githubusercontent.com/22946902/274757001-65ebebdb-dfd3-427d-80b7-47c47aa66f28.png>
------------------------------
In Basic-Car-Maintenance.xcodeproj/project.pbxproj
<#127 (comment)>
:
> @@ -101,7 +101,7 @@
E58499692ACDDAFF00634660 /* Contributor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contributor.swift; sourceTree = "<group>"; };
FF0813562AD0A83000910EFA /* UITests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UITests.xcconfig; sourceTree = "<group>"; };
FF0813572AD0A92700910EFA /* Widget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Widget.xcconfig; sourceTree = "<group>"; };
- FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Basic-Car-Maintenance.xcconfig"; sourceTree = SOURCE_ROOT; };
+ FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Basic-Car-Maintenance.xcconfig"; path = "Configurations/Basic-Car-Maintenance.xcconfig"; sourceTree = SOURCE_ROOT; };
@am2089 <https://github.com/am2089> Can you please fix this?
—
Reply to this email directly, view it on GitHub
<#127 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/APDFTAQTUCJ75CMACGVDD4LX7B6Z7AVCNFSM6AAAAAA5ZVIQC6VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTMNZVGQYTOOBRGE>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few changes haven't been fixed yet
So I moved the folder to the original place from when we started the
project. and I deleted these two lines. Do you know where they would show
up? I made sure to delete them.
…On Fri, Oct 13, 2023 at 10:57 PM Mikaela Caron ***@***.***> wrote:
***@***.**** requested changes on this pull request.
A few changes haven't been fixed yet
------------------------------
In Basic-Car-Maintenance.xcodeproj/project.pbxproj
<#127 (comment)>
:
> FF098EFA2AB3424E003EC0FE /* Basic-Car-Maintenance.xcconfig */,
+ FFBE79BA2AD0A48C0005524E /* Configurations */,
Did you move the folder around? that's what it looks like here, you could
manually fix this in a text editor
------------------------------
In Basic-Car-Maintenance.xcodeproj/project.pbxproj
<#127 (comment)>
:
> + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "com.andrewmuniz.Basic-Car-Maintenance";
+ "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "com.andrewmuniz.Basic-Car-Maintenance";
This hasn't been removed yet
—
Reply to this email directly, view it on GitHub
<#127 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/APDFTARWW6E6SH5J2T72H2TX7H5RTAVCNFSM6AAAAAA5ZVIQC6VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTMNZXGY4TEMZYHE>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
You can manually change it in a text editor the |
Ohh okSent from my iPhoneOn Oct 13, 2023, at 11:21 PM, Mikaela Caron ***@***.***> wrote:
So I moved the folder to the original place from when we started the
project. and I deleted these two lines. Do you know where they would show
up? I made sure to delete them.
You can manually change it in a text editor the pbxproj is used with the xcodeproj for arranging files and folders. I'll look back at this and I can change it manually
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>
|
So is the PR accepted ?Sent from my iPhoneOn Oct 13, 2023, at 11:22 PM, Andrew Muniz ***@***.***> wrote:Ohh okSent from my iPhoneOn Oct 13, 2023, at 11:21 PM, Mikaela Caron ***@***.***> wrote:
So I moved the folder to the original place from when we started the
project. and I deleted these two lines. Do you know where they would show
up? I made sure to delete them.
You can manually change it in a text editor the pbxproj is used with the xcodeproj for arranging files and folders. I'll look back at this and I can change it manually
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@am2089 See these latest changes. This is what I needed you to fix before this could be merged.
Fixing the pbxproj
file and the WidgetExtension.xcscheme
file
…into 139-firebase-analytics-add-update-delete * 'dev' of https://github.com/0xJsaad/Basic-Car-Maintenance: Add Hindi localisation (mikaelacaron#167) Connect Vehicles and Maintenance Events (mikaelacaron#163) List ordered by amount of contributions and profile name (mikaelacaron#127) Update comment Fix:Firebase Warning - added get Vechicles after vechile additions (mikaelacaron#168) Fix:Firebase Warning - Implemented Event Sync function for sync with Firebase after additions or deletions. (mikaelacaron#164) updated EditEventDetail View title (mikaelacaron#162) Remove event from local model on delete (mikaelacaron#161) 17 Alternate App Icons (mikaelacaron#156) # Conflicts: # Basic-Car-Maintenance/Shared/Dashboard/Views/AddMaintenanceView.swift # Basic-Car-Maintenance/Shared/Dashboard/Views/EditEventDetailView.swift
Hey, I have a question, were all these files messed up because I moved
files around from their original places? If there is another issue I want
to tackle, should I just re-fork the project so everything is already in
its place? Also thanks for being patient with me. It was my first pull
request ever lol.
…On Sat, Oct 14, 2023 at 5:42 PM Mikaela Caron ***@***.***> wrote:
Merged #127
<#127> into dev.
—
Reply to this email directly, view it on GitHub
<#127 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/APDFTAQZL4H6I3ISXKCRY23X7MWPZAVCNFSM6AAAAAA5ZVIQC6VHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJQGY2TMMRSGY3DGNA>
.
You are receiving this because you were mentioned.Message ID:
<mikaelacaron/Basic-Car-Maintenance/pull/127/issue_event/10656226634@
github.com>
|
Hey!
Yes that is part of it, any time you move a file, the
Nope! Not needed, you will need to update your fork. This is a button on GitHub, see my livestream here for more details on exactly what this looks like (see the timestamp about git) https://www.youtube.com/live/60ivxAOUrYU?si=4c6Eu92eKpndYrx3
You're welcome! That's okay, this is exactly what this project is for!! For others to learn and use git and GitHub in a real environment with other developers |
What it Does
ContributorsListView
#105How I Tested
Built the app on simulator