Skip to content
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

fix: Hide sensor order action for alphabetical sorting #1690 #1802

Merged
merged 1 commit into from
Dec 18, 2023
Merged

fix: Hide sensor order action for alphabetical sorting #1690 #1802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions ...on/Sources/Classes/Presentation/Modules/Dashboard/Home/Presenter/DashboardPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,10 @@ extension DashboardPresenter: DashboardViewOutput {
}

func viewDidTriggerRename(for viewModel: CardsViewModel) {
let sortingType: DashboardSortingType =
settings.dashboardSensorOrder.count == 0 ? .alphabetical : .manual
view?.showSensorNameRenameDialog(for: viewModel, sortingType: sortingType)
view?.showSensorNameRenameDialog(
for: viewModel,
sortingType: dashboardSortingType()
)
}

func viewDidTriggerShare(for viewModel: CardsViewModel) {
Expand Down Expand Up @@ -337,6 +338,7 @@ extension DashboardPresenter: DashboardViewOutput {
settings.dashboardSensorOrder = orderedIds
ruuviAppSettingsService.set(dashboardSensorOrder: orderedIds)
viewModels = reorder(viewModels)
view?.dashboardSortingType = dashboardSortingType()
}

func viewDidResetManualSorting() {
Expand Down Expand Up @@ -574,6 +576,7 @@ extension DashboardPresenter {
view?.userSignedInOnce = settings.signedInAtleastOnce
view?.dashboardType = settings.dashboardType
view?.dashboardTapActionType = settings.dashboardTapActionType
view?.dashboardSortingType = dashboardSortingType()

let ruuviViewModels = ruuviTags.compactMap { ruuviTag -> CardsViewModel in
let viewModel = CardsViewModel(ruuviTag)
Expand Down Expand Up @@ -650,7 +653,7 @@ extension DashboardPresenter {
}
}

if settings.dashboardSensorOrder.count == 0 {
if dashboardSortingType() == .alphabetical {
viewModels.append(viewModel)
viewModels = reorder(viewModels)
} else {
Expand Down Expand Up @@ -1919,6 +1922,10 @@ extension DashboardPresenter {
}
}
}

private func dashboardSortingType() -> DashboardSortingType {
return settings.dashboardSensorOrder.count == 0 ? .alphabetical : .manual
}
}

// swiftlint:enable file_length
19 changes: 16 additions & 3 deletions ...on/Sources/Classes/Presentation/Modules/Dashboard/Home/View/DashboardViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ class DashboardViewController: UIViewController {
}
}

var dashboardSortingType: DashboardSortingType! {
didSet {
viewButton.updateMenu(with: viewToggleMenuOptions())
}
}

var userSignedInOnce: Bool = false {
didSet {
noSensorView.userSignedInOnce = userSignedInOnce
Expand Down Expand Up @@ -317,11 +323,18 @@ extension DashboardViewController {
]
)

var menuItems: [UIMenuElement] = [
cardTypeMenu,
cardActionMenu,
]

if dashboardSortingType == .manual {
menuItems.append(resetSensorSortingOrderMenu)
}

return UIMenu(
title: "",
children: [
cardTypeMenu, cardActionMenu, resetSensorSortingOrderMenu
]
children: menuItems
)
}

Expand Down
1 change: 1 addition & 0 deletions ...Station/Sources/Classes/Presentation/Modules/Dashboard/Home/View/DashboardViewInput.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ protocol DashboardViewInput: ViewInput {
var viewModels: [CardsViewModel] { get set }
var dashboardType: DashboardType! { get set }
var dashboardTapActionType: DashboardTapActionType! { get set }
var dashboardSortingType: DashboardSortingType! { get set }
var userSignedInOnce: Bool { get set }
func applyUpdate(to viewModel: CardsViewModel)
func showNoSensorsAddedMessage(show: Bool)
Expand Down