kavin/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-04-28 16:00:33 +05:30
Code Issues Projects Releases Wiki Activity

Add option to show/hide username in account picker button

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-01-02 20:34:50 +01:00
parent f0d1b74e34
commit 9ede4b9b1f
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shared/Defaults.swift
View File

@ -31,6 +31,9 @@ extension Defaults.Keys {
.init(section: .searchQuery("Apple Pie Recipes", "", "", "")) .init(section: .searchQuery("Apple Pie Recipes", "", "", ""))
]) ])
#if !os(tvOS)
static let accountPickerDisplaysUsername = Key<Bool>("accountPickerDisplaysUsername", default: false)
#endif
static let channelOnThumbnail = Key<Bool>("channelOnThumbnail", default: true) static let channelOnThumbnail = Key<Bool>("channelOnThumbnail", default: true)
static let timeOnThumbnail = Key<Bool>("timeOnThumbnail", default: true) static let timeOnThumbnail = Key<Bool>("timeOnThumbnail", default: true)

22
Shared/Navigation/AccountsMenuView.swift
View File

@ -6,21 +6,29 @@ struct AccountsMenuView: View {
@Default(.accounts) private var accounts @Default(.accounts) private var accounts
@Default(.instances) private var instances @Default(.instances) private var instances
@Default(.accountPickerDisplaysUsername) private var accountPickerDisplaysUsername
var body: some View { var body: some View {
Menu { Menu {
ForEach(allAccounts, id: \.id) { account in ForEach(allAccounts, id: \.id) { account in
Button(accountButtonTitle(account: account)) { Button {
model.setCurrent(account) model.setCurrent(account)
} label: {
HStack {
Text(accountButtonTitle(account: account))
Spacer()
if model.current == account {
Image(systemName: "checkmark")
}
}
} }
} }
} label: { } label: {
if #available(iOS 15.0, macOS 12.0, *) { HStack {
label Image(systemName: "person.crop.circle")
.labelStyle(.titleAndIcon) if accountPickerDisplaysUsername {
} else {
HStack {
Image(systemName: "person.crop.circle")
label label
.labelStyle(.titleOnly) .labelStyle(.titleOnly)
} }

6
Shared/Settings/BrowsingSettings.swift
View File

@ -2,6 +2,9 @@ import Defaults
import SwiftUI import SwiftUI
struct BrowsingSettings: View { struct BrowsingSettings: View {
#if !os(tvOS)
@Default(.accountPickerDisplaysUsername) private var accountPickerDisplaysUsername
#endif
@Default(.channelOnThumbnail) private var channelOnThumbnail @Default(.channelOnThumbnail) private var channelOnThumbnail
@Default(.timeOnThumbnail) private var timeOnThumbnail @Default(.timeOnThumbnail) private var timeOnThumbnail
@Default(.visibleSections) private var visibleSections @Default(.visibleSections) private var visibleSections
@ -9,6 +12,9 @@ struct BrowsingSettings: View {
var body: some View { var body: some View {
Group { Group {
Section(header: SettingsHeader(text: "Browsing")) { Section(header: SettingsHeader(text: "Browsing")) {
#if !os(tvOS)
Toggle("Show username in the account picker button", isOn: $accountPickerDisplaysUsername)
#endif
Toggle("Show channel name on thumbnail", isOn: $channelOnThumbnail) Toggle("Show channel name on thumbnail", isOn: $channelOnThumbnail)
Toggle("Show video length on thumbnail", isOn: $timeOnThumbnail) Toggle("Show video length on thumbnail", isOn: $timeOnThumbnail)
} }