diff --git a/Passepartout-iOS/Cells/ActivityTableViewCell.swift b/Passepartout-iOS/Cells/ActivityTableViewCell.swift new file mode 100644 index 00000000..eebc8c02 --- /dev/null +++ b/Passepartout-iOS/Cells/ActivityTableViewCell.swift @@ -0,0 +1,49 @@ +// +// ActivityTableViewCell.swift +// Passepartout-iOS +// +// Created by Davide De Rosa on 4/8/19. +// Copyright (c) 2019 Davide De Rosa. All rights reserved. +// +// https://github.com/passepartoutvpn +// +// This file is part of Passepartout. +// +// Passepartout is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Passepartout is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Passepartout. If not, see . +// + +import UIKit + +extension Cells { + static let activity = ActivityTableViewCell.Provider() +} + +class ActivityTableViewCell: UITableViewCell { + private lazy var activityIndicator = UIActivityIndicatorView() +} + +extension ActivityTableViewCell { + class Provider: CellProvider { + typealias T = ActivityTableViewCell + + func dequeue(from tableView: UITableView, for indexPath: IndexPath) -> ActivityTableViewCell { + let cell = tableView.dequeue(T.self, identifier: Provider.identifier, for: indexPath) + cell.apply(Theme.current) + cell.activityIndicator.startAnimating() + cell.accessoryView = cell.activityIndicator + cell.selectionStyle = .none + return cell + } + } +} diff --git a/Passepartout-iOS/Global/Theme+Cells.swift b/Passepartout-iOS/Global/Theme+Cells.swift index 7f30d320..c02abc98 100644 --- a/Passepartout-iOS/Global/Theme+Cells.swift +++ b/Passepartout-iOS/Global/Theme+Cells.swift @@ -61,6 +61,13 @@ extension ToggleTableViewCell { } } +extension ActivityTableViewCell { + func apply(_ theme: Theme) { + textLabel?.text = nil + detailTextLabel?.text = nil + } +} + extension SettingTableViewCell { func applyAction(_ theme: Theme) { leftTextColor = theme.palette.action diff --git a/Passepartout-iOS/Global/Theme.swift b/Passepartout-iOS/Global/Theme.swift index 9a3d4038..1588e688 100644 --- a/Passepartout-iOS/Global/Theme.swift +++ b/Passepartout-iOS/Global/Theme.swift @@ -102,6 +102,9 @@ extension Theme { let toggle = UISwitch.appearance() toggle.onTintColor = palette.accessory + + let activity = UIActivityIndicatorView.appearance() + activity.color = palette.accessory } } diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj index 83a7ee2e..6f3e2b25 100644 --- a/Passepartout.xcodeproj/project.pbxproj +++ b/Passepartout.xcodeproj/project.pbxproj @@ -63,6 +63,7 @@ 0E3152DD223FA06100F61841 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0E05C5DF20D198B9006EE732 /* Localizable.strings */; }; 0E3152DE223FA06400F61841 /* Web in Resources */ = {isa = PBXBuildFile; fileRef = 0E0EABC721DF853C0069DAE7 /* Web */; }; 0E3152DF223FA1DD00F61841 /* ConnectionService.json in Resources */ = {isa = PBXBuildFile; fileRef = 0EBBE8F121822B4D00106008 /* ConnectionService.json */; }; + 0E3586FE225BD34800509A4D /* ActivityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3586FD225BD34800509A4D /* ActivityTableViewCell.swift */; }; 0E36D24D2240234B006AF062 /* ShortcutsAddViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E36D24C2240234B006AF062 /* ShortcutsAddViewController.swift */; }; 0E36D25822403469006AF062 /* Shortcuts.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0E36D25A22403469006AF062 /* Shortcuts.storyboard */; }; 0E36D25C224034AD006AF062 /* ShortcutsConnectToViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E36D25B224034AD006AF062 /* ShortcutsConnectToViewController.swift */; }; @@ -189,6 +190,7 @@ 0E31529E223F9EF500F61841 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0E3152A3223F9EF500F61841 /* Passepartout-CoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Passepartout-CoreTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 0E3152AC223F9EF500F61841 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 0E3586FD225BD34800509A4D /* ActivityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityTableViewCell.swift; sourceTree = ""; }; 0E36D24C2240234B006AF062 /* ShortcutsAddViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutsAddViewController.swift; sourceTree = ""; }; 0E36D25B224034AD006AF062 /* ShortcutsConnectToViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShortcutsConnectToViewController.swift; sourceTree = ""; }; 0E39BCEF214B9EF10035E9DE /* WebServices.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServices.swift; sourceTree = ""; }; @@ -335,6 +337,7 @@ 0E1066CA20E0F85C004F98B7 /* Cells */ = { isa = PBXGroup; children = ( + 0E3586FD225BD34800509A4D /* ActivityTableViewCell.swift */, 0E1066C820E0F84A004F98B7 /* Cells.swift */, 0E4C9CBA20DCF0D600A0C59C /* DestructiveTableViewCell.swift */, 0E05C5CE20D139AF006EE732 /* FieldTableViewCell.swift */, @@ -1078,6 +1081,7 @@ 0EFBFAC121AC464800887A8C /* CreditsViewController.swift in Sources */, 0EFD943E215BE10800529B64 /* IssueReporter.swift in Sources */, 0EB60FDA2111136E00AD27F3 /* UITextView+Search.swift in Sources */, + 0E3586FE225BD34800509A4D /* ActivityTableViewCell.swift in Sources */, 0EB67D6B2184581E00BA6200 /* ImportedHostsViewController.swift in Sources */, 0E57F63E20C83FC5008323CF /* ServiceViewController.swift in Sources */, 0E36D24D2240234B006AF062 /* ShortcutsAddViewController.swift in Sources */,