mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-03-28 04:25:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into tip-system

Browse source
This commit is contained in:
Thomas Ricouard 2024-06-12 21:25:13 +02:00
commit 8cb6eaa065
8 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
IceCubesApp.xcodeproj/project.pbxproj
View file

@ -1193,7 +1193,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.10.42; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1228,7 +1228,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.10.42; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1336,7 +1336,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.10.42; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1370,7 +1370,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.10.42; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1552,7 +1552,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.10.42; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
PRODUCT_NAME = "Ice Cubes"; PRODUCT_NAME = "Ice Cubes";
SDKROOT = auto; SDKROOT = auto;
@ -1608,7 +1608,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.10.42; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
PRODUCT_NAME = "Ice Cubes"; PRODUCT_NAME = "Ice Cubes";
SDKROOT = auto; SDKROOT = auto;
@ -1643,7 +1643,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.10.42; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1678,7 +1678,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.10.42; MARKETING_VERSION = 1.10.43;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;

12
IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file

@ -3,10 +3,10 @@
{ {
"identity" : "bodega", "identity" : "bodega",
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/mergesort/Bodega", "location" : "https://github.com/Dimillian/Bodega",
"state" : { "state" : {
"revision" : "f0554077c178088ba11557bbdbb71775cc6a1b84", "branch" : "main",
"version" : "2.1.0" "revision" : "a144ed8afdd760b65b6b9a136ba8bb75cd19387e"
} }
}, },
{ {
@ -129,10 +129,10 @@
{ {
"identity" : "swiftui-introspect", "identity" : "swiftui-introspect",
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/siteline/SwiftUI-Introspect.git", "location" : "https://github.com/Dimillian/swiftui-introspect",
"state" : { "state" : {
"revision" : "7dc5b287f8040e4ad5038739850b758e78f77808", "branch" : "main",
"version" : "1.1.4" "revision" : "e5d36b00e6e437b552aa76ed6d1eca71d6fd8f8b"
} }
}, },
{ {

2
IceCubesApp/App/Main/AppView.swift
View file

@ -122,7 +122,7 @@ struct AppView: View {
.tag(tab) .tag(tab)
} }
} }
.introspect(.tabView, on: .iOS(.v17)) { (tabview: UITabBarController) in .introspect(.tabView, on: .iOS(.v17, .v18)) { (tabview: UITabBarController) in
tabview.tabBar.isHidden = horizontalSizeClass == .regular tabview.tabBar.isHidden = horizontalSizeClass == .regular
tabview.customizableViewControllers = [] tabview.customizableViewControllers = []
tabview.moreNavigationController.isNavigationBarHidden = true tabview.moreNavigationController.isNavigationBarHidden = true

12
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -264,10 +264,14 @@ struct SettingsTabs: View {
Text("settings.app.icon") Text("settings.app.icon")
} icon: { } icon: {
let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon") let icon = IconSelectorView.Icon(string: UIApplication.shared.alternateIconName ?? "AppIcon")
Image(uiImage: .init(named: icon.appIconName)!) if let image: UIImage = .init(named: icon.appIconName) {
.resizable() Image(uiImage: image)
.frame(width: 25, height: 25) .resizable()
.cornerRadius(4) .frame(width: 25, height: 25)
.cornerRadius(4)
} else {
EmptyView()
}
} }
} }
#endif #endif

10
IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
View file

@ -61,7 +61,7 @@ struct TimelineTab: View {
if client.isAuth { if client.isAuth {
timeline = lastTimelineFilter timeline = lastTimelineFilter
} else { } else {
timeline = .federated timeline = .trending
} }
} }
Task { Task {
@ -125,8 +125,10 @@ struct TimelineTab: View {
private var timelineFilterButton: some View { private var timelineFilterButton: some View {
headerGroup headerGroup
timelineFiltersButtons timelineFiltersButtons
listsFiltersButons if client.isAuth {
tagsFiltersButtons listsFiltersButons
tagsFiltersButtons
}
localTimelinesFiltersButtons localTimelinesFiltersButtons
tagGroupsFiltersButtons tagGroupsFiltersButtons
Divider() Divider()
@ -325,7 +327,7 @@ struct TimelineTab: View {
if client.isAuth, canFilterTimeline { if client.isAuth, canFilterTimeline {
timeline = lastTimelineFilter timeline = lastTimelineFilter
} else if !client.isAuth { } else if !client.isAuth {
timeline = .federated timeline = .trending
} }
} }
} }

4
Packages/Timeline/Package.swift
View file

@ -22,8 +22,8 @@ let package = Package(
.package(name: "Env", path: "../Env"), .package(name: "Env", path: "../Env"),
.package(name: "StatusKit", path: "../StatusKit"), .package(name: "StatusKit", path: "../StatusKit"),
.package(name: "DesignSystem", path: "../DesignSystem"), .package(name: "DesignSystem", path: "../DesignSystem"),
.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "1.0.0"), .package(url: "https://github.com/Dimillian/swiftui-introspect", branch: "main"),
.package(url: "https://github.com/mergesort/Bodega", exact: "2.1.0"), .package(url: "https://github.com/Dimillian/Bodega", branch: "main"),
], ],
targets: [ targets: [
.target( .target(

2
Packages/Timeline/Sources/Timeline/View/TimelineView.swift
View file

@ -68,7 +68,7 @@ public struct TimelineView: View {
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.background(theme.primaryBackgroundColor) .background(theme.primaryBackgroundColor)
#endif #endif
.introspect(.list, on: .iOS(.v17)) { (collectionView: UICollectionView) in .introspect(.list, on: .iOS(.v17, .v18)) { (collectionView: UICollectionView) in
DispatchQueue.main.async { DispatchQueue.main.async {
self.collectionView = collectionView self.collectionView = collectionView
} }

2
Packages/Timeline/Sources/Timeline/View/TimelineViewModel.swift
View file

@ -49,7 +49,7 @@ import SwiftUI
private(set) var datasource = TimelineDatasource() private(set) var datasource = TimelineDatasource()
private let cache = TimelineCache() private let cache = TimelineCache()
private var isCacheEnabled: Bool { private var isCacheEnabled: Bool {
canFilterTimeline && timeline.supportNewestPagination canFilterTimeline && timeline.supportNewestPagination && client?.isAuth == true
} }
@ObservationIgnored @ObservationIgnored