Skip to content

Commit 7ef6503

Browse files
crazytonylicrazytonyli
committed
Format stats widget sources with swift-format
1 parent a8eb281 commit 7ef6503

7 files changed

Lines changed: 89 additions & 45 deletions

File tree

‎Sources/JetpackStatsWidgets/Sources/Helpers/WidgetDataReader.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ final class WidgetDataReader<T: HomeWidgetData> {
66
let userDefaults: UserDefaults?
77
let cacheReader: WidgetDataCacheReader
88

9-
init(_ userDefaults: UserDefaults? = UserDefaults(suiteName: BuildSettings.current.appGroupName),
10-
_ cacheReader: any WidgetDataCacheReader = HomeWidgetDataFileReader()
9+
init(
10+
_ userDefaults: UserDefaults? = UserDefaults(suiteName: BuildSettings.current.appGroupName),
11+
_ cacheReader: any WidgetDataCacheReader = HomeWidgetDataFileReader()
1112
) {
1213
self.userDefaults = userDefaults
1314
self.cacheReader = cacheReader

‎Sources/JetpackStatsWidgets/Sources/LockScreenWidgets/LockScreenSiteListProvider.swift‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ struct LockScreenSiteListProvider<T: HomeWidgetData>: IntentTimelineProvider {
1515
let minElapsedTimeToRefresh = 1
1616

1717
private var defaultSiteID: Int? {
18-
UserDefaults(suiteName: BuildSettings.current.appGroupName)?.object(forKey: WidgetStatsConfiguration.userDefaultsSiteIdKey) as? Int
18+
UserDefaults(suiteName: BuildSettings.current.appGroupName)?
19+
.object(forKey: WidgetStatsConfiguration.userDefaultsSiteIdKey) as? Int
1920
}
2021

2122
private let widgetDataLoader = WidgetDataReader<T>()
@@ -24,7 +25,11 @@ struct LockScreenSiteListProvider<T: HomeWidgetData>: IntentTimelineProvider {
2425
LockScreenStatsWidgetEntry.siteSelected(placeholderContent, context)
2526
}
2627

27-
func getSnapshot(for configuration: SelectSiteIntent, in context: Context, completion: @escaping (LockScreenStatsWidgetEntry<T>) -> Void) {
28+
func getSnapshot(
29+
for configuration: SelectSiteIntent,
30+
in context: Context,
31+
completion: @escaping (LockScreenStatsWidgetEntry<T>) -> Void
32+
) {
2833
switch widgetDataLoader.widgetData(for: configuration, defaultSiteID: defaultSiteID) {
2934
case .success(let widgetData):
3035
completion(.siteSelected(widgetData, context))
@@ -33,15 +38,21 @@ struct LockScreenSiteListProvider<T: HomeWidgetData>: IntentTimelineProvider {
3338
}
3439
}
3540

36-
func getTimeline(for configuration: SelectSiteIntent, in context: Context, completion: @escaping (Timeline<LockScreenStatsWidgetEntry<T>>) -> Void) {
41+
func getTimeline(
42+
for configuration: SelectSiteIntent,
43+
in context: Context,
44+
completion: @escaping (Timeline<LockScreenStatsWidgetEntry<T>>) -> Void
45+
) {
3746
switch widgetDataLoader.widgetData(
3847
for: configuration,
3948
defaultSiteID: defaultSiteID
4049
) {
4150
case .success(let widgetData):
4251
let date = Date()
4352
let nextRefreshDate = Calendar.current.date(byAdding: .minute, value: refreshInterval, to: date) ?? date
44-
let elapsedTime = abs(Calendar.current.dateComponents([.minute], from: widgetData.date, to: date).minute ?? 0)
53+
let elapsedTime = abs(
54+
Calendar.current.dateComponents([.minute], from: widgetData.date, to: date).minute ?? 0
55+
)
4556

4657
let privateCompletion = { (timelineEntry: LockScreenStatsWidgetEntry<T>) in
4758
let timeline = Timeline(entries: [timelineEntry], policy: .after(nextRefreshDate))
@@ -56,7 +67,9 @@ struct LockScreenSiteListProvider<T: HomeWidgetData>: IntentTimelineProvider {
5667
service.fetchStats(for: widgetData) { result in
5768
switch result {
5869
case .failure(let error):
59-
DDLogError("LockScreen StatsWidgets: failed to fetch remote stats. Returned error: \(error.localizedDescription)")
70+
DDLogError(
71+
"LockScreen StatsWidgets: failed to fetch remote stats. Returned error: \(error.localizedDescription)"
72+
)
6073
privateCompletion(.siteSelected(widgetData, context))
6174
case .success(let newWidgetData):
6275
if let newWidgetData = newWidgetData as? T {

‎Sources/JetpackStatsWidgets/Sources/LockScreenWidgets/LockScreenStatsWidget.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ struct LockScreenStatsWidget<T: LockScreenStatsWidgetConfig>: Widget {
2525
placeholderContent: config.placeholderContent
2626
)
2727
) { (entry: LockScreenStatsWidgetEntry) -> LockScreenStatsWidgetsView in
28-
return LockScreenStatsWidgetsView(
28+
LockScreenStatsWidgetsView(
2929
timelineEntry: entry,
3030
viewProvider: config.viewProvider
3131
)
3232
}
3333
.configurationDisplayName(config.displayName)
3434
.description(config.description)
3535
.supportedFamilies(config.supportFamilies)
36-
.iOS17ContentMarginsDisabled() /// Temporarily disable additional iOS17 margins for widgets
36+
.iOS17ContentMarginsDisabled()/// Temporarily disable additional iOS17 margins for widgets
3737
}
3838
}

‎Sources/JetpackStatsWidgets/Sources/SiteListProvider.swift‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ struct SiteListProvider<T: HomeWidgetData>: IntentTimelineProvider {
1717
let minElapsedTimeToRefresh = 1
1818

1919
private var defaultSiteID: Int? {
20-
UserDefaults(suiteName: BuildSettings.current.appGroupName)?.object(forKey: WidgetStatsConfiguration.userDefaultsSiteIdKey) as? Int
20+
UserDefaults(suiteName: BuildSettings.current.appGroupName)?
21+
.object(forKey: WidgetStatsConfiguration.userDefaultsSiteIdKey) as? Int
2122
}
2223

2324
private let widgetDataLoader = WidgetDataReader<T>()
@@ -26,7 +27,11 @@ struct SiteListProvider<T: HomeWidgetData>: IntentTimelineProvider {
2627
StatsWidgetEntry.siteSelected(placeholderContent, context)
2728
}
2829

29-
func getSnapshot(for configuration: SelectSiteIntent, in context: Context, completion: @escaping (StatsWidgetEntry) -> Void) {
30+
func getSnapshot(
31+
for configuration: SelectSiteIntent,
32+
in context: Context,
33+
completion: @escaping (StatsWidgetEntry) -> Void
34+
) {
3035
switch widgetDataLoader.widgetData(for: configuration, defaultSiteID: defaultSiteID) {
3136
case .success(let widgetData):
3237
completion(.siteSelected(widgetData, context))
@@ -35,15 +40,21 @@ struct SiteListProvider<T: HomeWidgetData>: IntentTimelineProvider {
3540
}
3641
}
3742

38-
func getTimeline(for configuration: SelectSiteIntent, in context: Context, completion: @escaping (Timeline<StatsWidgetEntry>) -> Void) {
43+
func getTimeline(
44+
for configuration: SelectSiteIntent,
45+
in context: Context,
46+
completion: @escaping (Timeline<StatsWidgetEntry>) -> Void
47+
) {
3948
switch widgetDataLoader.widgetData(
4049
for: configuration,
4150
defaultSiteID: defaultSiteID
4251
) {
4352
case .success(let widgetData):
4453
let date = Date()
4554
let nextRefreshDate = Calendar.current.date(byAdding: .minute, value: refreshInterval, to: date) ?? date
46-
let elapsedTime = abs(Calendar.current.dateComponents([.minute], from: widgetData.date, to: date).minute ?? 0)
55+
let elapsedTime = abs(
56+
Calendar.current.dateComponents([.minute], from: widgetData.date, to: date).minute ?? 0
57+
)
4758

4859
let privateCompletion = { (timelineEntry: StatsWidgetEntry) in
4960
let timeline = Timeline(entries: [timelineEntry], policy: .after(nextRefreshDate))
@@ -58,7 +69,9 @@ struct SiteListProvider<T: HomeWidgetData>: IntentTimelineProvider {
5869
service.fetchStats(for: widgetData) { result in
5970
switch result {
6071
case .failure(let error):
61-
DDLogError("StatsWidgets: failed to fetch remote stats. Returned error: \(error.localizedDescription)")
72+
DDLogError(
73+
"StatsWidgets: failed to fetch remote stats. Returned error: \(error.localizedDescription)"
74+
)
6275
privateCompletion(.siteSelected(widgetData, context))
6376
case .success(let newWidgetData):
6477
privateCompletion(.siteSelected(newWidgetData, context))

‎Sources/JetpackStatsWidgets/Sources/Widgets/HomeWidgetAllTime.swift‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,17 @@ struct HomeWidgetAllTime: Widget {
2424
IntentConfiguration(
2525
kind: WidgetStatsConfiguration.Kind.homeAllTime.rawValue,
2626
intent: SelectSiteIntent.self,
27-
provider: SiteListProvider<HomeWidgetAllTimeData>(service: StatsWidgetsService(),
28-
placeholderContent: placeholderContent,
29-
widgetKind: .allTime)
27+
provider: SiteListProvider<HomeWidgetAllTimeData>(
28+
service: StatsWidgetsService(),
29+
placeholderContent: placeholderContent,
30+
widgetKind: .allTime
31+
)
3032
) { (entry: StatsWidgetEntry) -> StatsWidgetsView in
31-
return StatsWidgetsView(timelineEntry: entry)
33+
StatsWidgetsView(timelineEntry: entry)
3234
}
3335
.configurationDisplayName(LocalizableStrings.allTimeWidgetTitle)
3436
.description(LocalizableStrings.allTimePreviewDescription)
3537
.supportedFamilies([.systemSmall, .systemMedium])
36-
.iOS17ContentMarginsDisabled() /// Temporarily disable additional iOS17 margins for widgets
38+
.iOS17ContentMarginsDisabled()/// Temporarily disable additional iOS17 margins for widgets
3739
}
3840
}

‎Sources/JetpackStatsWidgets/Sources/Widgets/HomeWidgetThisWeek.swift‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,56 @@ struct HomeWidgetThisWeek: Widget {
1818
ThisWeekWidgetDay(
1919
date: Date(),
2020
viewsCount: 130,
21-
dailyChangePercent: -0.22),
21+
dailyChangePercent: -0.22
22+
),
2223
ThisWeekWidgetDay(
2324
date: Date(timeIntervalSinceNow: -Self.secondsPerDay),
2425
viewsCount: 250,
25-
dailyChangePercent: -0.06),
26+
dailyChangePercent: -0.06
27+
),
2628
ThisWeekWidgetDay(
2729
date: Date(timeIntervalSinceNow: -(Self.secondsPerDay * 2)),
2830
viewsCount: 260,
29-
dailyChangePercent: 0.86),
31+
dailyChangePercent: 0.86
32+
),
3033
ThisWeekWidgetDay(
3134
date: Date(timeIntervalSinceNow: -(Self.secondsPerDay * 3)),
3235
viewsCount: 140,
33-
dailyChangePercent: -0.3),
36+
dailyChangePercent: -0.3
37+
),
3438
ThisWeekWidgetDay(
3539
date: Date(timeIntervalSinceNow: -(Self.secondsPerDay * 4)),
3640
viewsCount: 200,
37-
dailyChangePercent: -0.46),
41+
dailyChangePercent: -0.46
42+
),
3843
ThisWeekWidgetDay(
3944
date: Date(timeIntervalSinceNow: -(Self.secondsPerDay * 5)),
4045
viewsCount: 370,
41-
dailyChangePercent: 0.19),
46+
dailyChangePercent: 0.19
47+
),
4248
ThisWeekWidgetDay(
4349
date: Date(timeIntervalSinceNow: -(Self.secondsPerDay * 6)),
4450
viewsCount: 310,
45-
dailyChangePercent: 0.07)
51+
dailyChangePercent: 0.07
52+
)
4653
])
4754
)
4855

4956
var body: some WidgetConfiguration {
5057
IntentConfiguration(
5158
kind: WidgetStatsConfiguration.Kind.homeThisWeek.rawValue,
5259
intent: SelectSiteIntent.self,
53-
provider: SiteListProvider<HomeWidgetThisWeekData>(service: StatsWidgetsService(),
54-
placeholderContent: placeholderContent,
55-
widgetKind: .thisWeek)
60+
provider: SiteListProvider<HomeWidgetThisWeekData>(
61+
service: StatsWidgetsService(),
62+
placeholderContent: placeholderContent,
63+
widgetKind: .thisWeek
64+
)
5665
) { (entry: StatsWidgetEntry) -> StatsWidgetsView in
57-
return StatsWidgetsView(timelineEntry: entry)
66+
StatsWidgetsView(timelineEntry: entry)
5867
}
5968
.configurationDisplayName(LocalizableStrings.thisWeekWidgetTitle)
6069
.description(LocalizableStrings.thisWeekPreviewDescription)
6170
.supportedFamilies([.systemMedium, .systemLarge])
62-
.iOS17ContentMarginsDisabled() /// Temporarily disable additional iOS17 margins for widgets
71+
.iOS17ContentMarginsDisabled()/// Temporarily disable additional iOS17 margins for widgets
6372
}
6473
}

‎Sources/JetpackStatsWidgets/Sources/Widgets/HomeWidgetToday.swift‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,35 @@ import TracksMini
77
struct HomeWidgetToday: Widget {
88
private let tracks = Tracks()
99

10-
private let placeholderContent = HomeWidgetTodayData(siteID: 0,
11-
siteName: "My WordPress Site",
12-
url: "",
13-
timeZone: TimeZone.current,
14-
date: Date(),
15-
stats: TodayWidgetStats(views: 649,
16-
visitors: 572,
17-
likes: 16,
18-
comments: 8))
10+
private let placeholderContent = HomeWidgetTodayData(
11+
siteID: 0,
12+
siteName: "My WordPress Site",
13+
url: "",
14+
timeZone: TimeZone.current,
15+
date: Date(),
16+
stats: TodayWidgetStats(
17+
views: 649,
18+
visitors: 572,
19+
likes: 16,
20+
comments: 8
21+
)
22+
)
1923

2024
var body: some WidgetConfiguration {
2125
IntentConfiguration(
2226
kind: WidgetStatsConfiguration.Kind.homeToday.rawValue,
2327
intent: SelectSiteIntent.self,
24-
provider: SiteListProvider<HomeWidgetTodayData>(service: StatsWidgetsService(),
25-
placeholderContent: placeholderContent,
26-
widgetKind: .today)
28+
provider: SiteListProvider<HomeWidgetTodayData>(
29+
service: StatsWidgetsService(),
30+
placeholderContent: placeholderContent,
31+
widgetKind: .today
32+
)
2733
) { (entry: StatsWidgetEntry) -> StatsWidgetsView in
28-
return StatsWidgetsView(timelineEntry: entry)
34+
StatsWidgetsView(timelineEntry: entry)
2935
}
3036
.configurationDisplayName(LocalizableStrings.todayWidgetTitle)
3137
.description(LocalizableStrings.todayPreviewDescription)
3238
.supportedFamilies([.systemSmall, .systemMedium])
33-
.iOS17ContentMarginsDisabled() /// Temporarily disable additional iOS17 margins for widgets for StandBy
39+
.iOS17ContentMarginsDisabled()/// Temporarily disable additional iOS17 margins for widgets for StandBy
3440
}
3541
}

0 commit comments

Comments
 (0)