expo-battery 6.2.0 → 7.0.0

package/CHANGELOG.md

@@ -10,6 +10,20 @@
 
 ### 💡 Others
 
+## 7.0.0 — 2022-10-25
+
+### 🛠 Breaking changes
+
+- Bumped iOS deployment target to 13.0 and deprecated support for iOS 12. ([#18873](https://github.com/expo/expo/pull/18873) by [@tsapeta](https://github.com/tsapeta))
+
+### 🎉 New features
+
+- Native module on iOS is now written in Swift using the Sweet API. ([#19470](https://github.com/expo/expo/pull/19470) by [@fobos531](https://github.com/fobos531))
+
+## 6.3.0 — 2022-07-07
+
+_This version does not introduce any user-facing changes._
+
 ## 6.2.0 — 2022-04-18
 
 ### ⚠️ Notices

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '6.2.0'
+version = '7.0.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 11
-    versionName '6.2.0'
+    versionName '7.0.0'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/battery/BatteryModule.kt

@@ -12,11 +12,12 @@ import expo.modules.core.Promise
 import expo.modules.core.interfaces.ExpoMethod
 import expo.modules.core.interfaces.RegistryLifecycleListener
 import expo.modules.core.interfaces.services.EventEmitter
+import expo.modules.kotlin.types.Enumerable
 
 class BatteryModule(context: Context) : ExportedModule(context), RegistryLifecycleListener {
   private val NAME = "ExpoBattery"
 
-  enum class BatteryState(val value: Int) {
+  enum class BatteryState(val value: Int) : Enumerable {
     UNKNOWN(0), UNPLUGGED(1), CHARGING(2), FULL(3);
   }
 

package/build/ExpoBattery.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("expo-modules-core").ProxyNativeModule;
+declare const _default: any;
 export default _default;
 //# sourceMappingURL=ExpoBattery.d.ts.map

package/build/ExpoBattery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoBattery.d.ts","sourceRoot":"","sources":["../src/ExpoBattery.ts"],"names":[],"mappings":";AACA,wBAA8C"}
+{"version":3,"file":"ExpoBattery.d.ts","sourceRoot":"","sources":["../src/ExpoBattery.ts"],"names":[],"mappings":";AACA,wBAAkD"}

package/build/ExpoBattery.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoBattery;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoBattery');
 //# sourceMappingURL=ExpoBattery.js.map

package/build/ExpoBattery.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoBattery.js","sourceRoot":"","sources":["../src/ExpoBattery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,eAAe,kBAAkB,CAAC,WAAW,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\nexport default NativeModulesProxy.ExpoBattery;\n"]}
+{"version":3,"file":"ExpoBattery.js","sourceRoot":"","sources":["../src/ExpoBattery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,eAAe,mBAAmB,CAAC,aAAa,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\nexport default requireNativeModule('ExpoBattery');\n"]}

package/expo-module.config.json

@@ -0,0 +1,7 @@
+{
+  "name": "expo-battery",
+  "platforms": ["ios", "android", "web"],
+  "ios": {
+    "modules": ["BatteryModule"]
+  }
+}

package/ios/BatteryModule.swift

@@ -0,0 +1,98 @@
+import ExpoModulesCore
+
+let batteryLevelDidChange: String = "Expo.batteryLevelDidChange"
+let batteryStateDidChange: String = "Expo.batteryStateDidChange"
+let powerModeDidChange: String = "Expo.powerModeDidChange"
+
+public class BatteryModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExpoBattery")
+
+    Constants([
+      "isSupported": isSupported()
+    ])
+
+    Events(batteryLevelDidChange, batteryStateDidChange, powerModeDidChange)
+
+    AsyncFunction("getBatteryLevelAsync") { () -> Float in
+      return UIDevice.current.batteryLevel
+    }
+
+    AsyncFunction("isLowPowerModeEnabledAsync") { () -> Bool in
+      return ProcessInfo.processInfo.isLowPowerModeEnabled
+    }
+
+    AsyncFunction("getBatteryStateAsync") { () -> Int in
+      // Apple's enum values directly correspond to Expo's
+      // enum values for battery state and are in sync, so
+      // we can return the rawValue from Apple's enum directly
+      return UIDevice.current.batteryState.rawValue
+    }
+
+    OnCreate {
+      UIDevice.current.isBatteryMonitoringEnabled = true
+    }
+
+    OnDestroy {
+      UIDevice.current.isBatteryMonitoringEnabled = false
+    }
+
+    OnStartObserving {
+      NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(self.batteryLevelListener),
+        name: UIDevice.batteryLevelDidChangeNotification,
+        object: nil
+      )
+
+      NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(self.batteryStateListener),
+        name: UIDevice.batteryStateDidChangeNotification,
+        object: nil
+      )
+
+      NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(self.powerModeListener),
+        name: Notification.Name.NSProcessInfoPowerStateDidChange,
+        object: nil
+      )
+    }
+
+    OnStopObserving {
+      NotificationCenter.default.removeObserver(self, name: UIDevice.batteryLevelDidChangeNotification, object: nil)
+      NotificationCenter.default.removeObserver(self, name: UIDevice.batteryStateDidChangeNotification, object: nil)
+      NotificationCenter.default.removeObserver(self, name: Notification.Name.NSProcessInfoPowerStateDidChange, object: nil)
+    }
+  }
+
+  @objc
+  func batteryLevelListener() {
+    sendEvent(batteryLevelDidChange, [
+      "batteryLevel": UIDevice.current.batteryLevel
+    ])
+  }
+
+  @objc
+  func batteryStateListener() {
+    sendEvent(batteryStateDidChange, [
+      "batteryState": UIDevice.current.batteryState.rawValue
+    ])
+  }
+
+  @objc
+  func powerModeListener() {
+    sendEvent(powerModeDidChange, [
+      "lowPowerMode": ProcessInfo.processInfo.isLowPowerModeEnabled
+    ])
+  }
+}
+
+func isSupported() -> Bool {
+  #if targetEnvironment(simulator)
+    return false
+  #else
+    return true
+  #endif
+}

package/ios/{EXBattery.podspec → ExpoBattery.podspec}

@@ -3,23 +3,30 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXBattery'
+  s.name           = 'ExpoBattery'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '12.0'
+  s.platform       = :ios, '13.0'
+  s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
 
+  # Swift/Objective-C compatibility	
+  s.pod_target_xcconfig = {	
+    'DEFINES_MODULE' => 'YES',	
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'	
+  }
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
-    s.source_files = "#{s.name}/**/*.h"
+    s.source_files = "**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m}"
+    s.source_files = "**/*.{h,m,swift}"
   end
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-battery",
-  "version": "6.2.0",
+  "version": "7.0.0",
   "description": "Provides battery information for the physical device, as well as corresponding event listeners.",
   "main": "build/Battery.js",
   "types": "build/Battery.d.ts",
@@ -31,10 +31,10 @@
   "homepage": "https://docs.expo.dev/versions/latest/sdk/battery/",
   "dependencies": {},
   "devDependencies": {
-    "expo-module-scripts": "^2.0.0"
+    "expo-module-scripts": "^3.0.0"
   },
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "89a27c0ca0ca8becd7546697298e874a15e94faf"
+  "gitHead": "eab2b09c735fb0fc2bf734a3f29a6593adba3838"
 }

