Add down/up indication of data count
Other improvements: - TunnelKit reports 0 rather than nil upon connection. - Fall back to "Unavailable" rather than empty string.
This commit is contained in:
parent
4ab70ea747
commit
3197f49368
|
@ -760,7 +760,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
|
|||
if let count = currentDataCount, vpn.status == .connected {
|
||||
cell.rightText = L10n.Service.Cells.DataCount.value(count.0.dataUnitDescription, count.1.dataUnitDescription)
|
||||
} else {
|
||||
cell.rightText = nil
|
||||
cell.rightText = L10n.Service.Cells.DataCount.none
|
||||
}
|
||||
cell.accessoryType = .none
|
||||
cell.isTappable = false
|
||||
|
|
|
@ -108,7 +108,8 @@
|
|||
"service.cells.trusted_policy.caption" = "Trust disables VPN";
|
||||
"service.cells.test_connectivity.caption" = "Test connectivity";
|
||||
"service.cells.data_count.caption" = "Exchanged data count";
|
||||
"service.cells.data_count.value" = "%@ / %@";
|
||||
"service.cells.data_count.value" = "↓%@ / ↑%@";
|
||||
"service.cells.data_count.none" = "Unavailable";
|
||||
"service.cells.debug_log.caption" = "Debug log";
|
||||
"service.cells.masks_private_data.caption" = "Mask network data";
|
||||
"service.cells.report_issue.caption" = "Report connectivity issue";
|
||||
|
|
|
@ -543,7 +543,9 @@ public enum L10n {
|
|||
public enum DataCount {
|
||||
/// Exchanged data count
|
||||
public static let caption = L10n.tr("Localizable", "service.cells.data_count.caption")
|
||||
/// %@ / %@
|
||||
/// Unavailable
|
||||
public static let `none` = L10n.tr("Localizable", "service.cells.data_count.none")
|
||||
/// ↓%@ / ↑%@
|
||||
public static func value(_ p1: String, _ p2: String) -> String {
|
||||
return L10n.tr("Localizable", "service.cells.data_count.value", p1, p2)
|
||||
}
|
||||
|
|
4
Podfile
4
Podfile
|
@ -5,8 +5,8 @@ use_frameworks!
|
|||
def shared_pods
|
||||
#pod 'TunnelKit', '~> 1.5.0'
|
||||
#pod 'TunnelKit/LZO', '~> 1.5.0'
|
||||
pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '93a7729'
|
||||
pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => '93a7729'
|
||||
pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'a638767'
|
||||
pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'a638767'
|
||||
#pod 'TunnelKit', :path => '../../personal/tunnelkit'
|
||||
#pod 'TunnelKit/LZO', :path => '../../personal/tunnelkit'
|
||||
end
|
||||
|
|
10
Podfile.lock
10
Podfile.lock
|
@ -15,8 +15,8 @@ PODS:
|
|||
|
||||
DEPENDENCIES:
|
||||
- MBProgressHUD
|
||||
- TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `93a7729`)
|
||||
- TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `93a7729`)
|
||||
- TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `a638767`)
|
||||
- TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `a638767`)
|
||||
|
||||
SPEC REPOS:
|
||||
https://github.com/cocoapods/specs.git:
|
||||
|
@ -26,12 +26,12 @@ SPEC REPOS:
|
|||
|
||||
EXTERNAL SOURCES:
|
||||
TunnelKit:
|
||||
:commit: 93a7729
|
||||
:commit: a638767
|
||||
:git: https://github.com/keeshux/tunnelkit
|
||||
|
||||
CHECKOUT OPTIONS:
|
||||
TunnelKit:
|
||||
:commit: 93a7729
|
||||
:commit: a638767
|
||||
:git: https://github.com/keeshux/tunnelkit
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
|
@ -40,6 +40,6 @@ SPEC CHECKSUMS:
|
|||
SwiftyBeaver: 4cc0080d2e23f980652e28978db11a5c9da39165
|
||||
TunnelKit: 9d8089c4600ea9b3a54841391b4969f2faa9c17f
|
||||
|
||||
PODFILE CHECKSUM: 6010aa429513f9c70c23f9087ac02d60b1a183b6
|
||||
PODFILE CHECKSUM: 41cfe6321ea8695a6288fd8009199854a1a8fbe2
|
||||
|
||||
COCOAPODS: 1.6.1
|
||||
|
|
Loading…
Reference in New Issue