mirror of
				https://github.com/yattee/yattee.git
				synced 2025-10-31 20:52:04 +00:00 
			
		
		
		
	iOS click on collapsed description text expands it
This commit is contained in:
		| @@ -39,7 +39,20 @@ struct VideoDescription: View { | ||||
|                 #endif | ||||
|  | ||||
|                 keywords | ||||
|             }.contentShape(Rectangle()) | ||||
|             } | ||||
|             .contentShape(Rectangle()) | ||||
|             .overlay( | ||||
|                 Group { | ||||
|                     #if canImport(UIKit) | ||||
|                         if !expand { | ||||
|                             Button(action: { expand.toggle() }) { | ||||
|                                 Rectangle() | ||||
|                                     .foregroundColor(.clear) | ||||
|                             } | ||||
|                         } | ||||
|                     #endif | ||||
|                 } | ||||
|             ) | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @@ -48,15 +61,13 @@ struct VideoDescription: View { | ||||
|     } | ||||
|  | ||||
|     @ViewBuilder var textDescription: some View { | ||||
|         #if !os(iOS) | ||||
|         #if canImport(AppKit) | ||||
|             Group { | ||||
|                 if #available(macOS 12, *) { | ||||
|                     DescriptionWithLinks(description: description, detailsSize: detailsSize) | ||||
|                         .frame(maxWidth: .infinity, alignment: .leading) | ||||
|                         .lineLimit(shouldExpand ? 500 : collapsedLinesDescription) | ||||
|                     #if !os(tvOS) | ||||
|                         .textSelection(.enabled) | ||||
|                     #endif | ||||
|                 } else { | ||||
|                     Text(description) | ||||
|                         .frame(maxWidth: .infinity, alignment: .leading) | ||||
| @@ -70,7 +81,7 @@ struct VideoDescription: View { | ||||
|     } | ||||
|  | ||||
|     // If possibe convert URLs to clickable links | ||||
|     #if os(macOS) | ||||
|     #if canImport(AppKit) | ||||
|         @available(macOS 12, *) | ||||
|         struct DescriptionWithLinks: View { | ||||
|             let description: String | ||||
| @@ -126,7 +137,7 @@ struct VideoDescription: View { | ||||
|     } | ||||
|  | ||||
|     var showScrollIndicators: Bool { | ||||
|         #if os(macOS) | ||||
|         #if canImport(AppKit) | ||||
|             false | ||||
|         #else | ||||
|             true | ||||
|   | ||||
| @@ -10,9 +10,9 @@ struct PlayerSettings: View { | ||||
|     @Default(.showKeywords) private var showKeywords | ||||
|     #if !os(tvOS) | ||||
|         @Default(.showScrollToTopInComments) private var showScrollToTopInComments | ||||
|         @Default(.collapsedLinesDescription) private var collapsedLinesDescription | ||||
|     #endif | ||||
|     @Default(.expandVideoDescription) private var expandVideoDescription | ||||
|     @Default(.collapsedLinesDescription) private var collapsedLinesDescription | ||||
|     @Default(.pauseOnHidingPlayer) private var pauseOnHidingPlayer | ||||
|     @Default(.closeVideoOnEOF) private var closeVideoOnEOF | ||||
|     #if os(iOS) | ||||
| @@ -196,6 +196,7 @@ struct PlayerSettings: View { | ||||
|         Toggle("Open video description expanded", isOn: $expandVideoDescription) | ||||
|     } | ||||
|  | ||||
|     #if !os(tvOS) | ||||
|         private var collapsedLineDescriptionStepper: some View { | ||||
|             LazyVStack { | ||||
|                 Stepper(value: $collapsedLinesDescription, in: 0 ... 10) { | ||||
| @@ -211,6 +212,7 @@ struct PlayerSettings: View { | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     #endif | ||||
|  | ||||
|     private var returnYouTubeDislikeToggle: some View { | ||||
|         Toggle("Enable Return YouTube Dislike", isOn: $enableReturnYouTubeDislike) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Toni Förster
					Toni Förster