Skip to content

FIX: Git History Date bug#1585

Merged
matthijseikelenboom merged 3 commits intoCodeEditApp:mainfrom
tom-ludwig:git-history-date-fix
Feb 7, 2024
Merged

FIX: Git History Date bug#1585
matthijseikelenboom merged 3 commits intoCodeEditApp:mainfrom
tom-ludwig:git-history-date-fix

Conversation

@tom-ludwig
Copy link
Member

@tom-ludwig tom-ludwig commented Feb 3, 2024

  • Correct date isn't displayed in this history tab

  • Branch image was slightly to big, compared to Xcode

  • Branch menu color was a bit off

  • Branch menu indicator wasn't hidden

Description

The commit date in the history tab wasn't displayed correctly. Additionally, the git branch menu had a few issues, including discrepancies in color, indicator visibility, and branch symbol size.

Related Issues

na

Checklist

  • I read and understood the contributing guide as well as the code of conduct
  • The issues this PR addresses are related to each other
  • My changes generate no new warnings
  • My code builds and runs on my machine
  • My changes are all related to the related issue above
  • I documented my code

Screenshots

Before:
Screenshot 2024-02-03 at 9 28 35 PM
Now:
Screenshot 2024-02-03 at 9 27 37 PM
Before:
Screenshot 2024-02-03 at 9 03 34 PM
Now:
Screenshot 2024-02-03 at 9 26 03 PM
When hovering:
Screenshot 2024-02-03 at 9 26 07 PM

@tom-ludwig
Bug fixes
9a7228a 
- Correct date isn't displayed in this history tab

- Branch image was slightly to big, compared to Xcode

- Branch menu color was a bit off

- Branch menu indicator wasn't hidden
@tom-ludwig
Copy link
Member Author

tom-ludwig commented Feb 3, 2024

Could you please check which line works better in GitClient+CommitHistory.swift:

dateFormatter.locale = Locale(identifier: Locale.current.identifier)

or:

dateFormatter.locale = Locale(identifier: "en_US_POSIX")

Both should work.

thecoolwinter
thecoolwinter previously approved these changes Feb 3, 2024
View reviewed changes
@thecoolwinter
Copy link
Collaborator

thecoolwinter commented Feb 6, 2024

Actually I have no issues with just Locale.current there, is that the problem? I'm fairly certain Locale(identifier: Locale.current.identifier) would resolve to the same thing.

@tom-ludwig
Copy link
Member Author

tom-ludwig commented Feb 6, 2024

It seems like Locale.current behaves differently outside the US. I tested all three options on my machine, and only using Locale.current resulted in a nil date. Austin had no issues with any option when testing the same code. Both approaches work for me, but I prefer Locale(identifier: Locale.current.identifier).

dateFormatter.locale = Locale(identifier: Locale.current.identifier)
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

If you're okay with using Locale(identifier: Locale.current.identifier), we can just stick with that.

@thecoolwinter
Copy link
Collaborator

thecoolwinter commented Feb 6, 2024

Okay! Yeah let's go with that, seems better than a hardcoded value.

@matthijseikelenboom matthijseikelenboom merged commit 779d624 into CodeEditApp:main Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthijseikelenboom matthijseikelenboom matthijseikelenboom approved these changes

@thecoolwinter thecoolwinter thecoolwinter approved these changes

@austincondiff austincondiff Awaiting requested review from austincondiff

@0xWDG 0xWDG Awaiting requested review from 0xWDG

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tom-ludwig @thecoolwinter @matthijseikelenboom

Comments