Skip to content

Commit b658d04

Browse files
alyxandraioalyxandraio
authored
Merge pull request #11 from alyxferrari/version-1.0.5
Sobretium v1.0.5
2 parents 4a2c335 + 215906a commit b658d04

File tree

6 files changed

+44
-13
lines changed

6 files changed

+44
-13
lines changed

‎Sobretium.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
1C91B1E128D0F2E00062C18A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C91B1E028D0F2E00062C18A /* ContentView.swift */; };
2424
1C91B1E328D0F2E30062C18A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1C91B1E228D0F2E30062C18A /* Assets.xcassets */; };
2525
1C91B1E628D0F2E30062C18A /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1C91B1E528D0F2E30062C18A /* Preview Assets.xcassets */; };
26+
1C98187928FF246C00FF68BD /* PopupView in Frameworks */ = {isa = PBXBuildFile; productRef = 1C98187828FF246C00FF68BD /* PopupView */; };
2627
1C9F35EA28E60A3300C69CCB /* PathText in Frameworks */ = {isa = PBXBuildFile; productRef = 1C9F35E928E60A3300C69CCB /* PathText */; };
2728
1C9F35ED28E60A6300C69CCB /* Time in Frameworks */ = {isa = PBXBuildFile; productRef = 1C9F35EC28E60A6300C69CCB /* Time */; };
2829
1C9F35F028E6144000C69CCB /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C9F35EF28E6144000C69CCB /* AboutView.swift */; };
@@ -127,6 +128,7 @@
127128
isa = PBXFrameworksBuildPhase;
128129
buildActionMask = 2147483647;
129130
files = (
131+
1C98187928FF246C00FF68BD /* PopupView in Frameworks */,
130132
1C9F35EA28E60A3300C69CCB /* PathText in Frameworks */,
131133
1C9F35ED28E60A6300C69CCB /* Time in Frameworks */,
132134
);
@@ -330,6 +332,7 @@
330332
packageProductDependencies = (
331333
1C9F35E928E60A3300C69CCB /* PathText */,
332334
1C9F35EC28E60A6300C69CCB /* Time */,
335+
1C98187828FF246C00FF68BD /* PopupView */,
333336
);
334337
productName = Sobretium;
335338
productReference = 1C91B1DB28D0F2E00062C18A /* Sobretium.app */;
@@ -365,6 +368,7 @@
365368
packageReferences = (
366369
1C9F35E828E60A3300C69CCB /* XCRemoteSwiftPackageReference "CurvyText" */,
367370
1C9F35EB28E60A6300C69CCB /* XCRemoteSwiftPackageReference "time" */,
371+
1C98187728FF246C00FF68BD /* XCRemoteSwiftPackageReference "PopupView" */,
368372
);
369373
productRefGroup = 1C91B1DC28D0F2E00062C18A /* Products */;
370374
projectDirPath = "";
@@ -455,7 +459,7 @@
455459
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
456460
CODE_SIGN_ENTITLEMENTS = "SobretiumWatch Watch App/SobretiumWatch Watch App.entitlements";
457461
CODE_SIGN_STYLE = Automatic;
458-
CURRENT_PROJECT_VERSION = 206;
462+
CURRENT_PROJECT_VERSION = 225;
459463
DEVELOPMENT_ASSET_PATHS = "\"SobretiumWatch Watch App/Preview Content\"";
460464
DEVELOPMENT_TEAM = W8C8UQ95CG;
461465
ENABLE_PREVIEWS = YES;
@@ -469,7 +473,7 @@
469473
"$(inherited)",
470474
"@executable_path/Frameworks",
471475
);
472-
MARKETING_VERSION = 1.0.4;
476+
MARKETING_VERSION = 1.0.5;
473477
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium.watchkitapp;
474478
PRODUCT_NAME = "$(TARGET_NAME)";
475479
SDKROOT = watchos;
@@ -489,7 +493,7 @@
489493
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
490494
CODE_SIGN_ENTITLEMENTS = "SobretiumWatch Watch App/SobretiumWatch Watch App.entitlements";
491495
CODE_SIGN_STYLE = Automatic;
492-
CURRENT_PROJECT_VERSION = 206;
496+
CURRENT_PROJECT_VERSION = 225;
493497
DEVELOPMENT_ASSET_PATHS = "\"SobretiumWatch Watch App/Preview Content\"";
494498
DEVELOPMENT_TEAM = W8C8UQ95CG;
495499
ENABLE_PREVIEWS = YES;
@@ -503,7 +507,7 @@
503507
"$(inherited)",
504508
"@executable_path/Frameworks",
505509
);
506-
MARKETING_VERSION = 1.0.4;
510+
MARKETING_VERSION = 1.0.5;
507511
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium.watchkitapp;
508512
PRODUCT_NAME = "$(TARGET_NAME)";
509513
SDKROOT = watchos;
@@ -637,7 +641,7 @@
637641
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
638642
CODE_SIGN_ENTITLEMENTS = Sobretium/Sobretium.entitlements;
639643
CODE_SIGN_STYLE = Automatic;
640-
CURRENT_PROJECT_VERSION = 219;
644+
CURRENT_PROJECT_VERSION = 225;
641645
DEVELOPMENT_ASSET_PATHS = "\"Sobretium/Preview Content\"";
642646
DEVELOPMENT_TEAM = W8C8UQ95CG;
643647
ENABLE_PREVIEWS = YES;
@@ -659,7 +663,7 @@
659663
"$(inherited)",
660664
"@executable_path/Frameworks",
661665
);
662-
MARKETING_VERSION = 1.0.4;
666+
MARKETING_VERSION = 1.0.5;
663667
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium;
664668
PRODUCT_NAME = "$(TARGET_NAME)";
665669
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -679,7 +683,7 @@
679683
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
680684
CODE_SIGN_ENTITLEMENTS = Sobretium/Sobretium.entitlements;
681685
CODE_SIGN_STYLE = Automatic;
682-
CURRENT_PROJECT_VERSION = 219;
686+
CURRENT_PROJECT_VERSION = 225;
683687
DEVELOPMENT_ASSET_PATHS = "\"Sobretium/Preview Content\"";
684688
DEVELOPMENT_TEAM = W8C8UQ95CG;
685689
ENABLE_PREVIEWS = YES;
@@ -698,7 +702,7 @@
698702
"$(inherited)",
699703
"@executable_path/Frameworks",
700704
);
701-
MARKETING_VERSION = 1.0.4;
705+
MARKETING_VERSION = 1.0.5;
702706
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium;
703707
PRODUCT_NAME = "$(TARGET_NAME)";
704708
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -743,6 +747,14 @@
743747
/* End XCConfigurationList section */
744748

