diff --git a/Swiftfin tvOS/Components/AlphaPicker/AlphaPickerBar.swift b/Swiftfin tvOS/Components/AlphaPicker/AlphaPickerBar.swift index d19be9250..bb3e440e3 100644 --- a/Swiftfin tvOS/Components/AlphaPicker/AlphaPickerBar.swift +++ b/Swiftfin tvOS/Components/AlphaPicker/AlphaPickerBar.swift @@ -38,15 +38,11 @@ struct AlphaPickerBar: View { } var body: some View { - Group { - if AlphaPicker.characters.count > 27 { - ScrollView(showsIndicators: false) { - alphaPickerBody - } - } else { - alphaPickerBody - } + ScrollView(showsIndicators: false) { + alphaPickerBody + .frame(maxWidth: .infinity) } + .frame(width: 150) } } diff --git a/Swiftfin tvOS/Components/AlphaPicker/AlphaPickerButton.swift b/Swiftfin tvOS/Components/AlphaPicker/AlphaPickerButton.swift index 183ae340a..7bb4dd1f2 100644 --- a/Swiftfin tvOS/Components/AlphaPicker/AlphaPickerButton.swift +++ b/Swiftfin tvOS/Components/AlphaPicker/AlphaPickerButton.swift @@ -44,11 +44,9 @@ extension AlphaPickerBar { .font(.headline) .frame(width: 35, height: 35) .foregroundColor(activated ? Color.white : accentColor) - .padding(.vertical, 2) - .fixedSize(horizontal: true, vertical: true) .background { RoundedRectangle(cornerRadius: 5) - .frame(width: 40, height: 40) + .frame(width: 80, height: 40) .foregroundColor(activated ? accentColor.opacity(0.5) : Color.clear) } } diff --git a/Swiftfin tvOS/Views/LibraryView.swift b/Swiftfin tvOS/Views/LibraryView.swift index c141dac7c..8680ad05b 100644 --- a/Swiftfin tvOS/Views/LibraryView.swift +++ b/Swiftfin tvOS/Views/LibraryView.swift @@ -65,15 +65,13 @@ struct LibraryView: View { HStack(spacing: 0) { libraryBody .frame(maxWidth: .infinity) - Spacer() AlphaPickerBar(viewModel: viewModel.filterViewModel) - .padding(.vertical, 5) + .frame(maxHeight: .infinity) } } else if alphaPickerOrientation == .leading { HStack(spacing: 0) { AlphaPickerBar(viewModel: viewModel.filterViewModel) - .padding(.vertical, 5) - Spacer() + .frame(maxHeight: .infinity) libraryBody .frame(maxWidth: .infinity) } diff --git a/Swiftfin/Components/AlphaPicker/AlphaPickerBar.swift b/Swiftfin/Components/AlphaPicker/AlphaPickerBar.swift index d19be9250..ac8b3c55e 100644 --- a/Swiftfin/Components/AlphaPicker/AlphaPickerBar.swift +++ b/Swiftfin/Components/AlphaPicker/AlphaPickerBar.swift @@ -42,11 +42,13 @@ struct AlphaPickerBar: View { if AlphaPicker.characters.count > 27 { ScrollView(showsIndicators: false) { alphaPickerBody + .frame(maxWidth: .infinity) } } else { alphaPickerBody } } + .frame(width: 40) } } diff --git a/Swiftfin/Views/LibraryView.swift b/Swiftfin/Views/LibraryView.swift index b796e3e6d..e913e5200 100644 --- a/Swiftfin/Views/LibraryView.swift +++ b/Swiftfin/Views/LibraryView.swift @@ -70,14 +70,12 @@ struct LibraryView: View { libraryBody .frame(maxWidth: .infinity) AlphaPickerBar(viewModel: viewModel.filterViewModel) - .frame(width: 30) - .padding(.vertical, 5) + .padding(1) } } else if alphaPickerOrientation == .leading { HStack(spacing: 0) { AlphaPickerBar(viewModel: viewModel.filterViewModel) - .frame(width: 30) - .padding(.vertical, 5) + .padding(1) libraryBody .frame(maxWidth: .infinity) }