Skip to content

Commit 25f416b

Browse files
authored
Merge pull request shinydevelopment#81 from cysp/feature/statusbaritems-ios12
Update known status bar items for iOS 12
2 parents 08dcf68 + 5596ed5 commit 25f416b

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

SDStatusBarManager/SDStatusBarOverriderPost12_0.m

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@
1010
#import "SDStatusBarOverriderPost12_0.h"
1111

1212
typedef NS_ENUM(int, StatusBarItem) {
13-
// 0
14-
dateStringIpad = 1,
15-
// 2
16-
// 3
17-
SignalStrengthBars = 4,
18-
SecondarySignalStrengthBars = 5,
19-
SignalStrengthBarsVisibleOnIpad = 6,
20-
// 7
13+
TimeStatusBarItem = 0,
14+
DateStatusBarItem = 1,
15+
QuietModeStatusBarItem = 2,
16+
AirplaneModeStatusBarItem = 3,
17+
CellularSignalStrengthStatusBarItem = 4,
18+
SecondaryCellularSignalStrengthStatusBarItem = 5,
19+
CellularServiceStatusBarItem = 6,
20+
SecondaryCellularServiceStatusBarItem = 7,
2121
// 8
22-
// 9
23-
// 10
22+
CellularDataNetworkStatusBarItem = 9,
23+
SecondaryCellularDataNetworkStatusBarItem = 10,
2424
// 11
25-
// 12
26-
BatteryDetail = 13,
25+
MainBatteryStatusBarItem = 12,
26+
ProminentlyShowBatteryDetailStatusBarItem = 13,
2727
// 14
2828
// 15
29-
Bluetooth = 16,
30-
// 17
31-
// 18
29+
BluetoothStatusBarItem = 16,
30+
TTYStatusBarItem = 17,
31+
AlarmStatusBarItem = 18,
3232
// 19
3333
// 20
34-
// 21
35-
// 22
34+
LocationStatusBarItem = 21,
35+
RotationLockStatusBarItem = 22,
3636
// 23
37-
// 24
38-
// 25
39-
// 26
40-
// 27
41-
// 28
37+
AirPlayStatusBarItem = 24,
38+
AssistantStatusBarItem = 25,
39+
CarPlayStatusBarItem = 26,
40+
StudentStatusBarItem = 27,
41+
VPNStatusBarItem = 28,
4242
// 29
4343
// 30
4444
// 31
@@ -48,7 +48,7 @@ typedef NS_ENUM(int, StatusBarItem) {
4848
// 35
4949
// 36
5050
// 37
51-
// 38
51+
LiquidDetectionStatusBarItem = 38,
5252
// 39
5353
// 40
5454
};
@@ -196,28 +196,28 @@ - (void)enableOverrides {
196196

197197
// Show / Hide date on iPad
198198
if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad) {
199-
overrides->overrideItemIsEnabled[dateStringIpad] = 1;
200-
overrides->values.itemIsEnabled[dateStringIpad] = self.iPadDateEnabled ? 1 : 0;
199+
overrides->overrideItemIsEnabled[DateStatusBarItem] = 1;
200+
overrides->values.itemIsEnabled[DateStatusBarItem] = self.iPadDateEnabled ? 1 : 0;
201201
}
202202

203203
// Enable 5 bars of mobile (iPhone only)
204204
if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone) {
205-
overrides->overrideItemIsEnabled[SignalStrengthBars] = 1;
206-
overrides->values.itemIsEnabled[SignalStrengthBars] = 1;
205+
overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
206+
overrides->values.itemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
207207
overrides->overrideGsmSignalStrengthBars = 1;
208208
overrides->values.gsmSignalStrengthBars = 5;
209209
}
210210

211211
// Enable / Disable GSM signal bars on iPad
212212
if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad) {
213213
if (self.iPadGsmSignalEnabled) {
214-
overrides->overrideItemIsEnabled[SignalStrengthBars] = 1;
215-
overrides->values.itemIsEnabled[SignalStrengthBars] = 1;
214+
overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
215+
overrides->values.itemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
216216
overrides->overrideGsmSignalStrengthBars = 1;
217217
overrides->values.gsmSignalStrengthBars = 5;
218218
} else {
219-
overrides->overrideItemIsEnabled[SignalStrengthBarsVisibleOnIpad] = 1;
220-
overrides->values.itemIsEnabled[SignalStrengthBars] = 0;
219+
overrides->overrideItemIsEnabled[CellularSignalStrengthStatusBarItem] = 1;
220+
overrides->values.itemIsEnabled[CellularSignalStrengthStatusBarItem] = 0;
221221
}
222222
}
223223

@@ -233,8 +233,8 @@ - (void)enableOverrides {
233233
strcpy(overrides->values.serviceString, [carrierText cStringUsingEncoding:NSUTF8StringEncoding]);
234234

235235
// Battery: 100% and unplugged
236-
overrides->overrideItemIsEnabled[BatteryDetail] = YES;
237-
overrides->values.itemIsEnabled[BatteryDetail] = self.batteryDetailEnabled;
236+
overrides->overrideItemIsEnabled[ProminentlyShowBatteryDetailStatusBarItem] = YES;
237+
overrides->values.itemIsEnabled[ProminentlyShowBatteryDetailStatusBarItem] = self.batteryDetailEnabled;
238238
overrides->overrideBatteryCapacity = YES;
239239
overrides->values.batteryCapacity = 100;
240240
overrides->overrideBatteryState = YES;
@@ -244,8 +244,8 @@ - (void)enableOverrides {
244244
strcpy(overrides->values.batteryDetailString, [batteryDetailString cStringUsingEncoding:NSUTF8StringEncoding]);
245245

246246
// Bluetooth
247-
overrides->overrideItemIsEnabled[Bluetooth] = !!self.bluetoothEnabled;
248-
overrides->values.itemIsEnabled[Bluetooth] = !!self.bluetoothEnabled;
247+
overrides->overrideItemIsEnabled[BluetoothStatusBarItem] = !!self.bluetoothEnabled;
248+
overrides->values.itemIsEnabled[BluetoothStatusBarItem] = !!self.bluetoothEnabled;
249249
if (self.bluetoothEnabled) {
250250
overrides->overrideBluetoothConnected = self.bluetoothConnected;
251251
overrides->values.bluetoothConnected = self.bluetoothConnected;

0 commit comments

Comments
 (0)