Skip to content

Commit

Permalink
Merge pull request #151 from DimensionSrl/feature/meet_ux_improvemements
Browse files Browse the repository at this point in the history 
Feature/meet ux improvemements
  • Loading branch information
@RudiThoeni
RudiThoeni authored Nov 7, 2024
2 parents 33c0291 + e0a316e commit dfd4a4d
Show file tree
Hide file tree
Showing 19 changed files with 590 additions and 264 deletions.
20 changes: 12 additions & 8 deletions NOICommunity.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,12 @@
31BFAB3B283FC88A00EF274D /* CALayer+XibConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BFAB3A283FC88A00EF274D /* CALayer+XibConfiguration.swift */; };
31C028412B55924B00D851EE /* FeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C028402B55924B00D851EE /* FeatureFlag.swift */; };
31C14C2327DA3597009AF69D /* UIScrollView+ScrollToView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C14C2227DA3597009AF69D /* UIScrollView+ScrollToView.swift */; };
31C1ECB82C74E248004C9104 /* FiltersBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C1ECB72C74E248004C9104 /* FiltersBarView.swift */; };
31C2261C270F596E0098A70E /* EventCardContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 315F4BE127034C00001905AF /* EventCardContentView.xib */; };
31C2261D270F59750098A70E /* EventDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3187667826FB3A9300782FA6 /* EventDetailsViewController.xib */; };
31C28BF62719709B00312A62 /* NOICells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C28BF52719709B00312A62 /* NOICells.swift */; };
31C28BF8271992F500312A62 /* FiltersBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C28BF7271992F500312A62 /* FiltersBarView.swift */; };
31C28BFA2719931400312A62 /* FiltersBarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 31C28BF92719931400312A62 /* FiltersBarView.xib */; };
31C28BF8271992F500312A62 /* EventsFiltersBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C28BF7271992F500312A62 /* EventsFiltersBarView.swift */; };
31C28BFA2719931400312A62 /* EventsFiltersBarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 31C28BF92719931400312A62 /* EventsFiltersBarView.xib */; };
31C28BFD2719BD7200312A62 /* LoadingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 31C28BFB2719BD7200312A62 /* LoadingViewController.xib */; };
31C28BFE2719BD7200312A62 /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C28BFC2719BD7200312A62 /* LoadingViewController.swift */; };
31C3629F270EFC5C00C92532 /* UIButton+Background.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C3629E270EFC5C00C92532 /* UIButton+Background.swift */; };
Expand Down Expand Up @@ -408,9 +409,10 @@
31BFAB3A283FC88A00EF274D /* CALayer+XibConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+XibConfiguration.swift"; sourceTree = "<group>"; };
31C028402B55924B00D851EE /* FeatureFlag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlag.swift; sourceTree = "<group>"; };
31C14C2227DA3597009AF69D /* UIScrollView+ScrollToView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScrollView+ScrollToView.swift"; sourceTree = "<group>"; };
31C1ECB72C74E248004C9104 /* FiltersBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiltersBarView.swift; sourceTree = "<group>"; };
31C28BF52719709B00312A62 /* NOICells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NOICells.swift; sourceTree = "<group>"; };
31C28BF7271992F500312A62 /* FiltersBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiltersBarView.swift; sourceTree = "<group>"; };
31C28BF92719931400312A62 /* FiltersBarView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FiltersBarView.xib; sourceTree = "<group>"; };
31C28BF7271992F500312A62 /* EventsFiltersBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventsFiltersBarView.swift; sourceTree = "<group>"; };
31C28BF92719931400312A62 /* EventsFiltersBarView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EventsFiltersBarView.xib; sourceTree = "<group>"; };
31C28BFB2719BD7200312A62 /* LoadingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoadingViewController.xib; sourceTree = "<group>"; };
31C28BFC2719BD7200312A62 /* LoadingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
31C3629E270EFC5C00C92532 /* UIButton+Background.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Background.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -513,8 +515,8 @@
315F4BE327035679001905AF /* EventCardContentConfiguration.SharedConfig.swift */,
31AA31F026F0B40800744A00 /* EventCardContentView.swift */,
315F4BE127034C00001905AF /* EventCardContentView.xib */,
31C28BF7271992F500312A62 /* FiltersBarView.swift */,
31C28BF92719931400312A62 /* FiltersBarView.xib */,
31C28BF7271992F500312A62 /* EventsFiltersBarView.swift */,
31C28BF92719931400312A62 /* EventsFiltersBarView.xib */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -887,6 +889,7 @@
313010CE28463F1000AF6520 /* ContentConfiguration.swift */,
318664A12B22471E0088A752 /* LinkTextView.swift */,
31B192772C6A434B009872E9 /* BaseWindow.swift */,
31C1ECB72C74E248004C9104 /* FiltersBarView.swift */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -1204,7 +1207,7 @@
31515A20286C868600642907 /* SourceSansPro-LightItalic.ttf in Resources */,
3121AFDE2858B43A00248CDF /* MeetMainViewController.xib in Resources */,
31515A1F286C868600642907 /* SourceSansPro-Bold.ttf in Resources */,
31C28BFA2719931400312A62 /* FiltersBarView.xib in Resources */,
31C28BFA2719931400312A62 /* EventsFiltersBarView.xib in Resources */,
313010CD2846102000AF6520 /* MyAccountViewController.xib in Resources */,
31EBA3742807FAD9001AAE8F /* AuthWelcomeViewController.xib in Resources */,
3132EF3A283D29E00016DF7F /* PersonCardContentView.xib in Resources */,
Expand Down Expand Up @@ -1319,6 +1322,7 @@
3153010528071D1200471153 /* AuthWelcomePageViewController.swift in Sources */,
316F5615281C166B0075B09F /* MyAccountViewController.swift in Sources */,
31C028412B55924B00D851EE /* FeatureFlag.swift in Sources */,
31C1ECB82C74E248004C9104 /* FiltersBarView.swift in Sources */,
31C640B126FE1449004B71A2 /* TabCoordinatorType.swift in Sources */,
31A5F05527D25A9400FA20BC /* EventFiltersViewController.swift in Sources */,
317B6F9A28118950008D07C0 /* ClientFactory.swift in Sources */,
Expand All @@ -1335,7 +1339,7 @@
312F5D292808252900C84598 /* WelcomeViewModel.swift in Sources */,
31DAC7BE2B568A0100F24D79 /* IndexPathAdditions.swift in Sources */,
3101FC5B283394FA00A3416F /* TodayCoordinator.swift in Sources */,
31C28BF8271992F500312A62 /* FiltersBarView.swift in Sources */,
31C28BF8271992F500312A62 /* EventsFiltersBarView.swift in Sources */,
3145D23326B3F73F00F16787 /* SceneDelegate.swift in Sources */,
31B192722C6A367D009872E9 /* DeveloperToolsViewController.swift in Sources */,
31AA31E826F09E3600744A00 /* Event.swift in Sources */,
Expand Down
113 changes: 89 additions & 24 deletions NOICommunity/MeetFeature/View Controllers/CompaniesFiltersViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import UIKit
import Combine
import Core
import PeopleClient

