Skip to content

Analytics Hub: Release Custom Date Ranges #8414

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

Merged
merged 3 commits into from
Dec 15, 2022
Merged

Analytics Hub: Release Custom Date Ranges #8414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79787c0
Adjust calendar spacings
Ecarrion Dec 14, 2022
61187ae
Remove feature flag control
Ecarrion Dec 14, 2022
9418ad5
Updates release notes
Ecarrion Dec 14, 2022
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
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

11.7
-----
- [**] Analytics Hub: Now you can select custom date ranges. [https://github.com/woocommerce/woocommerce-ios/pull/8414]


11.6
Expand Down
19 changes: 0 additions & 19 deletions WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsTimeRangeCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,24 +162,5 @@ extension AnalyticsTimeRangeCard {
case monthToDate
case quarterToDate
case yearToDate

/// Wee need to provide a custom `allCases` in order to evict `.custom` while the feature flag is active.
/// We should delete this once the feature flag has been removed.
///
static var allCases: [Range] {
[
ServiceLocator.featureFlagService.isFeatureFlagEnabled(.analyticsHub) ? .custom : nil,
.today,
.yesterday,
.lastWeek,
.lastMonth,
.lastQuarter,
.lastYear,
.weekToDate,
.monthToDate,
.quarterToDate,
yearToDate
].compactMap { $0 }
}
}
}
3 changes: 3 additions & 0 deletions WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/RangedDatePicker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ struct RangedDatePicker: View {
DatePicker("", selection: $startDate, in: ...Date(), displayedComponents: [.date])
.datePickerStyle(.graphical)
.accentColor(Color(.brand))
.padding(.horizontal, Layout.calendarPadding)

// End Picker
Text(Localization.endDate)
Expand All @@ -54,6 +55,7 @@ struct RangedDatePicker: View {
DatePicker("", selection: $endDate, in: ...Date(), displayedComponents: [.date])
.datePickerStyle(.graphical)
.accentColor(Color(.brand))
.padding(.horizontal, Layout.calendarPadding)
}
.padding()
}
Expand Down Expand Up @@ -103,6 +105,7 @@ private extension RangedDatePicker {
}
enum Layout {
static let titleSpacing: CGFloat = 4.0
static let calendarPadding: CGFloat = -8.0
}
}

Expand Down