expo-dev-menu-interface 0.6.0 → 0.7.2

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.6.0'
+version = '0.7.2'
 
 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 6
-    versionName '0.6.0'
+    versionName '0.7.2'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/interfaces/devmenu/DevMenuManagerInterface.kt

@@ -6,7 +6,6 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.bridge.ReadableMap
-import expo.interfaces.devmenu.expoapi.DevMenuExpoApiClientInterface
 import expo.interfaces.devmenu.items.DevMenuDataSourceItem
 import kotlinx.coroutines.CoroutineScope
 
@@ -90,11 +89,6 @@ interface DevMenuManagerInterface {
    */
   fun setCurrentScreen(screen: String?)
 
-  /**
-   * @return a instance of [DevMenuExpoApiClientInterface]
-   */
-  fun getExpoApiClient(): DevMenuExpoApiClientInterface
-
   /**
    * Sends an event to the delegate's bridge if exists.
    */

package/android/src/main/java/expo/interfaces/devmenu/items/DevMenuItems.kt

@@ -85,12 +85,15 @@ class DevMenuAction(
     putString("detail", detail())
     putString("glyphName", glyphName())
 
-    putBundle("keyCommand", keyCommand?.let { keyCommand ->
-      Bundle().apply {
-        putString("input", keyCharacterMap.getDisplayLabel(keyCommand.code).toString())
-        putInt("modifiers", exportKeyCommandModifiers())
+    putBundle(
+      "keyCommand",
+      keyCommand?.let { keyCommand ->
+        Bundle().apply {
+          putString("input", keyCharacterMap.getDisplayLabel(keyCommand.code).toString())
+          putInt("modifiers", exportKeyCommandModifiers())
+        }
       }
-    })
+    )
   }
 
   private fun exportKeyCommandModifiers(): Int {

package/ios/DevMenuManagerProtocol.swift

@@ -41,7 +41,4 @@ public protocol DevMenuManagerProtocol {
   @objc
   @discardableResult
   func toggleMenu() -> Bool
-
-  @objc
-  var expoApiClient: DevMenuExpoApiClientProtocol { get }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu-interface",
-  "version": "0.6.0",
+  "version": "0.7.2",
   "description": "Interface for expo-dev-menu",
   "main": "index.js",
   "keywords": [
@@ -25,5 +25,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "2b35d9008fef42cb53473331c37693ca12e9bf12"
+  "gitHead": "60746772948a4baf93ed772c17f21423a9a58c0f"
 }

package/android/src/main/java/expo/interfaces/devmenu/expoapi/DevMenuEASUpdates.kt

@@ -1,42 +0,0 @@
-package expo.interfaces.devmenu.expoapi
-
-class DevMenuEASUpdates {
-  data class Channel(
-    val id: String,
-    val name: String,
-    val createdAt: String,
-    val updatedAt: String
-  )
-
-  data class Branch(
-    val id: String,
-    val updates: Array<Update>
-  ) {
-    override fun equals(other: Any?): Boolean {
-      if (this === other) return true
-      if (javaClass != other?.javaClass) return false
-
-      other as Branch
-
-      if (id != other.id) return false
-      if (!updates.contentEquals(other.updates)) return false
-
-      return true
-    }
-
-    override fun hashCode(): Int {
-      var result = id.hashCode()
-      result = 31 * result + updates.contentHashCode()
-      return result
-    }
-  }
-
-  data class Update(
-    val id: String,
-    val message: String,
-    val platform: String,
-    val runtimeVersion: String,
-    val createdAt: String,
-    val updatedAt: String
-  )
-}

package/android/src/main/java/expo/interfaces/devmenu/expoapi/DevMenuExpoApiClientInterface.kt

@@ -1,27 +0,0 @@
-package expo.interfaces.devmenu.expoapi
-
-data class Response<T>(
-  val status: Int,
-  val data: T?
-)
-
-data class DevMenuGraphQLOptions(
-  val limit: Int = 10,
-  val offset: Int = 0
-)
-
-interface DevMenuExpoApiClientInterface {
-  fun isLoggedIn(): Boolean
-  fun setSessionSecret(newSessionSecret: String?)
-  suspend fun queryMyProjects(options: DevMenuGraphQLOptions = DevMenuGraphQLOptions()): okhttp3.Response
-  suspend fun queryDevSessions(deviceID: String?): okhttp3.Response
-  suspend fun queryUpdateChannels(
-    appId: String,
-    options: DevMenuGraphQLOptions = DevMenuGraphQLOptions()
-  ): Response<List<DevMenuEASUpdates.Channel>>
-  suspend fun queryUpdateBranches(
-    appId: String,
-    branchesOptions: DevMenuGraphQLOptions = DevMenuGraphQLOptions(),
-    updatesOptions: DevMenuGraphQLOptions = DevMenuGraphQLOptions()
-  ): Response<List<DevMenuEASUpdates.Branch>>
-}

package/ios/ExpoApiClient/DevMenuEASUpdates.swift

@@ -1,57 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-import Foundation
-
-@objc
-public protocol DevMenuConstructibleFromDictionary {
-  @objc
-  init(dictionary: [String: Any])
-}
-
-public struct DevMenuEASUpdates {
-  @objc
-  public class Channel: NSObject, DevMenuConstructibleFromDictionary {
-    public let id: String
-    public let name: String
-    public let createdAt: String
-    public let updatedAt: String
-
-    required public init(dictionary: [String: Any]) {
-      id = dictionary["id"] as! String
-      name = dictionary["name"] as! String
-      createdAt = dictionary["createdAt"] as! String
-      updatedAt = dictionary["updatedAt"] as! String
-    }
-  }
-
-  @objc
-  public class Branch: NSObject, DevMenuConstructibleFromDictionary {
-    public let id: String
-    public let updates: [Update]
-
-    required public init(dictionary: [String: Any]) {
-      id = dictionary["id"] as! String
-      let updatesData = dictionary["updates"] as? [[String: Any]] ?? []
-      updates = updatesData.map { Update(dictionary: $0) }
-    }
-  }
-
-  @objc
-  public class Update: NSObject, DevMenuConstructibleFromDictionary {
-    public let id: String
-    public let message: String
-    public let platform: String
-    public let runtimeVersion: String
-    public let createdAt: String
-    public let updatedAt: String
-
-    required public init(dictionary: [String: Any]) {
-      id = dictionary["id"] as! String
-      message = dictionary["message"] as! String
-      platform = dictionary["platform"] as! String
-      runtimeVersion = dictionary["runtimeVersion"] as! String
-      createdAt = dictionary["createdAt"] as! String
-      updatedAt = dictionary["updatedAt"] as! String
-    }
-  }
-}

package/ios/ExpoApiClient/DevMenuExpoApiClientProtocol.swift

@@ -1,64 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-import Foundation
-
-public typealias HTTPCompletionHandler = (Data?, URLResponse?, Error?) -> Void
-
-@objc
-public class DevMenuGraphQLOptions: NSObject {
-  @objc
-  public let limit: Int
-  @objc
-  public let offset: Int
-
-  @objc
-  public init(withLimit limit: Int = 10, withOffset offset: Int = 0) {
-    self.limit = limit
-    self.offset = offset
-  }
-
-  @objc
-  public convenience init(withOffset offset: Int) {
-    self.init(withLimit: 10, withOffset: offset)
-  }
-}
-
-@objc
-public protocol DevMenuExpoApiClientProtocol {
-  @objc
-  func isLoggedIn() -> Bool
-
-  @objc
-  func setSessionSecret(_ sessionSecret: String?)
-
-  @objc
-  func queryUpdateChannels(
-    appId: String,
-    completionHandler: @escaping ([DevMenuEASUpdates.Channel]?, URLResponse?, Error?) -> Void,
-    options: DevMenuGraphQLOptions
-  )
-
-  @objc
-  func queryUpdateBranches(
-    appId: String,
-    completionHandler: @escaping ([DevMenuEASUpdates.Branch]?, URLResponse?, Error?) -> Void,
-    branchesOptions: DevMenuGraphQLOptions,
-    updatesOptions: DevMenuGraphQLOptions
-  )
-}
-
-public extension DevMenuExpoApiClientProtocol {
-  func queryUpdateChannels(
-    appId: String,
-    completionHandler: @escaping ([DevMenuEASUpdates.Channel]?, URLResponse?, Error?) -> Void
-  ) {
-    queryUpdateChannels(appId: appId, completionHandler: completionHandler, options: DevMenuGraphQLOptions())
-  }
-
-  func queryUpdateBranches(
-    appId: String,
-    completionHandler: @escaping ([DevMenuEASUpdates.Branch]?, URLResponse?, Error?) -> Void
-  ) {
-    queryUpdateBranches(appId: appId, completionHandler: completionHandler, branchesOptions: DevMenuGraphQLOptions(), updatesOptions: DevMenuGraphQLOptions())
-  }
-}

package/ios/Tests/DevMenuEASUpdatesTest.swift

@@ -1,86 +0,0 @@
-import Quick
-import Nimble
-
-@testable import EXDevMenuInterface
-
-class DevMenuEASUpdatesTest: QuickSpec {
-  override func spec() {
-    it("Channel constructor should populate all fields") {
-      let seeder = [
-        "id": "1234",
-        "name": "channel-1",
-        "createdAt": "1635508863",
-        "updatedAt": "1635508873"
-      ]
-
-      let channel = DevMenuEASUpdates.Channel(dictionary: seeder)
-
-      expect(channel.id).to(equal("1234"))
-      expect(channel.name).to(equal("channel-1"))
-      expect(channel.createdAt).to(equal("1635508863"))
-      expect(channel.updatedAt).to(equal("1635508873"))
-    }
-
-    it("Update constructor should populate all fields") {
-      let seeder = [
-        "id": "1234",
-        "message": "update-1",
-        "platform": "ios",
-        "runtimeVersion": "1",
-        "createdAt": "1635508863",
-        "updatedAt": "1635508873"
-      ]
-
-      let update = DevMenuEASUpdates.Update(dictionary: seeder)
-
-      expect(update.id).to(equal("1234"))
-      expect(update.message).to(equal("update-1"))
-      expect(update.platform).to(equal("ios"))
-      expect(update.runtimeVersion).to(equal("1"))
-      expect(update.createdAt).to(equal("1635508863"))
-      expect(update.updatedAt).to(equal("1635508873"))
-    }
-
-    it("Branch constructor should populate all fields") {
-      let seeder = [
-        "id": "1",
-        "updates": [
-          [
-            "id": "1234",
-            "message": "update-1",
-            "platform": "ios",
-            "runtimeVersion": "1",
-            "createdAt": "1635508863",
-            "updatedAt": "1635508873"
-          ],
-          [
-            "id": "9876",
-            "message": "update-2",
-            "platform": "ios",
-            "runtimeVersion": "2",
-            "createdAt": "1635508863",
-            "updatedAt": "1635508873"
-          ]
-        ]
-      ] as [String: Any]
-
-      let branch = DevMenuEASUpdates.Branch(dictionary: seeder)
-      let update1 = branch.updates[0]
-      let update2 = branch.updates[1]
-
-      expect(branch.id).to(equal("1"))
-      expect(update1.id).to(equal("1234"))
-      expect(update1.message).to(equal("update-1"))
-      expect(update1.platform).to(equal("ios"))
-      expect(update1.runtimeVersion).to(equal("1"))
-      expect(update1.createdAt).to(equal("1635508863"))
-      expect(update1.updatedAt).to(equal("1635508873"))
-      expect(update2.id).to(equal("9876"))
-      expect(update2.message).to(equal("update-2"))
-      expect(update2.platform).to(equal("ios"))
-      expect(update2.runtimeVersion).to(equal("2"))
-      expect(update2.createdAt).to(equal("1635508863"))
-      expect(update2.updatedAt).to(equal("1635508873"))
-    }
-  }
-}