package/src/ExpoBattery.ts

@@ -1,2 +1,2 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoBattery;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoBattery');

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
 }

package/ios/EXBattery/EXBattery.h

@@ -1,24 +0,0 @@
-//  Copyright © 2018 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXExportedModule.h>
-#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
-#import <Foundation/Foundation.h>
-#import <ExpoModulesCore/EXEventEmitter.h>
-#import <ExpoModulesCore/EXEventEmitterService.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-// Keep this enum in sync with JavaScript
-typedef NS_ENUM(NSInteger, EXBatteryState) {
-  EXBatteryStateUnknown = 0,
-  EXBatteryStateUnplugged,
-  EXBatteryStateCharging,
-  EXBatteryStateFull
-};
-
-
-@interface EXBattery : EXExportedModule <EXModuleRegistryConsumer, EXEventEmitter>
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/EXBattery/EXBattery.m

@@ -1,157 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <EXBattery/EXBattery.h>
-#import <ExpoModulesCore/EXUtilities.h>
-
-@interface EXBattery ()
-
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-@property (nonatomic, weak) id <EXEventEmitterService> eventEmitter;
-@property (nonatomic, assign) BOOL hasListeners;
-@property (nonatomic, readonly) EXBatteryState batteryState;
-
-@end
-
-@implementation EXBattery
-
-EX_EXPORT_MODULE(ExpoBattery);
-
-- (NSDictionary *)constantsToExport
-{
-  BOOL _isSupported = YES;
-  
-  #if TARGET_OS_SIMULATOR
-    _isSupported = NO;
-  #endif
-  
-  return @{ @"isSupported": @(_isSupported) };
-}
-
-- (dispatch_queue_t)methodQueue
-{
-  return dispatch_get_main_queue();
-}
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  if (_moduleRegistry) {
-    [self invalidate];
-  }
-  _moduleRegistry = moduleRegistry;
-  _eventEmitter = [moduleRegistry getModuleImplementingProtocol:@protocol(EXEventEmitterService)];
-  
-  if (moduleRegistry) {
-    UIDevice.currentDevice.batteryMonitoringEnabled = YES;
-  }
-}
-
-- (NSArray<NSString *> *)supportedEvents
-{
-  return @[@"Expo.batteryLevelDidChange", @"Expo.batteryStateDidChange", @"Expo.powerModeDidChange"];
-}
-
-- (void)startObserving
-{
-  _hasListeners = YES;
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(batteryLevelDidChange:)
-                                               name:UIDeviceBatteryLevelDidChangeNotification
-                                             object:nil];
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(batteryStateDidChange:)
-                                               name:UIDeviceBatteryStateDidChangeNotification
-                                             object:nil];
-  
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(powerModeDidChange:)
-                                               name:NSProcessInfoPowerStateDidChangeNotification
-                                             object:nil];
-  
-}
-
-- (void)stopObserving
-{
-  _hasListeners = NO;
-  [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                  name:UIDeviceBatteryLevelDidChangeNotification
-                                                object:nil];
-  [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                  name:UIDeviceBatteryStateDidChangeNotification
-                                                object:nil];
-  [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                  name:NSProcessInfoPowerStateDidChangeNotification
-                                                object:nil];
-}
-
-- (void)invalidate
-{
-  _eventEmitter = nil;
-  UIDevice.currentDevice.batteryMonitoringEnabled = NO;
-}
-
-// Called at most once every minute
-- (void)batteryLevelDidChange:(NSNotification *)notification
-{
-  if (!_hasListeners) {
-    return;
-  }
-  NSDictionary *result = @{@"batteryLevel": @(UIDevice.currentDevice.batteryLevel)};
-  [_eventEmitter sendEventWithName:@"Expo.batteryLevelDidChange" body:result];
-}
-
-- (void)batteryStateDidChange:(NSNotification *)notification
-{
-  if (!_hasListeners) {
-    return;
-  }
-  NSDictionary *result = @{@"batteryState": @(self.batteryState)};
-  [_eventEmitter sendEventWithName:@"Expo.batteryStateDidChange" body:result];
-}
-
-
-- (void)powerModeDidChange:(NSNotification *)notification
-{
-  if(!_hasListeners) {
-    return;
-  }
-  NSDictionary *result = @{@"lowPowerMode": @(NSProcessInfo.processInfo.isLowPowerModeEnabled)};
-  [_eventEmitter sendEventWithName:@"Expo.powerModeDidChange" body:result];
-}
-
-EX_EXPORT_METHOD_AS(getBatteryLevelAsync,
-                    getBatteryLevelAsyncWithResolver:(EXPromiseResolveBlock)resolve
-                    rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve(@(UIDevice.currentDevice.batteryLevel));
-}
-
-EX_EXPORT_METHOD_AS(getBatteryStateAsync,
-                    getBatteryStateAsyncWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve(@([self batteryState]));
-}
-
-EX_EXPORT_METHOD_AS(isLowPowerModeEnabledAsync,
-                    isLowPowerModeEnabledAsyncWithResolver:(EXPromiseResolveBlock)resolve
-                    rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve(@(NSProcessInfo.processInfo.isLowPowerModeEnabled));
-}
-
-- (EXBatteryState)batteryState
-{
-  switch (UIDevice.currentDevice.batteryState) {
-    case UIDeviceBatteryStateUnknown:
-      return EXBatteryStateUnknown;
-    case UIDeviceBatteryStateUnplugged:
-      return EXBatteryStateUnplugged;
-    case UIDeviceBatteryStateCharging:
-      return EXBatteryStateCharging;
-    case UIDeviceBatteryStateFull:
-      return EXBatteryStateFull;
-    default:
-      return EXBatteryStateUnknown;
-  }
-}
-
-@end

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-battery",
-  "platforms": ["ios", "android", "web"]
-}