Skip to content

Saharai working2 #4

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

Open
lzhang39 wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Saharai working2 #4

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
9742640
lottie animation trial
scantea Aug 9, 2021
b3001c8
lottie changes
scantea Aug 9, 2021
712ed7c
podfile placeholder added
scantea Aug 9, 2021
b795368
adds some new features like Picker
lzhang39 Aug 9, 2021
ec4c557
timestamp
scantea Aug 10, 2021
fad9a9c
fixes adding date and waves to core data
lzhang39 Aug 10, 2021
8d26be5
adds date timestamp formatted to past history page
lzhang39 Aug 10, 2021
062ccf1
adds segue to new VC
lzhang39 Aug 11, 2021
1df67a4
trying some things
lzhang39 Aug 12, 2021
6a864ae
committing
lzhang39 Aug 12, 2021
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added NoteAppCoreData/.DS_Store
View file
Open in desktop
Binary file not shown.
107 changes: 106 additions & 1 deletion NoteAppCoreData/NoteAppCoreData.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -17,6 +17,10 @@
2E37155F25C101E20037351E /* NoteCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E37155E25C101E20037351E /* NoteCell.swift */; };
2E37156225C102060037351E /* NoteTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E37156125C102060037351E /* NoteTableView.swift */; };
2E91899925C2BCDC00A3C567 /* Note.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E91899825C2BCDC00A3C567 /* Note.swift */; };
3EF77F8426C35094008884B9 /* SingleViewVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EF77F8326C35094008884B9 /* SingleViewVC.swift */; };
4B23E35F519145D051F5C22C /* Pods_NoteAppCoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22F6A6FE398A3832A37C0353 /* Pods_NoteAppCoreData.framework */; };
607369BE26C1754100E14ADF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 607369BD26C1754100E14ADF /* Lottie */; };
607369C226C178BC00E14ADF /* wave-loader.json in Resources */ = {isa = PBXBuildFile; fileRef = 607369C126C178BC00E14ADF /* wave-loader.json */; };
607F9F3826BF288400EFB172 /* NotificationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607F9F3726BF288400EFB172 /* NotificationsViewController.swift */; };
607F9F3A26BF31CD00EFB172 /* WaveExplanationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607F9F3926BF31CD00EFB172 /* WaveExplanationViewController.swift */; };
607F9F3C26BF328B00EFB172 /* ReturningMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607F9F3B26BF328B00EFB172 /* ReturningMainViewController.swift */; };
Expand All @@ -30,6 +34,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
22F6A6FE398A3832A37C0353 /* Pods_NoteAppCoreData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NoteAppCoreData.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2E37154325C0FB980037351E /* NoteAppCoreData.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NoteAppCoreData.app; sourceTree = BUILT_PRODUCTS_DIR; };
2E37154625C0FB980037351E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2E37154825C0FB980037351E /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -42,6 +47,8 @@
2E37155E25C101E20037351E /* NoteCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteCell.swift; sourceTree = "<group>"; };
2E37156125C102060037351E /* NoteTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteTableView.swift; sourceTree = "<group>"; };
2E91899825C2BCDC00A3C567 /* Note.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Note.swift; sourceTree = "<group>"; };
3EF77F8326C35094008884B9 /* SingleViewVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleViewVC.swift; sourceTree = "<group>"; };
607369C126C178BC00E14ADF /* wave-loader.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "wave-loader.json"; sourceTree = "<group>"; };
607F9F3726BF288400EFB172 /* NotificationsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = NotificationsViewController.swift; path = NoteAppCoreData/NotificationsViewController.swift; sourceTree = SOURCE_ROOT; };
607F9F3926BF31CD00EFB172 /* WaveExplanationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaveExplanationViewController.swift; sourceTree = "<group>"; };
607F9F3B26BF328B00EFB172 /* ReturningMainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReturningMainViewController.swift; sourceTree = "<group>"; };
Expand All @@ -52,13 +59,17 @@
607F9F6326BF57FF00EFB172 /* Wave2SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wave2SwiftUIView.swift; sourceTree = "<group>"; };
607F9F6526BF5CEF00EFB172 /* WaveThreeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaveThreeViewController.swift; sourceTree = "<group>"; };
607F9F6826BF5D1900EFB172 /* Wave3SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wave3SwiftUIView.swift; sourceTree = "<group>"; };
7F66A98DE5B405E9C8FB5BCF /* Pods-NoteAppCoreData.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NoteAppCoreData.debug.xcconfig"; path = "Target Support Files/Pods-NoteAppCoreData/Pods-NoteAppCoreData.debug.xcconfig"; sourceTree = "<group>"; };
C4F853FCD3C32199AEEB0548 /* Pods-NoteAppCoreData.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NoteAppCoreData.release.xcconfig"; path = "Target Support Files/Pods-NoteAppCoreData/Pods-NoteAppCoreData.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
2E37154025C0FB980037351E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
607369BE26C1754100E14ADF /* Lottie in Frameworks */,
4B23E35F519145D051F5C22C /* Pods_NoteAppCoreData.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -70,6 +81,8 @@
children = (
2E37154525C0FB980037351E /* NoteAppCoreData */,
2E37154425C0FB980037351E /* Products */,
6AF259FB9629211CACAADDCD /* Pods */,
7D9B3673641228F28485C40C /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -84,6 +97,7 @@
2E37154525C0FB980037351E /* NoteAppCoreData */ = {
isa = PBXGroup;
children = (
607369C126C178BC00E14ADF /* wave-loader.json */,
2E37154625C0FB980037351E /* AppDelegate.swift */,
2E37154825C0FB980037351E /* SceneDelegate.swift */,
607F9F3526BF091900EFB172 /* Data Model */,
Expand All @@ -101,6 +115,7 @@
607F9F3B26BF328B00EFB172 /* ReturningMainViewController.swift */,
607F9F3726BF288400EFB172 /* NotificationsViewController.swift */,
2E37154A25C0FB980037351E /* NoteDetailVC.swift */,
3EF77F8326C35094008884B9 /* SingleViewVC.swift */,
607F9F3426BF086B00EFB172 /* TableView */,
607F9F4126BF49B000EFB172 /* Wave Animation */,
);
Expand Down Expand Up @@ -173,22 +188,44 @@
path = WaveThree;
sourceTree = "<group>";
};
6AF259FB9629211CACAADDCD /* Pods */ = {
isa = PBXGroup;
children = (
7F66A98DE5B405E9C8FB5BCF /* Pods-NoteAppCoreData.debug.xcconfig */,
C4F853FCD3C32199AEEB0548 /* Pods-NoteAppCoreData.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
};
7D9B3673641228F28485C40C /* Frameworks */ = {
isa = PBXGroup;
children = (
22F6A6FE398A3832A37C0353 /* Pods_NoteAppCoreData.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
2E37154225C0FB980037351E /* NoteAppCoreData */ = {
isa = PBXNativeTarget;
buildConfigurationList = 2E37155A25C0FB9B0037351E /* Build configuration list for PBXNativeTarget "NoteAppCoreData" */;
buildPhases = (
B70255926BD643CB7F7B832D /* [CP] Check Pods Manifest.lock */,
2E37153F25C0FB980037351E /* Sources */,
2E37154025C0FB980037351E /* Frameworks */,
2E37154125C0FB980037351E /* Resources */,
CFA8F04D4152BAE24CF2879A /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = NoteAppCoreData;
packageProductDependencies = (
607369BD26C1754100E14ADF /* Lottie */,
);
productName = NoteAppCoreData;
productReference = 2E37154325C0FB980037351E /* NoteAppCoreData.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -216,6 +253,9 @@
Base,
);
mainGroup = 2E37153A25C0FB980037351E;
packageReferences = (
607369BC26C1754100E14ADF /* XCRemoteSwiftPackageReference "lottie-ios" */,
);
productRefGroup = 2E37154425C0FB980037351E /* Products */;
projectDirPath = "";
projectRoot = "";
Expand All @@ -232,12 +272,55 @@
files = (
2E37155625C0FB9B0037351E /* LaunchScreen.storyboard in Resources */,
2E37155325C0FB9B0037351E /* Assets.xcassets in Resources */,
607369C226C178BC00E14ADF /* wave-loader.json in Resources */,
2E37154E25C0FB980037351E /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
B70255926BD643CB7F7B832D /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-NoteAppCoreData-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
CFA8F04D4152BAE24CF2879A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NoteAppCoreData/Pods-NoteAppCoreData-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NoteAppCoreData/Pods-NoteAppCoreData-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NoteAppCoreData/Pods-NoteAppCoreData-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
2E37153F25C0FB980037351E /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand All @@ -246,6 +329,7 @@
607F9F3E26BF36D600EFB172 /* WaveOptionsViewController.swift in Sources */,
2E37154B25C0FB980037351E /* NoteDetailVC.swift in Sources */,
607F9F6626BF5CEF00EFB172 /* WaveThreeViewController.swift in Sources */,
3EF77F8426C35094008884B9 /* SingleViewVC.swift in Sources */,
607F9F4026BF491900EFB172 /* WaveOneViewController.swift in Sources */,
607F9F3A26BF31CD00EFB172 /* WaveExplanationViewController.swift in Sources */,
607F9F3C26BF328B00EFB172 /* ReturningMainViewController.swift in Sources */,
Expand Down Expand Up @@ -403,6 +487,7 @@
};
2E37155B25C0FB9B0037351E /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7F66A98DE5B405E9C8FB5BCF /* Pods-NoteAppCoreData.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand All @@ -422,6 +507,7 @@
};
2E37155C25C0FB9B0037351E /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C4F853FCD3C32199AEEB0548 /* Pods-NoteAppCoreData.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -462,6 +548,25 @@
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
607369BC26C1754100E14ADF /* XCRemoteSwiftPackageReference "lottie-ios" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/airbnb/lottie-ios";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.2.3;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
607369BD26C1754100E14ADF /* Lottie */ = {
isa = XCSwiftPackageProductDependency;
package = 607369BC26C1754100E14ADF /* XCRemoteSwiftPackageReference "lottie-ios" */;
productName = Lottie;
};
/* End XCSwiftPackageProductDependency section */

/* Begin XCVersionGroup section */
2E37154F25C0FB980037351E /* NoteAppCoreData.xcdatamodeld */ = {
isa = XCVersionGroup;
Expand Down
16 changes: 16 additions & 0 deletions ...eData/NoteAppCoreData.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

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

Binary file modified ...a.xcodeproj/project.xcworkspace/xcuserdata/ada.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
Binary file modified ...a.xcodeproj/project.xcworkspace/xcuserdata/lin.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...a/NoteAppCoreData.xcodeproj/xcuserdata/ada.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>NoteAppCoreData.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>2</integer>
</dict>
</dict>
</dict>
Expand Down
6 changes: 6 additions & 0 deletions ...NoteAppCoreData.xcodeproj/xcuserdata/lin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "2C6E8348-115A-4D6E-B69F-2CFA5320E1E9"
type = "1"
version = "2.0">
</Bucket>
2 changes: 1 addition & 1 deletion ...a/NoteAppCoreData.xcodeproj/xcuserdata/lin.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>NoteAppCoreData.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>2</integer>
</dict>
</dict>
</dict>
Expand Down
10 changes: 10 additions & 0 deletions NoteAppCoreData/NoteAppCoreData.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions NoteAppCoreData/NoteAppCoreData.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
16 changes: 16 additions & 0 deletions NoteAppCoreData/NoteAppCoreData.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

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

Binary file added ...ata/NoteAppCoreData.xcworkspace/xcuserdata/ada.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
Binary file added ...ata/NoteAppCoreData.xcworkspace/xcuserdata/lin.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
Binary file added NoteAppCoreData/NoteAppCoreData/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added NoteAppCoreData/NoteAppCoreData/Controllers/.DS_Store
View file
Open in desktop
Binary file not shown.
Loading