745749
/* Begin XCRemoteSwiftPackageReference section */
750+
1C98187728FF246C00FF68BD /* XCRemoteSwiftPackageReference "PopupView" */ = {
751+
isa = XCRemoteSwiftPackageReference;
752+
repositoryURL = "https://github.com/exyte/PopupView";
753+
requirement = {
754+
kind = upToNextMajorVersion;
755+
minimumVersion = 1.0.0;
756+
};
757+
};
746758
1C9F35E828E60A3300C69CCB /* XCRemoteSwiftPackageReference "CurvyText" */ = {
747759
isa = XCRemoteSwiftPackageReference;
748760
repositoryURL = "https://github.com/alyxferrari/CurvyText";
@@ -762,6 +774,11 @@
762774
/* End XCRemoteSwiftPackageReference section */
763775

764776
/* Begin XCSwiftPackageProductDependency section */
777+
1C98187828FF246C00FF68BD /* PopupView */ = {
778+
isa = XCSwiftPackageProductDependency;
779+
package = 1C98187728FF246C00FF68BD /* XCRemoteSwiftPackageReference "PopupView" */;
780+
productName = PopupView;
781+
};
765782
1C9F35E928E60A3300C69CCB /* PathText */ = {
766783
isa = XCSwiftPackageProductDependency;
767784
package = 1C9F35E828E60A3300C69CCB /* XCRemoteSwiftPackageReference "CurvyText" */;

‎Sobretium.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sobretium.xcodeproj/project.xcworkspace/xcuserdata/alyxferrari.xcuserdatad/UserInterfaceState.xcuserstate‎

8.45 KB
Binary file not shown.

‎Sobretium/Rings/RingView.swift‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,15 @@ struct RingView: View {
6464
Button("Cancel", role: .cancel) {}
6565
Button("Yes", role: .destructive) {
6666
entry.startDate = Date()
67+
if entry.streaks != nil {
68+
entry.streaks!.append(Date())
69+
}
6770
try? moc.save()
6871
}
6972
}
73+
.onAppear {
74+
entry.lastView = Date()
75+
try? moc.save()
76+
}
7077
}
7178
}

‎Sobretium/SobrietyEntry.xcdatamodeld/SobrietyEntries.xcdatamodel/contents‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21279" systemVersion="21G115" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
3-
<entity name="SobrietyEntry" representedClassName="SobrietyEntry" syncable="YES" codeGenerationType="class">
4-
<attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
5-
<attribute name="name" optional="YES" attributeType="String"/>
6-
<attribute name="startDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
7-
</entity>
3+
<entity name="SobrietyEntry" representedClassName="SobrietyEntry" syncable="YES" codeGenerationType="class"/>
84
</model>

‎Sobretium/SobrietyEntry.xcdatamodeld/SobrietyEntry.xcdatamodel/contents‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
<entity name="SobrietyEntry" representedClassName="SobrietyEntry" syncable="YES" codeGenerationType="class">
44
<attribute name="defaultEntry" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
55
<attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
6+
<attribute name="lastView" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
67
<attribute name="name" optional="YES" attributeType="String"/>
78
<attribute name="startDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
9+
<attribute name="streaks" optional="YES" attributeType="Transformable" valueTransformerName="NSSecureUnarchiveFromDataTransformer" customClassName="[Date]"/>
810
<attribute name="subtitle" optional="YES" attributeType="String"/>
911
<attribute name="themeIndex" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
1012
</entity>

0 commit comments

Comments
 (0)