Skip to content

Commit 4d56f29

Browse files
authored
Merge pull request #1014 from DimensionDev/ios/20250613
podcast fixed
2 parents 46926c4 + cbacc51 commit 4d56f29

29 files changed

+1112
-952
lines changed

iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
6423385A2DF07E900022CB96 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
7777
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
7878
membershipExceptions = (
79-
Page/Compose/Timeline/CommonTimelineStatusComponent.bak,
79+
Page/Compose/Timeline/TimelineStatus/CommonTimelineStatusComponent.bak,
8080
Page/Home/View/SwiftUI/TimelineViewSwiftUI.bak,
8181
Page/Home/View/UIKit/HomeTabController.swift.bak,
8282
Page/Home/View/UIKit/HomeTabScreen.swift.bak,
@@ -90,7 +90,7 @@
9090
isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet;
9191
buildPhase = 7555FF77242A565900829871 /* Sources */;
9292
membershipExceptions = (
93-
Page/Compose/Timeline/CommonTimelineStatusComponent.bak,
93+
Page/Compose/Timeline/TimelineStatus/CommonTimelineStatusComponent.bak,
9494
Page/Home/View/SwiftUI/TimelineViewSwiftUI.bak,
9595
Page/Home/View/UIKit/HomeTabController.swift.bak,
9696
Page/Home/View/UIKit/HomeTabScreen.swift.bak,

iosApp/iosApp/FlareApp.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ struct FlareApp: SwiftUI.App {
5959

6060
// --- Global Floating Player Overlay ---
6161
if podcastManager.currentPodcast != nil {
62-
DraggablePlayerOverlay().animation(.spring(), value: podcastManager.currentPodcast?.id)
62+
DraggablePlayerOverlay()
63+
.animation(.spring(), value: podcastManager.currentPodcast?.id)
64+
.environmentObject(router)
6365
}
6466
}.environment(theme).withFlareTheme().applyTheme(theme).environment(theme)
6567
}

iosApp/iosApp/Localizable.xcstrings

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11844,6 +11844,9 @@
1184411844
}
1184511845
}
1184611846
}
11847+
},
11848+
"Error: Podcast ID not available." : {
11849+
1184711850
},
1184811851
"fans" : {
1184911852
"localizations" : {
@@ -28079,6 +28082,7 @@
2807928082
}
2808028083
},
2808128084
"quote" : {
28085+
"extractionState" : "stale",
2808228086
"localizations" : {
2808328087
"ar" : {
2808428088
"stringUnit" : {
@@ -29237,6 +29241,7 @@
2923729241
}
2923829242
},
2923929243
"retweet" : {
29244+
"extractionState" : "stale",
2924029245
"localizations" : {
2924129246
"ar" : {
2924229247
"stringUnit" : {
@@ -29367,6 +29372,7 @@
2936729372
}
2936829373
},
2936929374
"retweet_remove" : {
29375+
"extractionState" : "stale",
2937029376
"localizations" : {
2937129377
"ar" : {
2937229378
"stringUnit" : {
@@ -36329,6 +36335,7 @@
3632936335
}
3633036336
},
3633136337
"status_action_add_reaction" : {
36338+
"extractionState" : "stale",
3633236339
"localizations" : {
3633336340
"ar" : {
3633436341
"stringUnit" : {
@@ -36459,6 +36466,7 @@
3645936466
}
3646036467
},
3646136468
"status_action_bookmark" : {
36469+
"extractionState" : "stale",
3646236470
"localizations" : {
3646336471
"ar" : {
3646436472
"stringUnit" : {
@@ -36589,6 +36597,7 @@
3658936597
}
3659036598
},
3659136599
"status_action_delete" : {
36600+
"extractionState" : "stale",
3659236601
"localizations" : {
3659336602
"ar" : {
3659436603
"stringUnit" : {
@@ -36725,6 +36734,7 @@
3672536734
}
3672636735
},
3672736736
"status_action_like" : {
36737+
"extractionState" : "stale",
3672836738
"localizations" : {
3672936739
"ar" : {
3673036740
"stringUnit" : {
@@ -36855,6 +36865,7 @@
3685536865
}
3685636866
},
3685736867
"status_action_more" : {
36868+
"extractionState" : "stale",
3685836869
"localizations" : {
3685936870
"ar" : {
3686036871
"stringUnit" : {
@@ -36985,6 +36996,7 @@
3698536996
}
3698636997
},
3698736998
"status_action_reply" : {
36999+
"extractionState" : "stale",
3698837000
"localizations" : {
3698937001
"ar" : {
3699037002
"stringUnit" : {
@@ -37115,6 +37127,7 @@
3711537127
}
3711637128
},
3711737129
"status_action_unbookmark" : {
37130+
"extractionState" : "stale",
3711837131
"localizations" : {
3711937132
"ar" : {
3712037133
"stringUnit" : {
@@ -37245,6 +37258,7 @@
3724537258
}
3724637259
},
3724737260
"status_action_unlike" : {
37261+
"extractionState" : "stale",
3724837262
"localizations" : {
3724937263
"ar" : {
3725037264
"stringUnit" : {
@@ -38285,6 +38299,9 @@
3828538299
}
3828638300
}
3828738301
}
38302+
},
38303+
"Stop Listening " : {
38304+
3828838305
},
3828938306
"subscribers" : {
3829038307
"localizations" : {
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import Awesome
2+
import Generated
3+
import JXPhotoBrowser
4+
import Kingfisher
5+
import MarkdownUI
6+
import os.log
7+
import shared
8+
import SwiftDate
9+
import SwiftUI
10+
import UIKit
11+
12+
struct StatusVisibilityComponent: View {
13+
let visibility: UiTimelineItemContentStatusTopEndContentVisibility.Type_
14+
15+
var body: some View {
16+
switch visibility {
17+
case .public:
18+
Awesome.Classic.Solid.globe.image.opacity(0.6)
19+
case .home:
20+
Awesome.Classic.Solid.lockOpen.image
21+
case .followers:
22+
Awesome.Classic.Solid.lock.image
23+
case .specified:
24+
Awesome.Classic.Solid.at.image
25+
}
26+
}
27+
}
File renamed without changes.

iosApp/iosApp/UI/Page/Home/Components/Status/LinkPreview.swift renamed to iosApp/iosApp/UI/Page/Compose/Timeline/CardPreview/LinkPreview.swift

File renamed without changes.

iosApp/iosApp/UI/Page/Home/Components/Status/PodcastPreview.swift renamed to iosApp/iosApp/UI/Page/Compose/Timeline/CardPreview/PodcastPreview.swift

File renamed without changes.

0 commit comments

Comments
 (0)