Skip to content

Color selection for Contact Image #349

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.

Sign up for GitHub

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

Merged
merged 55 commits into from
Feb 28, 2025
Merged

Color selection for Contact Image #349

Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
95938c1
Update ContactImageUpdater.swift
mikebash Dec 30, 2024
37178dd
Update ContactSettingsView.swift
mikebash Dec 30, 2024
f5fbb53
Update ContactSettingsView.swift
mikebash Dec 30, 2024
d5f1a0d
Update UserDefaults.swift
mikebash Dec 30, 2024
0e9c38a
Update UserDefaults.swift
mikebash Dec 31, 2024
4f1d226
Update ContactImageUpdater.swift
mikebash Dec 31, 2024
ebabb46
Update ContactSettingsView.swift
mikebash Dec 31, 2024
c9e5116
Update ContactImageUpdater.swift
mikebash Dec 31, 2024
f9ca330
Update UserDefaults.swift
mikebash Dec 31, 2024
dc2a9d0
Update ObservableUserDefaults.swift
mikebash Dec 31, 2024
04b3127
Update ContactSettingsView.swift
mikebash Dec 31, 2024
ad48efb
Update ContactSettingsView.swift
mikebash Dec 31, 2024
75b44dd
Update ContactSettingsViewModel.swift
mikebash Dec 31, 2024
8fdd588
Update ContactImageUpdater.swift
mikebash Dec 31, 2024
aee1703
Update ContactImageUpdater.swift
mikebash Dec 31, 2024
7ef06b6
Update ContactImageUpdater.swift
mikebash Dec 31, 2024
81bfdc9
Update ContactSettingsView.swift
mikebash Dec 31, 2024
105041a
Update ObservableUserDefaults.swift
mikebash Dec 31, 2024
2426c1e
Removed unintended white space
mikebash Jan 1, 2025
911ccc6
Removed unintended white space
mikebash Jan 1, 2025
1ef9036
Removed unintended white space
mikebash Jan 1, 2025
7347f78
Testing initial approaches to background color
mikebash Jan 2, 2025
13423d2
Update ContactImageUpdater.swift
mikebash Jan 2, 2025
f671eb0
Added text & background color menus
mikebash Jan 2, 2025
f4a012e
Added Text & Background Color options
mikebash Jan 2, 2025
203e0ab
Added text & background color options
mikebash Jan 2, 2025
62c90c6
Added text & background color options
mikebash Jan 2, 2025
67f528e
Rearranging the form
mikebash Jan 12, 2025
9590a6d
Adding Separate Card option
mikebash Jan 12, 2025
ff28b8d
Adding text for labels on trend and delta picker
mikebash Jan 12, 2025
5837306
Small tweak to labels
mikebash Jan 12, 2025
1f38ebc
Bug fix for color when BG is stale
mikebash Jan 12, 2025
7bf0c21
Tightening up code in ContactSettingsView
mikebash Jan 18, 2025
63af50b
Changing contactTrend and contactDelta to strings
mikebash Jan 18, 2025
c33b8c2
Additional fixes for new trend and delta selectors
mikebash Jan 18, 2025
1172713
Changing trend and delta to strings
mikebash Jan 18, 2025
5de1a70
Update ContactSettingsViewModel.swift
mikebash Jan 18, 2025
4ba68d4
Update BGData.swift for strings
mikebash Jan 18, 2025
a749de6
Bug fixing (I hope)
mikebash Jan 18, 2025
db6f218
Update BGData.swift
mikebash Jan 18, 2025
331f3d2
Updating BGData.swift to pass more variables to updateContactImage
mikebash Jan 20, 2025
2d7a614
Added multiple contact image creation abilities
mikebash Jan 20, 2025
64f38e9
converting extraTrend and extraDelta to be non-optional
mikebash Jan 20, 2025
9588e85
Fix for Separate
mikebash Jan 20, 2025
cd3de03
Small bug fixes
mikebash Jan 20, 2025
4ab16cb
Update ContactImageUpdater.swift
mikebash Jan 21, 2025
c6f78e9
Issue testing
mikebash Jan 21, 2025
582b2d9
Issue testing 2
mikebash Jan 21, 2025
3fa104f
Adding separateAttributes
mikebash Jan 21, 2025
4f38507
Delta formatting and size adjustments
mikebash Feb 9, 2025
57c175a
Adding description for separate contact cards
mikebash Feb 9, 2025
5676ed6
Switching trend and delta to dynamic font size
mikebash Feb 9, 2025
bb9267d
Adjusting scaling factor
mikebash Feb 9, 2025
e18bf14
Adjusting vertical centering
mikebash Feb 17, 2025
954a1a0
Reverting trend back to fixed location
mikebash Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update ContactImageUpdater.swift
  • Loading branch information
@mikebash
mikebash authored Dec 31, 2024
commit 8fdd5887e8f1dafd49b1a678bf2949c887ea37d7
6 changes: 3 additions & 3 deletions LoopFollow/Contact/ContactImageUpdater.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ContactImageUpdater {

//convert the saved string to UI Color
private var savedUIColor: UIColor {
switch watchColorSelection {
switch contactsColor {
case "red": return .red
case "blue": return .blue
case "cyan": return .cyan
Expand All @@ -87,7 +87,7 @@ class ContactImageUpdater {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unintended whitespace change.

var bgAttributes: [NSAttributedString.Key: Any] = [
.font: UIFont.boldSystemFont(ofSize: fontSize),
.foregroundColor: stale ? UIColor.gray : UIColor.cyan,
.foregroundColor: stale ? UIColor.gray : savedUIColor,
.paragraphStyle: paragraphStyle
]

Expand All @@ -97,7 +97,7 @@ class ContactImageUpdater {

let extraAttributes: [NSAttributedString.Key: Any] = [
.font: UIFont.systemFont(ofSize: 90),
.foregroundColor: UIColor.cyan,
.foregroundColor: savedUIColor,
.paragraphStyle: paragraphStyle
]

Expand Down