mirror of
https://github.com/neon443/StickerSlack.git
synced 2026-03-11 13:26:17 +00:00
ui updates
This commit is contained in:
@@ -53,12 +53,11 @@ struct ContentView: View {
|
|||||||
Tab("Search", systemImage: "magnifyingglass", role: .search) {
|
Tab("Search", systemImage: "magnifyingglass", role: .search) {
|
||||||
NavigationStack {
|
NavigationStack {
|
||||||
SearchView()
|
SearchView()
|
||||||
.searchable(text: $hoarder.searchTerm)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.searchable(text: $hoarder.searchTerm)
|
// .searchable(text: $hoarder.searchTerm)
|
||||||
.modifier(tabViewActivationSearchActivation())
|
// .modifier(tabViewActivationSearchActivation())
|
||||||
} else {
|
} else {
|
||||||
TabView {
|
TabView {
|
||||||
DownloadedView()
|
DownloadedView()
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ struct DownloadedView: View {
|
|||||||
var isDark: Bool { colorScheme == .dark }
|
var isDark: Bool { colorScheme == .dark }
|
||||||
|
|
||||||
var minColWidth: CGFloat { 75 }
|
var minColWidth: CGFloat { 75 }
|
||||||
var spacing: CGFloat { 10 }
|
var spacing: CGFloat { 5 }
|
||||||
var col: GridItem {
|
var col: GridItem {
|
||||||
GridItem(
|
GridItem(
|
||||||
.flexible(minimum: minColWidth, maximum: 125),
|
.flexible(minimum: minColWidth, maximum: 100),
|
||||||
spacing: spacing,
|
spacing: spacing,
|
||||||
alignment: .center
|
alignment: .center
|
||||||
)
|
)
|
||||||
@@ -27,7 +27,7 @@ struct DownloadedView: View {
|
|||||||
ScrollView {
|
ScrollView {
|
||||||
let columns: Int = max(1, Int((UIScreen.main.bounds.width - 2*spacing) / (minColWidth + spacing)))
|
let columns: Int = max(1, Int((UIScreen.main.bounds.width - 2*spacing) / (minColWidth + spacing)))
|
||||||
let layout = Array(repeating: col, count: columns)
|
let layout = Array(repeating: col, count: columns)
|
||||||
LazyVGrid(columns: layout, spacing: 10) {
|
LazyVGrid(columns: layout, spacing: spacing) {
|
||||||
ForEach(hoarder.emojis, id: \.self) { emoji in
|
ForEach(hoarder.emojis, id: \.self) { emoji in
|
||||||
if hoarder.downloadedEmojis.contains(emoji.name) {
|
if hoarder.downloadedEmojis.contains(emoji.name) {
|
||||||
ZStack {
|
ZStack {
|
||||||
@@ -41,10 +41,13 @@ struct DownloadedView: View {
|
|||||||
.clipShape(RoundedRectangle(cornerRadius: 15))
|
.clipShape(RoundedRectangle(cornerRadius: 15))
|
||||||
.contextMenu {
|
.contextMenu {
|
||||||
Text(emoji.name)
|
Text(emoji.name)
|
||||||
Button("Share", systemImage: "square.and.arrow.up") {
|
Button("Copy Name", systemImage: "document.on.document") {
|
||||||
|
UIPasteboard.general.string = emoji.name
|
||||||
}
|
}
|
||||||
ShareLink("Share", item: emoji.localImageURL, subject: nil, message: nil)
|
Button("Copy Image", systemImage: "photo.fill.on.rectangle.fill") {
|
||||||
|
UIPasteboard.general.image = emoji.image
|
||||||
|
}
|
||||||
|
Divider()
|
||||||
ShareLink("Share", item: emoji.remoteImageURL, subject: nil, message: nil)
|
ShareLink("Share", item: emoji.remoteImageURL, subject: nil, message: nil)
|
||||||
Divider()
|
Divider()
|
||||||
Button("Delete", systemImage: "trash.fill", role: .destructive) {
|
Button("Delete", systemImage: "trash.fill", role: .destructive) {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ struct SearchView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.searchable(text: $hoarder.searchTerm)
|
||||||
.onChange(of: hoarder.searchTerm) { _ in
|
.onChange(of: hoarder.searchTerm) { _ in
|
||||||
hoarder.filterEmojis(by: hoarder.searchTerm)
|
hoarder.filterEmojis(by: hoarder.searchTerm)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user