Skip to content

Commit

Permalink
Merge pull request #505 from DimensionDev/feature/ios_update
Browse files Browse the repository at this point in the history 
iOS update
  • Loading branch information
@Tlaster
Tlaster authored Oct 9, 2024
2 parents 20805ee + 70c344a commit 5f7f458
Show file tree
Hide file tree
Showing 23 changed files with 599 additions and 468 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

jobs:
build:
runs-on: [macos-14]
runs-on: [macos-15]

steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ androidx-splash = { group = "androidx.core", name = "core-splashscreen", version
room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
room-paging = { group = "androidx.room", name = "room-paging", version.ref = "room" }
room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
sqlite-bundled = { group = "androidx.sqlite", name = "sqlite-bundled", version = "2.5.0-alpha09" }
nestedScrollView = { group = "com.github.Tlaster", name = "NestedScrollView", version = "1.0.2" }

media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "media3" }
Expand Down
37 changes: 29 additions & 8 deletions iosApp/iosApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
0630F3402C732ED2009631AA /* ObservePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0630F33F2C732ED2009631AA /* ObservePresenter.swift */; };
063476792B4FBB9E006B21F1 /* DiscoverScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063476782B4FBB9E006B21F1 /* DiscoverScreen.swift */; };
0634767B2B4FCFAE006B21F1 /* SearchScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0634767A2B4FCFAE006B21F1 /* SearchScreen.swift */; };
064D99C72CAFBEE400915E03 /* HomeContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064D99C62CAFBEE400915E03 /* HomeContent.swift */; };
066151212AC540B700CCB945 /* HomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 066151202AC540B700CCB945 /* HomeScreen.swift */; };
066151242AC54A9C00CCB945 /* CommonStatusComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 066151232AC54A9C00CCB945 /* CommonStatusComponent.swift */; };
066AD0452B3ACDC1006F28F4 /* Collections in Frameworks */ = {isa = PBXBuildFile; productRef = 066AD0442B3ACDC1006F28F4 /* Collections */; };
Expand All @@ -43,6 +44,8 @@
067D89772AD25C1700F8F932 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 067D89762AD25C1700F8F932 /* MarkdownUI */; };
067D89792AD25DB000F8F932 /* MarkdownTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 067D89782AD25DB000F8F932 /* MarkdownTheme.swift */; };
067D897E2AD3A2F900F8F932 /* MediaComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 067D897D2AD3A2F900F8F932 /* MediaComponent.swift */; };
069050782CAE6108007FC957 /* SwitUIInAppNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 069050772CAE6100007FC957 /* SwitUIInAppNotification.swift */; };
0690507B2CAE634C007FC957 /* Awesome in Frameworks */ = {isa = PBXBuildFile; productRef = 0690507A2CAE634C007FC957 /* Awesome */; };
0690CF8D2B5F51A200824A21 /* XQTLoginScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0690CF8C2B5F51A200824A21 /* XQTLoginScreen.swift */; };
06AD156B2AC3F454000DC865 /* Route.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06AD156A2AC3F454000DC865 /* Route.swift */; };
06B8514B2B6B228600DFA075 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 06B8514A2B6B228600DFA075 /* FirebaseAnalytics */; };
Expand All @@ -55,7 +58,6 @@
06C862712B4D0C7A008C902C /* FlareTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06C862702B4D0C7A008C902C /* FlareTheme.swift */; };
06C862732B4D2A14008C902C /* UserInterfaceSizeClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06C862722B4D2A14008C902C /* UserInterfaceSizeClass.swift */; };
06C862762B4D2A55008C902C /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06C862752B4D2A55008C902C /* UIImage.swift */; };
06C9C5612B34241400AE5284 /* AdativeTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06C9C5602B34241400AE5284 /* AdativeTabView.swift */; };
06D5C9182AC3BB69007439D5 /* ServiceSelectScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06D5C9172AC3BB69007439D5 /* ServiceSelectScreen.swift */; };
06DF79CF2B465D1D00CF21FE /* AboutScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06DF79CE2B465D1D00CF21FE /* AboutScreen.swift */; };
06DF79D12B4699E200CF21FE /* AppearanceScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06DF79D02B4699E200CF21FE /* AppearanceScreen.swift */; };
Expand Down Expand Up @@ -101,11 +103,13 @@
0630F33F2C732ED2009631AA /* ObservePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservePresenter.swift; sourceTree = "<group>"; };
063476782B4FBB9E006B21F1 /* DiscoverScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscoverScreen.swift; sourceTree = "<group>"; };
0634767A2B4FCFAE006B21F1 /* SearchScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchScreen.swift; sourceTree = "<group>"; };
064D99C62CAFBEE400915E03 /* HomeContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeContent.swift; sourceTree = "<group>"; };
066151202AC540B700CCB945 /* HomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreen.swift; sourceTree = "<group>"; };
066151232AC54A9C00CCB945 /* CommonStatusComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonStatusComponent.swift; sourceTree = "<group>"; };
066F23042B43BD59004A4A8D /* ProfileMediaListScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileMediaListScreen.swift; sourceTree = "<group>"; };
067D89782AD25DB000F8F932 /* MarkdownTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownTheme.swift; sourceTree = "<group>"; };
067D897D2AD3A2F900F8F932 /* MediaComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaComponent.swift; sourceTree = "<group>"; };
069050772CAE6100007FC957 /* SwitUIInAppNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitUIInAppNotification.swift; sourceTree = "<group>"; };
0690CF8C2B5F51A200824A21 /* XQTLoginScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XQTLoginScreen.swift; sourceTree = "<group>"; };
06AD156A2AC3F454000DC865 /* Route.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Route.swift; sourceTree = "<group>"; };
06B8514E2B6B22A500DFA075 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
Expand All @@ -117,7 +121,6 @@
06C862702B4D0C7A008C902C /* FlareTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlareTheme.swift; sourceTree = "<group>"; };
06C862722B4D2A14008C902C /* UserInterfaceSizeClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInterfaceSizeClass.swift; sourceTree = "<group>"; };
06C862752B4D2A55008C902C /* UIImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = "<group>"; };
06C9C5602B34241400AE5284 /* AdativeTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdativeTabView.swift; sourceTree = "<group>"; };
06D5C9172AC3BB69007439D5 /* ServiceSelectScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceSelectScreen.swift; sourceTree = "<group>"; };
06DF79CE2B465D1D00CF21FE /* AboutScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutScreen.swift; sourceTree = "<group>"; };
06DF79D02B4699E200CF21FE /* AppearanceScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceScreen.swift; sourceTree = "<group>"; };
Expand All @@ -143,6 +146,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0690507B2CAE634C007FC957 /* Awesome in Frameworks */,
066AD0452B3ACDC1006F28F4 /* Collections in Frameworks */,
067D89772AD25C1700F8F932 /* MarkdownUI in Frameworks */,
066AD0492B3ACDC1006F28F4 /* OrderedCollections in Frameworks */,
Expand Down Expand Up @@ -212,6 +216,7 @@
children = (
0620DD9D2AC44237009BD1BE /* HomeTimelineScreen.swift */,
066151202AC540B700CCB945 /* HomeScreen.swift */,
064D99C62CAFBEE400915E03 /* HomeContent.swift */,
060501BD2ACAC4ED00DBCCEB /* NotificationScreen.swift */,
063476782B4FBB9E006B21F1 /* DiscoverScreen.swift */,
0634767A2B4FCFAE006B21F1 /* SearchScreen.swift */,
Expand All @@ -234,12 +239,12 @@
066151222AC54A8200CCB945 /* Component */ = {
isa = PBXGroup;
children = (
069050772CAE6100007FC957 /* SwitUIInAppNotification.swift */,
06C862742B4D2A46008C902C /* Compact */,
060501C42ACBF40700DBCCEB /* User */,
060501C32ACBF40200DBCCEB /* Status */,
060501C72ACD09B800DBCCEB /* UserAvatar.swift */,
067D89782AD25DB000F8F932 /* MarkdownTheme.swift */,
06C9C5602B34241400AE5284 /* AdativeTabView.swift */,
06C862702B4D0C7A008C902C /* FlareTheme.swift */,
061C2CFB2B4E77D700249514 /* FullScreenImageViewer.swift */,
061C2CFD2B4E82C900249514 /* ImageViewWindow.swift */,
Expand Down Expand Up @@ -436,6 +441,7 @@
066AD0482B3ACDC1006F28F4 /* OrderedCollections */,
06B8514A2B6B228600DFA075 /* FirebaseAnalytics */,
06B8514C2B6B228600DFA075 /* FirebaseCrashlytics */,
0690507A2CAE634C007FC957 /* Awesome */,
);
productName = iosApp;
productReference = 7555FF7B242A565900829871 /* Flare.app */;
Expand Down Expand Up @@ -472,6 +478,7 @@
0641D85E2B0DFD3800029CA1 /* XCRemoteSwiftPackageReference "RichText" */,
066AD0432B3ACDC1006F28F4 /* XCRemoteSwiftPackageReference "swift-collections" */,
06B851492B6B228600DFA075 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
069050792CAE634C007FC957 /* XCRemoteSwiftPackageReference "Awesome" */,
);
productRefGroup = 7555FF7C242A565900829871 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -559,10 +566,12 @@
061C2D002B4E8B0600249514 /* StatusDetailScreen.swift in Sources */,
06DF79D12B4699E200CF21FE /* AppearanceScreen.swift in Sources */,
067D897E2AD3A2F900F8F932 /* MediaComponent.swift in Sources */,
064D99C72CAFBEE400915E03 /* HomeContent.swift in Sources */,
062A3C872C6C9CF800A45E44 /* VVOCommentScreen.swift in Sources */,
06D5C9182AC3BB69007439D5 /* ServiceSelectScreen.swift in Sources */,
06DF79D72B46B24800CF21FE /* SettingsRepository.swift in Sources */,
066151242AC54A9C00CCB945 /* CommonStatusComponent.swift in Sources */,
069050782CAE6108007FC957 /* SwitUIInAppNotification.swift in Sources */,
06B851512B6B22DD00DFA075 /* AppDelegate.swift in Sources */,
066151212AC540B700CCB945 /* HomeScreen.swift in Sources */,
062A3C892C6C9ECD00A45E44 /* VVOLoginScreen.swift in Sources */,
Expand Down Expand Up @@ -592,7 +601,6 @@
06B8515B2B73930100DFA075 /* Zoomable.swift in Sources */,
B62B238878D4BA843A1BB66F /* ViewExt.swift in Sources */,
0630F3402C732ED2009631AA /* ObservePresenter.swift in Sources */,
06C9C5612B34241400AE5284 /* AdativeTabView.swift in Sources */,
B62B27AA5CE37383A67B419B /* CommonProfileHeader.swift in Sources */,
B62B206B672982F032F669C3 /* ProfileScreen.swift in Sources */,
061C2CFA2B4E6E0100249514 /* ProfileWithUserNameScreen.swift in Sources */,
Expand Down Expand Up @@ -753,12 +761,12 @@
INFOPLIST_FILE = iosApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Flare;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 0.0.5;
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -800,12 +808,12 @@
INFOPLIST_FILE = iosApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Flare;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 0.0.5;
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -874,6 +882,14 @@
minimumVersion = 2.3.0;
};
};
069050792CAE634C007FC957 /* XCRemoteSwiftPackageReference "Awesome" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Tlaster/Awesome";
requirement = {
branch = master;
kind = branch;
};
};
06B851492B6B228600DFA075 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
Expand Down Expand Up @@ -905,6 +921,11 @@
package = 067D89752AD25C1700F8F932 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */;
productName = MarkdownUI;
};
0690507A2CAE634C007FC957 /* Awesome */ = {
isa = XCSwiftPackageProductDependency;
package = 069050792CAE634C007FC957 /* XCRemoteSwiftPackageReference "Awesome" */;
productName = Awesome;
};
06B8514A2B6B228600DFA075 /* FirebaseAnalytics */ = {
isa = XCSwiftPackageProductDependency;
package = 06B851492B6B228600DFA075 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
Expand Down
2 changes: 1 addition & 1 deletion iosApp/iosApp/FlareApp.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ struct FlareApp: SwiftUI.App {
@UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
#endif
init() {
KoinHelper.shared.start()
KoinHelper.shared.start(inAppNotification: SwitUIInAppNotification())
}

var body: some Scene {
Expand Down
4 changes: 2 additions & 2 deletions iosApp/iosApp/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>0.2.0</string>
<string>0.2.1</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand All @@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>12</string>
<string>18</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down
119 changes: 0 additions & 119 deletions iosApp/iosApp/UI/Component/AdativeTabView.swift
View file

This file was deleted.

6 changes: 5 additions & 1 deletion iosApp/iosApp/UI/Component/FullScreenImageViewer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ struct FullScreenImageViewer: View {
ZStack {
switch onEnum(of: media) {
case .image(let data):
Zoomable(url: data.url)
NetworkImage(url: .init(string: data.url)) { image in
image
.resizable()
.aspectRatio(contentMode: .fit)
}
case .video(let video):
VideoPlayer(player: AVPlayer(url: URL(string: video.url)!))
case .audio(let audio):
Expand Down
Loading

0 comments on commit 5f7f458

Please sign in to comment.