Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "Show score in info" setting default value inconsistency #848

Merged
merged 4 commits into from
Jan 12, 2024
Merged

Fix "Show score in info" setting default value inconsistency #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5f143c
Update
Sjmarf Jan 10, 2024
0e97222
Lint
Sjmarf Jan 10, 2024
5a1b2c8
Lint
Sjmarf Jan 10, 2024
15216a1
Merge branch 'dev' into sjmarf/info-stack-default-fix
Sjmarf Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Mlem/Views/Shared/Comments/Comment Item.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct CommentItem: View {
@Dependency(\.hapticManager) var hapticManager

// appstorage
@AppStorage("shouldShowScoreInCommentBar") var shouldShowScoreInCommentBar: Bool = true
@AppStorage("shouldShowScoreInCommentBar") var shouldShowScoreInCommentBar: Bool = false
@AppStorage("showCommentDownvotesSeparately") var showCommentDownvotesSeparately: Bool = false
@AppStorage("shouldShowTimeInCommentBar") var shouldShowTimeInCommentBar: Bool = true
@AppStorage("shouldShowSavedInCommentBar") var shouldShowSavedInCommentBar: Bool = false
Expand Down
2 changes: 1 addition & 1 deletion Mlem/Views/Shared/Posts/Expanded Post.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct ExpandedPost: View {
@AppStorage("shouldShowCommunityServerInPost") var shouldShowCommunityServerInPost: Bool = false
@AppStorage("shouldShowUserAvatars") var shouldShowUserAvatars: Bool = false

@AppStorage("shouldShowScoreInPostBar") var shouldShowScoreInPostBar: Bool = true
@AppStorage("shouldShowScoreInPostBar") var shouldShowScoreInPostBar: Bool = false
@AppStorage("showDownvotesSeparately") var showPostDownvotesSeparately: Bool = false
@AppStorage("shouldShowTimeInPostBar") var shouldShowTimeInPostBar: Bool = true
@AppStorage("shouldShowSavedInPostBar") var shouldShowSavedInPostBar: Bool = false
Expand Down
2 changes: 1 addition & 1 deletion Mlem/Views/Shared/Posts/Feed Post.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct FeedPost: View {
@AppStorage("shouldShowCommunityServerInPost") var shouldShowCommunityServerInPost: Bool = true
@AppStorage("shouldShowUserServerInPost") var shouldShowUserServerInPost: Bool = true

@AppStorage("shouldShowScoreInPostBar") var shouldShowScoreInPostBar: Bool = true
@AppStorage("shouldShowScoreInPostBar") var shouldShowScoreInPostBar: Bool = false
@AppStorage("showDownvotesSeparately") var showPostDownvotesSeparately: Bool = false
@AppStorage("shouldShowTimeInPostBar") var shouldShowTimeInPostBar: Bool = true
@AppStorage("shouldShowSavedInPostBar") var shouldShowSavedInPostBar: Bool = false
Expand Down
7 changes: 6 additions & 1 deletion Mlem/Views/Tabs/Settings/Components/Views/Appearance/Post/PostSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ struct PostSettingsView: View {
)
}

Section("Interactions and Info") {
Section {
SwitchableSettingsItem(
settingPictureSystemName: Icons.upvoteSquare,
settingName: "Show Score In Info",
Expand All @@ -134,6 +134,11 @@ struct PostSettingsView: View {
settingName: "Show Replies In Info",
isTicked: $shouldShowRepliesInPostBar
)
} header: {
Text("Interactions and Info")
} footer: {
// swiftlint:disable:next line_length
Text("Choose which information is shown when using Large or Headline mode. In Compact mode, all info stack widgets are shown.")
}

Section("Website Previews") {
Expand Down