Skip to content

Commit

Permalink
Merge pull request #333 from aapis/feature/1.17/release
Browse files Browse the repository at this point in the history
1.17 Release
  • Loading branch information
aapis authored Nov 9, 2024
2 parents eb6c6e1 + c8f6c25 commit fb1d7f8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ extension WidgetLibrary.UI {
struct ByWeek: View {
@EnvironmentObject public var state: Navigation
@AppStorage("settings.accessibility.showUIHints") private var showUIHints: Bool = true
@AppStorage("widgetlibrary.ui.entitycalendar.isWeekAtAGlanceMinimized") private var isWeekAtAGlanceMinimized: Bool = false
private var twoCol: [GridItem] { Array(repeating: .init(.flexible(minimum: 100)), count: 2) }

var body: some View {
Expand All @@ -171,9 +170,8 @@ extension WidgetLibrary.UI {
UI.EntityCalendar.WeekWidget(
start: self.state.session.date.startOfWeek
)
if !self.isWeekAtAGlanceMinimized {
UI.ActivityFeed()
}
FancyDivider()
UI.ActivityFeed()
Spacer()
LazyVGrid(columns: self.twoCol, alignment: .leading) {
GridRow {
Expand Down
8 changes: 4 additions & 4 deletions KlockWork.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 188;
CURRENT_PROJECT_VERSION = 189;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 6DT7L2N5X6;
Expand All @@ -2004,7 +2004,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.6;
MARKETING_VERSION = 1.16;
MARKETING_VERSION = 1.17;
PRODUCT_BUNDLE_IDENTIFIER = com.yegcollective.DLPrototype;
PRODUCT_NAME = KlockWork.Beta;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
Expand All @@ -2025,7 +2025,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 188;
CURRENT_PROJECT_VERSION = 189;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 6DT7L2N5X6;
Expand All @@ -2041,7 +2041,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.6;
MARKETING_VERSION = 1.16;
MARKETING_VERSION = 1.17;
PRODUCT_BUNDLE_IDENTIFIER = com.yegcollective.DLPrototype;
PRODUCT_NAME = KlockWork;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down

0 comments on commit fb1d7f8

Please sign in to comment.