Skip to content

Improve shared item list #1437

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

Merged
Ivansss merged 8 commits into from
Dec 4, 2023
Merged

Improve shared item list #1437

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
623e4c6
Show filename in SharedItemsTableViewController
SystemKeeper Dec 2, 2023
bfaaf65
Change style of RoomSharedItemsTableViewController to insetGrouped
SystemKeeper Dec 2, 2023
2b3b318
Use contentOffset to correctly position the highlighted message
SystemKeeper Dec 2, 2023
6ef6176
Add Message-Context API
SystemKeeper Dec 2, 2023
734c071
Move contentOffset logic for highlighting to separate func
SystemKeeper Dec 2, 2023
b217808
Show message context as preview
SystemKeeper Dec 2, 2023
73c46a7
Move from UIAlertController to UIMenu
SystemKeeper Dec 2, 2023
c1498c5
Don't calculate the cell height twice
SystemKeeper Dec 3, 2023
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
Prev Previous commit
Next Next commit
Move from UIAlertController to UIMenu 
Signed-off-by: Marcel Müller <[email protected]>
  • Loading branch information
@SystemKeeper
SystemKeeper committed Dec 2, 2023
commit 73c46a77340e12947977da23bd7a6df1d85ffb80
43 changes: 18 additions & 25 deletions NextcloudTalk/RoomSharedItemsTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,30 +73,6 @@ import QuickLook
self.getItemsOverview()
}

func presentItemTypeSelector() {
let itemTypesActionSheet = UIAlertController(title: NSLocalizedString("Shared items", comment: ""), message: nil, preferredStyle: .actionSheet)

for itemType in availableItemTypes() {
let itemTypeName = nameForItemType(itemType: itemType)
let action = UIAlertAction(title: itemTypeName, style: .default) { _ in
self.setupViewForItemType(itemType: itemType)
}

if itemType == currentItemType {
action.setValue(UIImage(named: "checkmark")?.withRenderingMode(_: .alwaysOriginal), forKey: "image")
}
itemTypesActionSheet.addAction(action)
}

itemTypesActionSheet.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .cancel, handler: nil))

// Presentation on iPads
itemTypesActionSheet.popoverPresentationController?.sourceView = self.navigationItem.titleView
itemTypesActionSheet.popoverPresentationController?.sourceRect = self.navigationItem.titleView?.frame ?? CGRect()

self.present(itemTypesActionSheet, animated: true, completion: nil)
}

func availableItemTypes() -> [String] {
var availableItemTypes: [String] = []
for itemType in sharedItemsOverview.keys {
Expand Down Expand Up @@ -183,8 +159,25 @@ import QuickLook
itemTypeSelectorButton.setTitle(buttonTitle, for: .normal)
itemTypeSelectorButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .medium)
itemTypeSelectorButton.setTitleColor(NCAppBranding.themeTextColor(), for: .normal)
itemTypeSelectorButton.addTarget(self, action: #selector(presentItemTypeSelector), for: .touchUpInside)
self.navigationItem.titleView = itemTypeSelectorButton

var menuActions: [UIAction] = []

for itemType in availableItemTypes() {
let itemTypeName = nameForItemType(itemType: itemType)
let action = UIAction(title: itemTypeName, image: nil) { [unowned self] _ in
self.setupViewForItemType(itemType: itemType)
}

if itemType == currentItemType {
action.state = .on
}

menuActions.append(action)
}

itemTypeSelectorButton.showsMenuAsPrimaryAction = true
itemTypeSelectorButton.menu = UIMenu(children: menuActions)
}

func showFetchingItemsPlaceholderView() {
Expand Down