Skip to content

Replace asset catalog colors with palette-based color system #27

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
dadachi merged 10 commits into from
Mar 31, 2026
Merged

Replace asset catalog colors with palette-based color system #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ea8cd56
Replace asset catalog colors with palette-based color system
dadachi Mar 31, 2026
cd4214a
Add GlassButtonStyle and GlassCard components
dadachi Mar 31, 2026
70dc6f3
Apply GlassCard to empty state views
dadachi Mar 31, 2026
84a6f0e
Update SnackbarView with glassmorphism styling
dadachi Mar 31, 2026
0d45868
Update scan views to use ultraThinMaterial backgrounds
dadachi Mar 31, 2026
acde7c2
Update ItemTagDetailView to use ultraThinMaterial backgrounds
dadachi Mar 31, 2026
6761f7e
Use semi-transparent card background for list rows
dadachi Mar 31, 2026
a501774
Update Lock toggle to button style in ItemTagDetailView
dadachi Mar 31, 2026
c601193
Remove hardcoded toolbar background from ScanView
dadachi Mar 31, 2026
7bec6ee
Revert unintended SwiftFormat changes to unrelated files
dadachi Mar 31, 2026
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
12 changes: 8 additions & 4 deletions NativeAppTemplate.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
0172046925AA82BF008FD63B /* PermissionsLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172045D25AA82B4008FD63B /* PermissionsLoadingView.swift */; };
0172047925AA8335008FD63B /* UIFont+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172046E25AA8325008FD63B /* UIFont+Extensions.swift */; };
0172047E25AA8343008FD63B /* Font+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172047525AA8325008FD63B /* Font+Extensions.swift */; };
0172048025AA8343008FD63B /* UIColor+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172047425AA8325008FD63B /* UIColor+Extensions.swift */; };
0172048125AA8343008FD63B /* Color+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172047625AA8325008FD63B /* Color+Extensions.swift */; };
017204B625AA8467008FD63B /* DataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172049225AA8449008FD63B /* DataManager.swift */; };
017204C025AA846D008FD63B /* TabViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172049925AA8449008FD63B /* TabViewModel.swift */; };
Expand Down Expand Up @@ -160,6 +159,8 @@
01E0A5B725BD0FCD00298D35 /* OfflineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A5B225BD0FC700298D35 /* OfflineView.swift */; };
01E0A5B825BD0FCD00298D35 /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A5B325BD0FC700298D35 /* ErrorView.swift */; };
01E0A60125BD149200298D35 /* MainButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A5F925BD148800298D35 /* MainButtonView.swift */; };
A1B2C3D401000001 /* GlassButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1B2C3D401000002 /* GlassButtonStyle.swift */; };
A1B2C3D401000003 /* GlassCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1B2C3D401000004 /* GlassCard.swift */; };
01E0A60C25BD440300298D35 /* SignInEmailAndPasswordView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A60B25BD440300298D35 /* SignInEmailAndPasswordView.swift */; };
01E0A63025BD53FD00298D35 /* Shop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A62F25BD53FD00298D35 /* Shop.swift */; };
01E1CECC287787A700E724FC /* SignUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E1CECB287787A700E724FC /* SignUpView.swift */; };
Expand Down Expand Up @@ -242,7 +243,6 @@
0172045C25AA82B4008FD63B /* SnackbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnackbarView.swift; sourceTree = "<group>"; };
0172045D25AA82B4008FD63B /* PermissionsLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionsLoadingView.swift; sourceTree = "<group>"; };
0172046E25AA8325008FD63B /* UIFont+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extensions.swift"; sourceTree = "<group>"; };
0172047425AA8325008FD63B /* UIColor+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extensions.swift"; sourceTree = "<group>"; };
0172047525AA8325008FD63B /* Font+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font+Extensions.swift"; sourceTree = "<group>"; };
0172047625AA8325008FD63B /* Color+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extensions.swift"; sourceTree = "<group>"; };
0172049225AA8449008FD63B /* DataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataManager.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -337,6 +337,8 @@
01E0A5B325BD0FC700298D35 /* ErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorView.swift; sourceTree = "<group>"; };
01E0A5B525BD0FC700298D35 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
01E0A5F925BD148800298D35 /* MainButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainButtonView.swift; sourceTree = "<group>"; };
A1B2C3D401000002 /* GlassButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlassButtonStyle.swift; sourceTree = "<group>"; };
A1B2C3D401000004 /* GlassCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlassCard.swift; sourceTree = "<group>"; };
01E0A60B25BD440300298D35 /* SignInEmailAndPasswordView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInEmailAndPasswordView.swift; sourceTree = "<group>"; };
01E0A62F25BD53FD00298D35 /* Shop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shop.swift; sourceTree = "<group>"; };
01E1CECB287787A700E724FC /* SignUpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -717,7 +719,6 @@
018D4EFB2B6350CB00CBA736 /* Inter */,
0172047625AA8325008FD63B /* Color+Extensions.swift */,
0172047525AA8325008FD63B /* Font+Extensions.swift */,
0172047425AA8325008FD63B /* UIColor+Extensions.swift */,
0172046E25AA8325008FD63B /* UIFont+Extensions.swift */,
);
path = Styleguide;
Expand Down Expand Up @@ -847,6 +848,8 @@
isa = PBXGroup;
children = (
0172788A2D7D936E00CE424F /* Tags */,
A1B2C3D401000002 /* GlassButtonStyle.swift */,
A1B2C3D401000004 /* GlassCard.swift */,
01E0A5F925BD148800298D35 /* MainButtonView.swift */,
);
path = Shared;
Expand Down Expand Up @@ -1034,6 +1037,8 @@
017278832D7D935700CE424F /* ImageSaver.swift in Sources */,
01D8AE8B2AB453C1009AFFBA /* ShopBasicSettingsView.swift in Sources */,
01E0A60125BD149200298D35 /* MainButtonView.swift in Sources */,
A1B2C3D401000001 /* GlassButtonStyle.swift in Sources */,
A1B2C3D401000003 /* GlassCard.swift in Sources */,
0182D39A25B4424B001E881D /* LoggedInShopkeeperKeychainStore.swift in Sources */,
01ED197B2A037B9E00CD4735 /* AppTabView.swift in Sources */,
0110A1612AC81978003EDCBA /* ResendConfirmationInstructionsView.swift in Sources */,
Expand Down Expand Up @@ -1111,7 +1116,6 @@
01D85AF32E07D37E00A95798 /* ItemTagListViewModel.swift in Sources */,
0172047E25AA8343008FD63B /* Font+Extensions.swift in Sources */,
0172034825A9642E008FD63B /* Request.swift in Sources */,
0172048025AA8343008FD63B /* UIColor+Extensions.swift in Sources */,
01DCE23F298FA3B300BA311D /* ShopListCardView.swift in Sources */,
011DDC2328766C5E00C6C21F /* SignUpService.swift in Sources */,
01E2477229A5E30400D4B00D /* Utility.swift in Sources */,
Expand Down
6 changes: 0 additions & 6 deletions NativeAppTemplate/Assets.xcassets/Colours/Backgrounds/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions NativeAppTemplate/Assets.xcassets/Colours/Backgrounds/backgroundColor.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions NativeAppTemplate/Assets.xcassets/Colours/Backgrounds/cardBackground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...plate/Assets.xcassets/Colours/Backgrounds/coloredPrimaryBackground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...plate/Assets.xcassets/Colours/Backgrounds/coloredPrimaryForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...ate/Assets.xcassets/Colours/Backgrounds/coloredSecondaryBackground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...ate/Assets.xcassets/Colours/Backgrounds/coloredSecondaryForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...eAppTemplate/Assets.xcassets/Colours/Backgrounds/failureBackground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...eAppTemplate/Assets.xcassets/Colours/Backgrounds/successBackground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...ate/Assets.xcassets/Colours/Backgrounds/successSecondaryForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions NativeAppTemplate/Assets.xcassets/Colours/Button/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...late/Assets.xcassets/Colours/Button/coloredPrimaryButtonForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...te/Assets.xcassets/Colours/Button/coloredSecondaryButtonForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...emplate/Assets.xcassets/Colours/Button/destructiveButtonForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...Template/Assets.xcassets/Colours/Button/failureSecondaryForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...AppTemplate/Assets.xcassets/Colours/Button/primaryButtonForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ...pTemplate/Assets.xcassets/Colours/Button/secondaryButtonForeground.colorset/Contents.json
View file
Open in desktop

This file was deleted.

Loading
Loading