From 4a6350f3feebb18e9d655c6098590d8fba017229 Mon Sep 17 00:00:00 2001
From: Arkadiusz Fal <arek@arekf.net>
Date: Fri, 11 Nov 2022 21:28:48 +0100
Subject: [PATCH] Minor trending layout fixes
---
Shared/Settings/BrowsingSettings.swift | 6 ++++--
Shared/Trending/TrendingView.swift | 21 ++++++---------------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/Shared/Settings/BrowsingSettings.swift b/Shared/Settings/BrowsingSettings.swift
index e3f7b362..cf46d1a8 100644
--- a/Shared/Settings/BrowsingSettings.swift
+++ b/Shared/Settings/BrowsingSettings.swift
@@ -71,9 +71,11 @@ struct BrowsingSettings: View {
Toggle("Show Favorites", isOn: $showFavoritesInHome)
}
HStack {
- TextField("Recent history items", text: $homeHistoryItemsText)
+ Text("Recent history")
+ TextField("Recent history", text: $homeHistoryItemsText)
+ .labelsHidden()
#if !os(macOS)
- .keyboardType(.URL)
+ .keyboardType(.numberPad)
#endif
.onAppear {
homeHistoryItemsText = String(homeHistoryItems)
diff --git a/Shared/Trending/TrendingView.swift b/Shared/Trending/TrendingView.swift
index 2db3a1d4..c5b740d9 100644
--- a/Shared/Trending/TrendingView.swift
+++ b/Shared/Trending/TrendingView.swift
@@ -36,15 +36,11 @@ struct TrendingView: View {
BrowserPlayerControls(toolbar: {
HStack {
if accounts.app.supportsTrendingCategories {
- HStack {
- Text("Category")
- .foregroundColor(.secondary)
-
- categoryButton
- // only way to disable Menu animation is to
- // force redraw of the view when it changes
- .id(UUID())
- }
+ categoryButton
+ .layoutPriority(1)
+ // only way to disable Menu animation is to
+ // force redraw of the view when it changes
+ .id(UUID())
Spacer()
}
@@ -57,12 +53,7 @@ struct TrendingView: View {
Spacer()
}
- HStack {
- Text("Country")
- .foregroundColor(.secondary)
-
- countryButton
- }
+ countryButton
}
.padding(.horizontal)
}) {