Update widget design #1343
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "logo_white_small_transparent@2x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "logo_white_small_transparent@3x.png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import SwiftUI | ||
| import WidgetKit | ||
|
|
||
| struct NowPlayingWidgetBold: Widget { | ||
| var body: some WidgetConfiguration { | ||
| StaticConfiguration(kind: "Now_Playing_Widget_Bold", provider: NowPlayingProvider()) { entry in | ||
| NowPlayingWidgetEntryView(entry: entry, widgetColorSchemeLight: widgetColorSchemeBoldNowPlaying, widgetColorSchemeDark: widgetColorSchemeBoldNowPlaying) | ||
| .clearBackground() | ||
| } | ||
| .contentMarginsDisabledIfAvailable() | ||
| .configurationDisplayName(L10n.nowPlaying) | ||
| .description(L10n.widgetsNowPlayingDesc) | ||
| .supportedFamilies([.systemSmall]) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,53 +5,46 @@ struct EpisodeView: View { | |
| @State var episode: WidgetEpisode | ||
| @State var topText: Text | ||
| @State var isPlaying: Bool = false | ||
| @State var isFirstEpisode: Bool = false | ||
|
|
||
| @Environment(\.dynamicTypeSize) var typeSize | ||
| @Environment(\.widgetColorScheme) var colorScheme | ||
|
|
||
| var body: some View { | ||
| let textColor = isFirstEpisode ? colorScheme.topTextColor : colorScheme.bottomTextColor | ||
|
|
||
| Link(destination: CommonWidgetHelper.urlForEpisodeUuid(uuid: episode.episodeUuid)!) { | ||
| HStack(spacing: 12) { | ||
| SmallArtworkView(imageData: episode.imageData) | ||
| .frame(maxWidth: 52, maxHeight: 52) | ||
| VStack(alignment: .leading) { | ||
| Text(episode.episodeTitle) | ||
| .font(.footnote) | ||
| .fontWeight(.semibold) | ||
| .foregroundColor(textColor) | ||
| .lineLimit(1) | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| if isFirstEpisode, #available(iOS 17, *) { | ||
| Spacer() | ||
| Toggle(isOn: isPlaying, intent: PlayEpisodeIntent(episodeUuid: episode.episodeUuid)) { | ||
| topText | ||
| .font(.caption) | ||
| .fontWeight(.medium) | ||
| .foregroundColor(colorScheme.topButtonTextColor) | ||
| } | ||
| .toggleStyle(WidgetFirstEpisodePlayToggleStyle(colorScheme: colorScheme)) | ||
| } else { | ||
| Spacer() | ||
| .frame(height: 4) | ||
| topText | ||
| .font(.caption2) | ||
| .foregroundColor(textColor.opacity(0.6)) | ||
| } | ||
| } | ||
| if !isFirstEpisode, #available(iOS 17, *) { | ||
| Toggle(isOn: isPlaying, intent: PlayEpisodeIntent(episodeUuid: episode.episodeUuid)) {} | ||
| .toggleStyle(WidgetPlayToggleStyle(colorScheme: colorScheme)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -62,27 +55,57 @@ struct EpisodeView: View { | |
| } | ||
| } | ||
|
|
||
| struct WidgetFirstEpisodePlayToggleStyle: ToggleStyle { | ||
| let colorScheme: PCWidgetColorScheme | ||
|
|
||
| func makeBody(configuration: Configuration) -> some View { | ||
|
There was a problem hiding this comment. Should this be marked @ViewBuilder in case the view is not a single View? I think the protocol method is marked ViewBuilder, so maybe that's automatically applied? |
||
| HStack(spacing: 0) { | ||
| Group { | ||
| configuration.isOn ? | ||
| Image("icon-pause") | ||
| .resizable() | ||
| .foregroundStyle(colorScheme.topButtonTextColor) | ||
| : | ||
| Image("icon-play") | ||
| .resizable() | ||
| .foregroundStyle(colorScheme.topButtonTextColor) | ||
| } | ||
| .frame(width: 28, height: 28) | ||
| // TODO: Something fun - create a timeline that counts down by the minute instead of showing "now playing" | ||
|
There was a problem hiding this comment. I just noticed I left this here... it is more of a "this would be fun if we could do this" activity, but not something that can easily be done right now. Comment should probably be removed, but I'll leave it here for the moment incase anyone has thoughts on it. There was a problem hiding this comment. Instead of the TODO comment add an issue on the repo as an improvement/suggestion to do in the future. |
||
| configuration.label | ||
| .truncationMode(.tail) | ||
| } | ||
| .padding(.trailing, 12) // icon has 8px padding built into it, so this should match 8 + .leading | ||
| .padding(.leading, 4) | ||
| .padding(.vertical, 2) // 2 + 8 (from icon) = 10 in design (actually 9.76) | ||
| .background( | ||
| RoundedRectangle(cornerRadius: 100) | ||
| .foregroundColor(colorScheme.topButtonBackgroundColor) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| struct WidgetPlayToggleStyle: ToggleStyle { | ||
| let colorScheme: PCWidgetColorScheme | ||
|
|
||
| func makeBody(configuration: Configuration) -> some View { | ||
|
There was a problem hiding this comment. Should this be marked |
||
| HStack { | ||
| ZStack { | ||
| Circle() | ||
| .foregroundStyle(colorScheme.bottomButtonBackgroundColor) | ||
| .frame(width: 24, height: 24) | ||
|
There was a problem hiding this comment. Could this 24 be refactored to an enum constant? |
||
| Group { | ||
| configuration.isOn ? | ||
| Image("icon-pause") | ||
| .resizable() | ||
| .foregroundStyle(colorScheme.bottomButtonTextColor) | ||
| : | ||
| Image("icon-play") | ||
| .resizable() | ||
| .foregroundStyle(colorScheme.bottomButtonTextColor) | ||
| } | ||
| .frame(width: 24, height: 24) | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this would be more readable broken into either separate
Views or severalViewBuilderfunctions. Maybe anArtwork,EpisodeTitle, andPlayingToggle?