// MARK: CompaniesFiltersViewController
Expand All @@ -22,7 +23,21 @@ final class CompaniesFiltersViewController: UIViewController {
searchBar.placeholder = .localized("search_label")
}
}


@IBOutlet private var filtersBarView: FiltersBarView! {
didSet {
filtersBarView.items = companyViewModel
.filterItems
.map(\.title)
filtersBarView.scrollView.contentInset = .init(
top: 0,
left: 8,
bottom: 0,
right: 8
)
}
}

@IBOutlet private var searchBarContainerView: UIView!

@IBOutlet private var actionsContainersView: FooterView!
Expand All @@ -42,7 +57,15 @@ final class CompaniesFiltersViewController: UIViewController {
.configureAsPrimaryActionButton()
}
}


private var filters: UISegmentedControl {
filtersBarView.segmentedControl
}

private var filtersScrollView: UIScrollView {
filtersBarView.scrollView
}

private var subscriptions: Set<AnyCancellable> = []

private lazy var companyViewModel = peopleViewModel.makeCompanyViewModel()
Expand Down Expand Up @@ -125,6 +148,9 @@ final class CompaniesFiltersViewController: UIViewController {

private extension CompaniesFiltersViewController {

typealias DataSource = UICollectionViewDiffableDataSource<Initial, CompanyId>
typealias Snapshot = NSDiffableDataSourceSnapshot<Initial, CompanyId>

func configureBindings() {
searchBar.delegate = resultsVC

Expand Down Expand Up @@ -153,19 +179,68 @@ private extension CompaniesFiltersViewController {
}
.store(in: &subscriptions)

companyViewModel.$results
companyViewModel
.$results
.map { $0?.1.isEmpty }
.sink { [weak self] isEmpty in
guard let self = self
else { return }

if isEmpty == true {
self.containerVC.content = self.emptyResultsVC
} else {
self.containerVC.content = self.resultsVC
}
}
.store(in: &subscriptions)

companyViewModel
.$activeFilter
.sink { [weak filters, weak companyViewModel] newActiveFilter in
guard let filters,
let companyViewModel
else { return }

if let matchingIndex = companyViewModel.filterItems.firstIndex(of: newActiveFilter) {
filters.selectedSegmentIndex = matchingIndex
} else {
filters.selectedSegmentIndex = UISegmentedControl.noSegment
}
}
.store(in: &subscriptions)

filters
.publisher(for: .valueChanged)
.sink { [weak filters, weak companyViewModel, weak filtersScrollView] in
guard let filters,
let companyViewModel,
let filtersScrollView
else { return }

let selectedSegmentIndex = filters.selectedSegmentIndex
let newSelectedFilter = companyViewModel.filterItems[selectedSegmentIndex]
companyViewModel.filterBy(filter: newSelectedFilter)

let convertRect: (UIView) -> CGRect = {
$0.convert($0.frame, to: filtersScrollView)
}
let selectedControls = filters
.recursiveSubviews { $0 is UILabel }
.sorted { convertRect($0).minX < convertRect($1).minX }
let selectedControl = selectedControls[selectedSegmentIndex]
let selectedControlRect = convertRect(selectedControl)
if !filtersScrollView.bounds.contains(
selectedControlRect
) {
let targetScrollingRect = selectedControlRect
.insetBy(dx: -100, dy: 0)
filtersScrollView.scrollRectToVisible(
targetScrollingRect,
animated: true
)
}
}
.store(in: &subscriptions)
}
}

Expand All @@ -179,8 +254,8 @@ private extension CompaniesFiltersViewController {

let companyViewModel: CompanyViewModel

private var dataSource: UICollectionViewDiffableDataSource<Company.Tag, CompanyId>! = nil
private var dataSource: DataSource!

var didSelectHandler: ((CompanyId) -> Void)?

private var subscriptions: Set<AnyCancellable> = []
Expand Down Expand Up @@ -291,25 +366,15 @@ private extension CompaniesFiltersViewController.CollectionViewController {
}

let headerRegistration = UICollectionView
.SupplementaryRegistration<UICollectionViewCell>(
.SupplementaryRegistration<UICollectionViewListCell>(
elementKind: UICollectionView.elementKindSectionHeader
) { cell, kind, indexPath in
var config = UIListContentConfiguration.noiGroupedHeader()

let companyTag = self.dataSource
let initial = self.dataSource
.snapshot()
.sectionIdentifiers[indexPath.section]
switch companyTag {
case .researchInstitution:
config.text = .localized("filter_by_research_institution")
case .startup:
config.text = .localized("filter_by_startup")
case .company:
config.text = .localized("filter_by_company")
default:
break
}


var config = UIListContentConfiguration.noiGroupedHeader()
config.text = initial.value
cell.contentConfiguration = config
}

Expand Down Expand Up @@ -339,11 +404,11 @@ private extension CompaniesFiltersViewController.CollectionViewController {
}

func updateUI(
_ result: ([Company.Tag], [Company.Tag: [CompanyId]]),
_ result: ([Initial], [Initial: [CompanyId]]),
animated: Bool
) {
let (sections, sectionToItems) = result
var snapshot = NSDiffableDataSourceSnapshot<Company.Tag, CompanyId>()
var snapshot = CompaniesFiltersViewController.Snapshot()
snapshot.appendSections(sections)
for section in sections {
snapshot.appendItems(sectionToItems[section]!, toSection: section)
Expand Down Expand Up @@ -417,7 +482,7 @@ extension CompaniesFiltersViewController.CollectionViewController: UISearchBarDe
}

func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
companyViewModel.filter(searchTerm: searchText)
companyViewModel.filterBy(searchTerm: searchText)
}

}
Expand Down
Loading

0 comments on commit dfd4a4d

Please sign in to comment.