Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d6a5d42
Redefine the entities
Vincy-Cheng Jun 2, 2024
f74eb75
Add imageURL in the attribute
Vincy-Cheng Jun 2, 2024
f5a2cae
[wip] Add manage owner
Vincy-Cheng Jun 4, 2024
6c08cd9
Complete the Owner entity (CRUD)
Vincy-Cheng Jun 5, 2024
da30428
[wip] Add Item creation and category creation
Vincy-Cheng Jun 6, 2024
f700aa8
United all controller the same context
Vincy-Cheng Jun 7, 2024
4062e07
Update controller for owner and item
Vincy-Cheng Jun 7, 2024
cd21437
Update entity attribute (add payment method)
Vincy-Cheng Jun 7, 2024
b8581b8
Complete add item views
Vincy-Cheng Jun 7, 2024
30b3f46
Format file
Vincy-Cheng Jun 7, 2024
4cb42e3
Update function parameter order
Vincy-Cheng Jun 8, 2024
5ca2864
Add manage category
Vincy-Cheng Jun 8, 2024
91be3a2
Update controller setting and add category ...
Vincy-Cheng Jun 8, 2024
0acd063
Update GridItem view related variable setting...
Vincy-Cheng Jun 8, 2024
c2c5872
[wip] Handle selected item in the calculated view
Vincy-Cheng Jun 8, 2024
4b6eff6
Add asset folder
Vincy-Cheng Jun 10, 2024
1380e9f
Update some setting and assete
Vincy-Cheng Jun 11, 2024
9707542
Update controllers and entity setting
Vincy-Cheng Jun 11, 2024
c16de8b
Update the following things
Vincy-Cheng Jun 11, 2024
d4a8c8c
Change the order of payment methods
Vincy-Cheng Jun 11, 2024
9afab19
[wip] grouping transaction items
Vincy-Cheng Jun 11, 2024
868b49e
Update controllers' services
Vincy-fivestones Jun 12, 2024
23e9fe6
update views as function params are changed
Vincy-fivestones Jun 12, 2024
0baaecb
[wip] Add icon to text buttons & pre-insert item
Vincy-fivestones Jun 12, 2024
9971a44
Update pre-insert item
Vincy-fivestones Jun 12, 2024
d42057f
Replace the image not found
Vincy-fivestones Jun 12, 2024
ed6a988
Reconstruct the views and some button label
Vincy-fivestones Jun 12, 2024
9d4317e
FIx preInsert didn't check existing category name
Vincy-Cheng Jun 12, 2024
9d5a519
Add launch screen and app icon
Vincy-Cheng Jun 15, 2024
f38aa97
Fix bug on updating the item info and update ...
Vincy-Cheng Jun 15, 2024
7a564d1
Add some filtering and fix bug
Vincy-Cheng Jun 15, 2024
ec03b2e
Update the schema
Vincy-Cheng Jun 15, 2024
39f73a9
Update the app icon and launch screen...
Vincy-Cheng Jun 15, 2024
a4d9b7e
Move deprecated files to folder
Vincy-Cheng Jun 17, 2024
1a0f10f
update launch screen
Vincy-Cheng Jun 17, 2024
399a7b9
Remove extra controller and comment
Vincy-Cheng Jun 17, 2024
19bf293
Rename project files
Vincy-Cheng Jun 18, 2024
3772965
Add swiftlint and swiftformat setting
Vincy-Cheng Jun 20, 2024
b7c8a7b
Format file content
Vincy-Cheng Jun 20, 2024
b4a5fa7
Reorder the script run
Vincy-Cheng Jun 20, 2024
4fc613f
Fix Trailing Closure Violation
Vincy-Cheng Jun 20, 2024
ed9b187
Fix Trailing Closure Violation and ...
Vincy-Cheng Jun 20, 2024
d93876b
Refactor functions
Vincy-Cheng Jun 21, 2024
780438f
Add view for grouping the transaction by payment
Vincy-Cheng Jun 29, 2024
0e40b51
Change the text color of picker to primary color
Vincy-Cheng Jun 29, 2024
c81e0cf
add receipt background on record page
Vincy-Cheng Jul 1, 2024
d0a4e0f
Add color set for button (theme color and bg ...
Vincy-Cheng Jul 23, 2024
c240524
Update the following things
Vincy-Cheng Aug 3, 2024
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
26 changes: 26 additions & 0 deletions .swiftformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# format options

--binarygrouping none
--decimalgrouping none
--octalgrouping none
--exponentcase lowercase
--header ignore
--ifdef outdent
--indent 2
--maxwidth 120
--self init-only
--stripunusedargs unnamed-only
--swiftversion 5
--trimwhitespace always
--wraparguments before-first
--wrapparameters before-first
--wrapcollections before-first
--xcodeindentation enabled
--nospaceoperators ...,..>,..<

# rules

--enable isEmpty
--enable blankLineAfterImports
--disable wrapArguments
--disable trailingCommas
48 changes: 48 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
disabled_rules:
- trailing_whitespace
- force_cast
- force_try
- unused_setter_value
- file_lenght
- valid_ibinspectable
- shorthand_operator
- file_header
- discarded_notification_center_observer
- empty_enum_arguments
- prohibited_super_call
- missing_docs
- unneeded_override

opt_in_rules:
- empty_count
- explicit_init
- yoda_condition
- closure_end_indentation
- closure_spacing
- fatal_error_message
- first_where
- operator_usage_whitespace
- overriden_super_call
- redundant_nil_coalescing
- multiline_parameters
- vertical_parameter_alignment_on_call
- joined_default_parameter
- unneeded_parenthesis_in_closure_argument

excluded:
- Carthage/
- Pods/
- Generated/

# Rule to enforce camelCase for variable and constant names
identifier_name:
min_length: 1
max_length:
warning: 50
error: 60
excluded: ["id", "url"] # Exclude certain identifiers from the rule

# Rule to limit the length of function bodies
function_body_length:
warning: 100
error: 200
Binary file added Assets/Image-Not-Found.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Lauching_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/mark_icon-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Scanner.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
<dict/>
</plist>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildLocationStyle</key>
<string>UseAppPreferences</string>
<key>CustomBuildLocationType</key>
<string>RelativeToDerivedData</string>
<key>DerivedDataLocationStyle</key>
<string>Default</string>
<key>ShowSharedSchemesAutomaticallyEnabled</key>
<true/>
</dict>
</plist>
78 changes: 78 additions & 0 deletions Calculator.xcodeproj/xcshareddata/xcschemes/Calculator.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "037C8CB52B122C7C005F3DF6"
BuildableName = "Calculator.app"
BlueprintName = "Calculator"
ReferencedContainer = "container:Calculator.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "037C8CB52B122C7C005F3DF6"
BuildableName = "Calculator.app"
BlueprintName = "Calculator"
ReferencedContainer = "container:Calculator.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "037C8CB52B122C7C005F3DF6"
BuildableName = "Calculator.app"
BlueprintName = "Calculator"
ReferencedContainer = "container:Calculator.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "581DD0E5-66EF-4888-A001-5C8A8F442924"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6931E61B-15A1-431A-871F-B6D33337988C"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Scanner/Views/ListPurchaseLogView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "19"
endingLineNumber = "19"
landmarkName = "body"
landmarkType = "24">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "1112F9EA-ED0D-4DD4-823E-4A909BB59D04"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Scanner/Views/Items/ListItemView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "12"
endingLineNumber = "12"
landmarkName = "ItemGroup"
landmarkType = "14">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "00F2F6D8-164B-4F4B-88BD-47CE021F6826"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Scanner/DataModel/ItemController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "94"
endingLineNumber = "94"
landmarkName = "findItemById(context:withId:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Calculator.xcscheme_^#shared#^_</key>
<dict>
<key>isShown</key>
<true/>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>SWXMLHashPlayground (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>SWXMLHashPlayground (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>SWXMLHashPlayground (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>037C8CB52B122C7C005F3DF6</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>037C8CC52B122C7D005F3DF6</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>037C8CCF2B122C7D005F3DF6</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "icon.png",
"filename" : "mark_icon-02.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions Calculator/Assets.xcassets/Colors/Mark.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "255",
"green" : "108",
"red" : "120"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "255",
"green" : "108",
"red" : "120"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading