Add RuntimeConfiguration

Author: colemancda

Sources/Android/AppCompatActivity.swift

@@ -36,12 +36,8 @@ open class SwiftSupportAppCompatActivity: AndroidContextWrapper {
 
         #if os(Android)
         // Ask app for main activity type.
-        let objectType = SwiftAndroidMainActivity()
-        
+        let objectType = SwiftAndroidMainApplication().runtimeConfiguration.appCompatActivity
         let swiftObject = objectType.init(javaObject: __this)
-        
-        //var locals = [jobject]()
-        //return swiftObject.localJavaObject( &locals )
         return swiftObject.swiftValue().j
         #else
         fatalError("Can only run on Android OS")
@@ -722,12 +718,6 @@ fileprivate extension SwiftSupport.App.AppCompatActivity {
 
 // MARK: - Native Methods
 
-#if os(Android)
-/// Needs to be implemented by app.
-@_silgen_name("SwiftAndroidMainActivity")
-internal func SwiftAndroidMainActivity() -> SwiftSupportAppCompatActivity.Type
-#endif
-
 @_silgen_name("Java_org_pureswift_swiftandroidsupport_app_SwiftAppCompatActivity_onCreateNative")
 public func SwiftSupportAppCompatActivity_onCreate( _ __env: UnsafeMutablePointer<JNIEnv?>,
                                                     _ __this: jobject?,

Sources/Android/Application.swift

@@ -22,17 +22,17 @@ open class SwiftApplication: JavaObject {
         #if os(Android)
         // Ask app for main activity type.
         let objectType = SwiftAndroidMainApplication()
-        
         let swiftObject = objectType.init(javaObject: __this)
-        
-        //var locals = [jobject]()
-        //return swiftObject.localJavaObject( &locals )
         return swiftObject.swiftValue().j
         #else
         fatalError("Can only run on Android OS")
         #endif
     }
 
+    open class var runtimeConfiguration: RuntimeConfiguration {
+        return RuntimeConfiguration.default
+    }
+    
     open func onConfigurationChanged(newConfig: JavaObject?) {
 
         NSLog("\(type(of: self)) \(#function)")

Sources/Android/ComponentActivity.swift

@@ -23,12 +23,8 @@ open class SwiftComponentActivity: AndroidContextWrapper {
 
         #if os(Android)
         // Ask app for main activity type.
-        let objectType = SwiftAndroidMainActivity()
-        
+        let objectType = SwiftAndroidMainApplication().runtimeConfiguration.componentActivity
         let swiftObject = objectType.init(javaObject: __this)
-        
-        //var locals = [jobject]()
-        //return swiftObject.localJavaObject( &locals )
         return swiftObject.swiftValue().j
         #else
         fatalError("Can only run on Android OS")
@@ -709,12 +705,6 @@ fileprivate extension SwiftComponentActivity {
 
 // MARK: - Native Methods
 
-#if os(Android)
-/// Needs to be implemented by app.
-@_silgen_name("SwiftAndroidMainActivity")
-internal func SwiftAndroidMainActivity() -> SwiftComponentActivity.Type
-#endif
-
 @_silgen_name("Java_org_pureswift_swiftandroidsupport_app_SwiftComponentActivity_onCreateNative")
 public func SwiftComponentActivity_onCreate( _ __env: UnsafeMutablePointer<JNIEnv?>,
                                                     _ __this: jobject?,

Sources/Android/RuntimeConfiguration.swift

@@ -0,0 +1,24 @@
+//
+//  RuntimeConfiguration.swift
+//  
+//
+//  Created by Alsey Coleman Miller on 11/30/22.
+//
+
+/// Swift Android runtime configuration
+public struct RuntimeConfiguration {
+    
+    public var appCompatActivity: SwiftSupportAppCompatActivity.Type
+    
+    public var componentActivity: SwiftComponentActivity.Type
+}
+
+public extension RuntimeConfiguration {
+    
+    static var `default`: RuntimeConfiguration {
+        RuntimeConfiguration(
+            appCompatActivity: SwiftSupportAppCompatActivity.self,
+            componentActivity: SwiftComponentActivity.self
+        )
+    }
+}