fixed bug for deployment on device (missing includes)

ios/Classes/BottomSheetViewController.h

@@ -5,7 +5,7 @@
 //  Created by Phineas.Huang on 2020/5/29.
 //  Copyright © 2020 Garmin. All rights reserved.
 //
-
+#define USE_TI_UINAVIGATIONWINDOW
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN

ios/Classes/BottomSheetViewController.m

@@ -5,7 +5,7 @@
 //  Created by Phineas.Huang on 2020/5/29.
 //  Copyright © 2020 Garmin. All rights reserved.
 //
-
+#define USE_TI_UINAVIGATIONWINDOW
 #import "BottomSheetViewController.h"
 #import "TiBottomsheetcontrollerProxy.h"
 

ios/Classes/TiBottomsheetcontrollerModule.h

@@ -4,7 +4,9 @@
  * Created by Your Name
  * Copyright (c) 2021 Your Company. All rights reserved.
  */
-
+#define USE_TI_UINAVIGATIONWINDOW
+#define USE_TI_UISCROLLVIEW // Enable access to the core class
+#define USE_TI_UITABLEVIEW // Enable access to the core class
 #import "TiModule.h"
 #import <TitaniumKit/TiApp.h>
 

ios/Classes/TiBottomsheetcontrollerProxy.h

@@ -7,8 +7,7 @@
  * WARNING: This is generated code. Modify at your own risk and without support.
  */
 #define USE_TI_UINAVIGATIONWINDOW
-#define USE_TI_UISCROLLVIEW // Enable access to the core class
-#define USE_TI_UITABLEVIEW // Enable access to the core class
+
 
 #import <TitaniumKit/TiViewController.h>
 #import <TitaniumKit/TiViewProxy.h>
@@ -17,10 +16,7 @@
 #import "TiUINavigationWindowProxy.h"
 #import "TiUINavigationWindowInternal.h"
 #import "TiWindowProxy+Addons.h"
-#import "TiUIScrollViewProxy.h"
-#import "TiUITableViewProxy.h"
-#import "TiUIScrollView.h"
-#import "TiUITableView.h"
+
 #import <TitaniumKit/TiViewTemplate.h>
 #import "BottomSheetViewController.h"
 
@@ -32,6 +28,7 @@
   UIEdgeInsets insets;
   UIView *containerView;
   UIView *contentViewOfSheet;
+  UIViewController *childController;
   UIScrollView *myScrollView;
   BOOL nonSystemSheetShouldScroll;
   BOOL nonSystemSheetAutomaticStartPositionFromContentViewHeight;

ios/Classes/TiBottomsheetcontrollerProxy.m

@@ -8,6 +8,7 @@
  *
  *
  */
+#define USE_TI_UINAVIGATIONWINDOW
 
 #import "TiBottomsheetcontrollerProxy.h"
 #import <TitaniumKit/TiApp.h>
@@ -17,7 +18,6 @@
 #import "TiBottomsheetcontrollerModule.h"
 #import <objc/runtime.h>
 
-
 @implementation TiBottomsheetcontrollerProxy
 
 #pragma mark Setup
@@ -607,7 +607,7 @@ - (void)initAndShowSheetController
           }
       }
 
-
+      /*
     if (nonSystemSheetShouldScroll == YES && defaultsToNonSystemSheet == YES){
         if ([contentViewProxy.view isKindOfClass:[TiUITableView class]] || [contentViewProxy.view isKindOfClass:[TiUIScrollViewImpl class]]) {
 
@@ -684,7 +684,9 @@ - (void)initAndShowSheetController
     else {
         scrollableContentHeight = 0;
     }
-
+       */
+      scrollableContentHeight = 0;
+
     if (closeButtonProxy){
       [closeButtonProxy windowWillOpen];
       [closeButtonProxy reposition];
@@ -737,16 +739,16 @@ - (CGSize)contentSize:(TiViewProxy *)thisProxy
 
 - (void)updateContentSize
 {
-    TiThreadPerformOnMainThread(
-        ^{
+   // TiThreadPerformOnMainThread(
+   //     ^{
             CGSize newSize = [self contentSize:contentViewProxy];
 
             if (defaultsToNonSystemSheet == NO){
                  [[self viewController] setPreferredContentSize:newSize];
             }
             [contentViewProxy reposition];
-        },
-        NO);
+      //  },
+      //  NO);
 }
 
 

ios/manifest

@@ -2,10 +2,10 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.0.7.
+version: 1.0.9
 apiversion: 2
-architectures: arm64 x86_64
-mac: true 
+architectures:arm64 x86_64
+mac: false 
 description: ti.bottomsheetcontroller
 author: Marc Bender
 license: free for everyone, no license (code partly taken from Titanium SDK)
@@ -16,4 +16,4 @@ name: ti.bottomsheetcontroller
 moduleid: ti.bottomsheetcontroller
 guid: 09a963f0-c30f-40eb-957a-1ca6851c53fb
 platform: iphone
-minsdk: 10.0.0 
+minsdk: 9.3.1 

ios/ti.bottomsheetcontroller.xcodeproj/project.pbxproj

@@ -239,6 +239,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DRIVERKIT_DEPLOYMENT_TARGET = 19.0;
 				DSTROOT = /tmp/TiBottomSheetController.dst;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -268,7 +269,7 @@
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				RUN_CLANG_STATIC_ANALYZER = NO;
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2,6";
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 				WARNING_CFLAGS = "-Wno-arc-performSelector-leaks";
 			};
@@ -281,6 +282,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				DEPLOYMENT_POSTPROCESSING = YES;
+				DRIVERKIT_DEPLOYMENT_TARGET = 19.0;
 				DSTROOT = /tmp/TiBottomSheetController.dst;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_MODEL_TUNING = G5;
@@ -308,7 +310,7 @@
 				PRODUCT_NAME = ti.bottomsheetcontroller;
 				RUN_CLANG_STATIC_ANALYZER = NO;
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2,6";
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 				WARNING_CFLAGS = "-Wno-arc-performSelector-leaks";
 			};
@@ -374,7 +376,7 @@
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MACOSX_DEPLOYMENT_TARGET = 11.5;
+				MACOSX_DEPLOYMENT_TARGET = 11.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DDEBUG",
@@ -386,7 +388,7 @@
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				RUN_CLANG_STATIC_ANALYZER = NO;
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2,6";
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
@@ -449,13 +451,13 @@
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MACOSX_DEPLOYMENT_TARGET = 11.5;
+				MACOSX_DEPLOYMENT_TARGET = 11.2;
 				OTHER_CFLAGS = "-DTI_POST_1_2";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = ti.bottomsheetcontroller;
 				RUN_CLANG_STATIC_ANALYZER = NO;
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2,6";
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;