Skip to content

Commit 8a9f81c

Browse files
authored
Merge pull request #6 from alyxferrari/version-1.0.3
Sobretium v1.0.3
2 parents 0a07fd3 + a0a502f commit 8a9f81c

File tree

5 files changed

+24
-11
lines changed

5 files changed

+24
-11
lines changed

Sobretium.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@
224224
1C0E2E1928ECA9DB0063DB58 /* Themes */,
225225
1C0E2E1828ECA9A20063DB58 /* Rings */,
226226
1CA7E19128EA15CC005E68A0 /* Sheets */,
227-
1C37803028E765B300440E06 /* Development */,
228227
1C9F35EE28E6142D00C69CCB /* Settings */,
228+
1C37803028E765B300440E06 /* Development */,
229229
1C37802C28E7579100440E06 /* SobrietyEntry.xcdatamodeld */,
230230
1C91B1E228D0F2E30062C18A /* Assets.xcassets */,
231231
1C91B1E428D0F2E30062C18A /* Preview Content */,
@@ -435,7 +435,7 @@
435435
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
436436
CODE_SIGN_ENTITLEMENTS = "SobretiumWatch Watch App/SobretiumWatch Watch App.entitlements";
437437
CODE_SIGN_STYLE = Automatic;
438-
CURRENT_PROJECT_VERSION = 174;
438+
CURRENT_PROJECT_VERSION = 182;
439439
DEVELOPMENT_ASSET_PATHS = "\"SobretiumWatch Watch App/Preview Content\"";
440440
DEVELOPMENT_TEAM = W8C8UQ95CG;
441441
ENABLE_PREVIEWS = YES;
@@ -449,7 +449,7 @@
449449
"$(inherited)",
450450
"@executable_path/Frameworks",
451451
);
452-
MARKETING_VERSION = 1.0.2;
452+
MARKETING_VERSION = 1.0.3;
453453
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium.watchkitapp;
454454
PRODUCT_NAME = "$(TARGET_NAME)";
455455
SDKROOT = watchos;
@@ -469,7 +469,7 @@
469469
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
470470
CODE_SIGN_ENTITLEMENTS = "SobretiumWatch Watch App/SobretiumWatch Watch App.entitlements";
471471
CODE_SIGN_STYLE = Automatic;
472-
CURRENT_PROJECT_VERSION = 174;
472+
CURRENT_PROJECT_VERSION = 182;
473473
DEVELOPMENT_ASSET_PATHS = "\"SobretiumWatch Watch App/Preview Content\"";
474474
DEVELOPMENT_TEAM = W8C8UQ95CG;
475475
ENABLE_PREVIEWS = YES;
@@ -483,7 +483,7 @@
483483
"$(inherited)",
484484
"@executable_path/Frameworks",
485485
);
486-
MARKETING_VERSION = 1.0.2;
486+
MARKETING_VERSION = 1.0.3;
487487
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium.watchkitapp;
488488
PRODUCT_NAME = "$(TARGET_NAME)";
489489
SDKROOT = watchos;
@@ -617,7 +617,7 @@
617617
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
618618
CODE_SIGN_ENTITLEMENTS = Sobretium/Sobretium.entitlements;
619619
CODE_SIGN_STYLE = Automatic;
620-
CURRENT_PROJECT_VERSION = 174;
620+
CURRENT_PROJECT_VERSION = 182;
621621
DEVELOPMENT_ASSET_PATHS = "\"Sobretium/Preview Content\"";
622622
DEVELOPMENT_TEAM = W8C8UQ95CG;
623623
ENABLE_PREVIEWS = YES;
@@ -639,7 +639,7 @@
639639
"$(inherited)",
640640
"@executable_path/Frameworks",
641641
);
642-
MARKETING_VERSION = 1.0.2;
642+
MARKETING_VERSION = 1.0.3;
643643
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium;
644644
PRODUCT_NAME = "$(TARGET_NAME)";
645645
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -659,7 +659,7 @@
659659
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
660660
CODE_SIGN_ENTITLEMENTS = Sobretium/Sobretium.entitlements;
661661
CODE_SIGN_STYLE = Automatic;
662-
CURRENT_PROJECT_VERSION = 174;
662+
CURRENT_PROJECT_VERSION = 182;
663663
DEVELOPMENT_ASSET_PATHS = "\"Sobretium/Preview Content\"";
664664
DEVELOPMENT_TEAM = W8C8UQ95CG;
665665
ENABLE_PREVIEWS = YES;
@@ -678,7 +678,7 @@
678678
"$(inherited)",
679679
"@executable_path/Frameworks",
680680
);
681-
MARKETING_VERSION = 1.0.2;
681+
MARKETING_VERSION = 1.0.3;
682682
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium;
683683
PRODUCT_NAME = "$(TARGET_NAME)";
684684
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

Sobretium/Settings/Donation/DonateView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ struct DonateView: View {
3535
Text("However, if you'd like to support development of the app, you may do so here.")
3636
}
3737
.multilineTextAlignment(.center)
38+
.fixedSize(horizontal: false, vertical: true)
3839
.padding(.horizontal, 5)
3940
Spacer()
4041
.frame(maxWidth: 100, maxHeight: 100)

Sobretium/Sheets/EditTrackerSheet.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@ struct EditTrackerSheet: View {
4141
Divider()
4242
TextField(stealth ? "Tracker name" : "Addiction name", text: $name)
4343
}
44-
DatePicker("Start Date", selection: $pickerDate, displayedComponents: [.date, .hourAndMinute])
44+
VStack {
45+
HStack {
46+
Text("Start Date")
47+
Spacer()
48+
}
49+
DatePicker("", selection: $pickerDate, displayedComponents: [.date, .hourAndMinute])
50+
}
4551
HStack {
4652
Text("Subtitle")
4753
Divider()

Sobretium/Sheets/NewTimerSheet.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ struct NewTimerSheet: View {
1919
var body: some View {
2020
NavigationView {
2121
List {
22-
DatePicker("Start Date", selection: $startDate, displayedComponents: [.date, .hourAndMinute])
22+
VStack {
23+
HStack {
24+
Text("Start Date")
25+
Spacer()
26+
}
27+
DatePicker("", selection: $startDate, displayedComponents: [.date, .hourAndMinute])
28+
}
2329
TextField(stealth ? "Tracker name" : "Addiction name", text: $name)
2430
Toggle(isOn: $defaultEntry) {
2531
HStack {

0 commit comments

Comments
 (0)