From a78eda88a8e65bb566912effca7f7afb78f84f40 Mon Sep 17 00:00:00 2001 From: Bilal Date: Sat, 19 Oct 2024 11:29:23 +0530 Subject: [PATCH] - Release build 16.5 AppStore --- Podfile | 4 +- WOKA.xcodeproj/project.pbxproj | 115 ++++++------ .../xcshareddata/xcschemes/WOKA.xcscheme | 2 +- WOKA/Games/ViewModel/GamesListVM.swift | 4 + WOKA/Info.plist | 8 +- WOKA/Main/Delegate/AppDelegate.swift | 164 ++++++++---------- WOKA/Main/JWPlayerManager.swift | 5 +- .../Base.lproj/Main.storyboard | 2 +- WOKA/Theme/Base.lproj/Theme.storyboard | 19 +- WOKA/Theme/Controller/PlayerVC.swift | 38 ++-- 10 files changed, 189 insertions(+), 172 deletions(-) diff --git a/Podfile b/Podfile index 275312d..19eb559 100644 --- a/Podfile +++ b/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -platform :ios, '14.0' +platform :ios, '13.0' target 'WOKA' do # Comment the next line if you don't want to use dynamic frameworks @@ -20,7 +20,7 @@ target 'WOKA' do pod 'Google-Mobile-Ads-SDK' #JwPlayer - pod 'JWPlayerKit' , '~> 4.19.2' +# pod 'JWPlayerKit' # Bottom line is for removing IPHONEOS_DEPLOYMENT_TARGET post_install do |installer| diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj index 5e29a1a..426a0d1 100644 --- a/WOKA.xcodeproj/project.pbxproj +++ b/WOKA.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 4469E533EC95AC428FE50FB2 /* Pods_WOKA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B045136DB6D1DB0D38BD128 /* Pods_WOKA.framework */; }; 5201D4292C7F22E7008E3211 /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5201D4282C7F22E7008E3211 /* NetworkMonitor.swift */; }; 5202AAFE2BDF90590043B7BD /* TextFieldImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5202AAFD2BDF90590043B7BD /* TextFieldImage.swift */; }; 5202AB012BDFA7900043B7BD /* EmailValidation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5202AB002BDFA7900043B7BD /* EmailValidation.swift */; }; @@ -264,6 +263,7 @@ 52FDBA7B2BFF2712009D7AC7 /* AuthFuncTimeHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52FDBA7A2BFF2712009D7AC7 /* AuthFuncTimeHandling.swift */; }; 52FDBA7D2BFF481A009D7AC7 /* ThemeOneVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52FDBA7C2BFF481A009D7AC7 /* ThemeOneVM.swift */; }; 52FDDAB52BF34DC300E037C1 /* YesNoAlertVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52FDDAB42BF34DC300E037C1 /* YesNoAlertVC.swift */; }; + 86DB03DFCB95714DEBED5561 /* Pods_WOKA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41B6AC3F9DFA24D9A4E8A9DC /* Pods_WOKA.framework */; }; 9C007F202C255DF200F798C2 /* EpisodeListingDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C007F1F2C255DF200F798C2 /* EpisodeListingDM.swift */; }; 9C007F232C25603800F798C2 /* WebSeriesEpisodeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C007F212C25603800F798C2 /* WebSeriesEpisodeCell.swift */; }; 9C007F242C25603800F798C2 /* WebSeriesEpisodeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9C007F222C25603800F798C2 /* WebSeriesEpisodeCell.xib */; }; @@ -368,6 +368,7 @@ 9CDB8C132C9D5B2000C887B2 /* OnBoardVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CDB8C122C9D5B1F00C887B2 /* OnBoardVM.swift */; }; 9CDC343C2BDBBC6B00093089 /* SelectAgeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CDC343B2BDBBC6B00093089 /* SelectAgeVC.swift */; }; 9CDCE1452BDB9B9A003FEF11 /* OnBoardMainSound.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 9CDCE1442BDB9B9A003FEF11 /* OnBoardMainSound.m4a */; }; + 9CE1C3A22CC2ED330046042C /* JWPlayerKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9CE1C3A12CC2ED330046042C /* JWPlayerKit */; }; 9CE306B22C9961E0008EF78B /* WOKA.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9CE306B02C9961E0008EF78B /* WOKA.xcdatamodeld */; }; 9CF6980B2C89A324006007EF /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 9CF6980A2C89A324006007EF /* Lottie */; }; 9CF6980F2C8AFFBF006007EF /* SDWebImage in Frameworks */ = {isa = PBXBuildFile; productRef = 9CF6980E2C8AFFBF006007EF /* SDWebImage */; }; @@ -412,8 +413,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2081C2B186A876137E7DBDF2 /* Pods-WOKA.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WOKA.release.xcconfig"; path = "Target Support Files/Pods-WOKA/Pods-WOKA.release.xcconfig"; sourceTree = ""; }; - 3B045136DB6D1DB0D38BD128 /* Pods_WOKA.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WOKA.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 091576079F6473EF715CFB36 /* Pods-WOKA.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WOKA.debug.xcconfig"; path = "Target Support Files/Pods-WOKA/Pods-WOKA.debug.xcconfig"; sourceTree = ""; }; + 41B6AC3F9DFA24D9A4E8A9DC /* Pods_WOKA.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WOKA.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5201D4282C7F22E7008E3211 /* NetworkMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkMonitor.swift; sourceTree = ""; }; 5202AAFD2BDF90590043B7BD /* TextFieldImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldImage.swift; sourceTree = ""; }; 5202AB002BDFA7900043B7BD /* EmailValidation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailValidation.swift; sourceTree = ""; }; @@ -759,7 +760,6 @@ 9CBE1B3C2C0F37B200CA6E61 /* DropDown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DropDown.h; sourceTree = ""; }; 9CC0D2F92C6F33BE0019DF73 /* AuthFuncUserVideoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthFuncUserVideoView.swift; sourceTree = ""; }; 9CC0D2FB2C6F5CAE0019DF73 /* PlayerVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerVM.swift; sourceTree = ""; }; - 9CC856602CC2B6BA00444C5B /* WOKA.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = WOKA.xcodeproj; sourceTree = ""; }; 9CDAEB022C53B97B00890C47 /* VersionTexts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionTexts.swift; sourceTree = ""; }; 9CDAEB042C53DB2900890C47 /* ProductDetailsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDetailsVC.swift; sourceTree = ""; }; 9CDAEB062C53E42900890C47 /* ProductDetailsVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDetailsVM.swift; sourceTree = ""; }; @@ -776,7 +776,7 @@ 9CDCE1422BDB94BD003FEF11 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = ""; }; 9CDCE1442BDB9B9A003FEF11 /* OnBoardMainSound.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = OnBoardMainSound.m4a; sourceTree = ""; }; 9CE306B12C9961E0008EF78B /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = ""; }; - C83A2BA3B8F575DC890CC5DD /* Pods-WOKA.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WOKA.debug.xcconfig"; path = "Target Support Files/Pods-WOKA/Pods-WOKA.debug.xcconfig"; sourceTree = ""; }; + FEBBF62FD239F4DF9494EE44 /* Pods-WOKA.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WOKA.release.xcconfig"; path = "Target Support Files/Pods-WOKA/Pods-WOKA.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -784,15 +784,16 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4469E533EC95AC428FE50FB2 /* Pods_WOKA.framework in Frameworks */, 52C83E3F2C493FD700F27563 /* RSKPlaceholderTextView in Frameworks */, 9CF6980B2C89A324006007EF /* Lottie in Frameworks */, 9CBA530C2C89A2680046735C /* FirebaseAnalytics in Frameworks */, + 9CE1C3A22CC2ED330046042C /* JWPlayerKit in Frameworks */, 9CF6980F2C8AFFBF006007EF /* SDWebImage in Frameworks */, 9CBA530E2C89A2680046735C /* FirebaseCrashlytics in Frameworks */, 528F26F02C6B7BD1003E4D99 /* OneSignalFramework in Frameworks */, 528F26F22C6B7BD1003E4D99 /* OneSignalInAppMessages in Frameworks */, 9CBA53102C89A2680046735C /* FirebasePerformance in Frameworks */, + 86DB03DFCB95714DEBED5561 /* Pods_WOKA.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -826,7 +827,7 @@ children = ( 52F477A42C492ED900F79200 /* JWPlayerKit.xcframework */, 525846502C491A9E004F074B /* speedchecker-sdk-ios-master */, - 3B045136DB6D1DB0D38BD128 /* Pods_WOKA.framework */, + 41B6AC3F9DFA24D9A4E8A9DC /* Pods_WOKA.framework */, ); name = Frameworks; sourceTree = ""; @@ -834,8 +835,8 @@ 23C3A42E953212A2665EE308 /* Pods */ = { isa = PBXGroup; children = ( - C83A2BA3B8F575DC890CC5DD /* Pods-WOKA.debug.xcconfig */, - 2081C2B186A876137E7DBDF2 /* Pods-WOKA.release.xcconfig */, + 091576079F6473EF715CFB36 /* Pods-WOKA.debug.xcconfig */, + FEBBF62FD239F4DF9494EE44 /* Pods-WOKA.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -937,7 +938,6 @@ 523ED2512BDA2BC700CFED02 = { isa = PBXGroup; children = ( - 9CC856602CC2B6BA00444C5B /* WOKA.xcodeproj */, 523ED25C2BDA2BC700CFED02 /* WOKA */, 523ED2732BDA2BC900CFED02 /* WOKATests */, 523ED27D2BDA2BC900CFED02 /* WOKAUITests */, @@ -2064,13 +2064,13 @@ isa = PBXNativeTarget; buildConfigurationList = 523ED2842BDA2BC900CFED02 /* Build configuration list for PBXNativeTarget "WOKA" */; buildPhases = ( - 85374DA1EC2E3F7D8F24983D /* [CP] Check Pods Manifest.lock */, + BCD8BF168170D47923FE5BF4 /* [CP] Check Pods Manifest.lock */, 523ED2562BDA2BC700CFED02 /* Sources */, 523ED2572BDA2BC700CFED02 /* Frameworks */, 523ED2582BDA2BC700CFED02 /* Resources */, - 90182DDCD7EAE5F6DA5B4DFB /* [CP] Embed Pods Frameworks */, 528F26E72C6B7B30003E4D99 /* Embed Foundation Extensions */, - 7E437097FFA5CD78E3590A44 /* [CP] Copy Pods Resources */, + 248C6D3D9D9284BB206C9EED /* [CP] Embed Pods Frameworks */, + 1A4357B401EFE88B33096EB1 /* [CP] Copy Pods Resources */, 9CF6980C2C8AE33E006007EF /* ShellScript */, ); buildRules = ( @@ -2088,6 +2088,7 @@ 9CBA530F2C89A2680046735C /* FirebasePerformance */, 9CF6980A2C89A324006007EF /* Lottie */, 9CF6980E2C8AFFBF006007EF /* SDWebImage */, + 9CE1C3A12CC2ED330046042C /* JWPlayerKit */, ); productName = WOKA; productReference = 523ED25A2BDA2BC700CFED02 /* WOKA.app */; @@ -2191,6 +2192,7 @@ 9CBA530A2C89A2680046735C /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, 9CF698092C89A324006007EF /* XCRemoteSwiftPackageReference "lottie-spm" */, 9CF6980D2C8AFFBF006007EF /* XCRemoteSwiftPackageReference "SDWebImage" */, + 9CE1C3A02CC2ED330046042C /* XCRemoteSwiftPackageReference "JWPlayerKit-package" */, ); productRefGroup = 523ED25B2BDA2BC700CFED02 /* Products */; projectDirPath = ""; @@ -2303,7 +2305,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 7E437097FFA5CD78E3590A44 /* [CP] Copy Pods Resources */ = { + 1A4357B401EFE88B33096EB1 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2320,29 +2322,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WOKA/Pods-WOKA-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 85374DA1EC2E3F7D8F24983D /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-WOKA-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 90182DDCD7EAE5F6DA5B4DFB /* [CP] Embed Pods Frameworks */ = { + 248C6D3D9D9284BB206C9EED /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2383,6 +2363,28 @@ shellPath = /bin/sh; shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\n"; }; + BCD8BF168170D47923FE5BF4 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-WOKA-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -2896,14 +2898,14 @@ }; 523ED2852BDA2BC900CFED02 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C83A2BA3B8F575DC890CC5DD /* Pods-WOKA.debug.xcconfig */; + baseConfigurationReference = 091576079F6473EF715CFB36 /* Pods-WOKA.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = WOKA/WOKA.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 13; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 4S9A74ZB6H; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -2912,7 +2914,6 @@ INFOPLIST_KEY_CFBundleDisplayName = WOKA; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "Give Permissions for Karaoke"; - INFOPLIST_KEY_NSUserTrackingUsageDescription = "This identifier will be used to deliver personalized ads to you."; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -2920,7 +2921,7 @@ INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UIUserInterfaceStyle = Light; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2940,14 +2941,14 @@ }; 523ED2862BDA2BC900CFED02 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2081C2B186A876137E7DBDF2 /* Pods-WOKA.release.xcconfig */; + baseConfigurationReference = FEBBF62FD239F4DF9494EE44 /* Pods-WOKA.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = WOKA/WOKA.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 13; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 4S9A74ZB6H; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -2956,7 +2957,6 @@ INFOPLIST_KEY_CFBundleDisplayName = WOKA; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "Give Permissions for Karaoke"; - INFOPLIST_KEY_NSUserTrackingUsageDescription = "This identifier will be used to deliver personalized ads to you."; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -2964,7 +2964,7 @@ INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UIUserInterfaceStyle = Light; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2992,7 +2992,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 4S9A74ZB6H; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.app.woka.WOKATests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3012,7 +3012,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 4S9A74ZB6H; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.app.woka.WOKATests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3032,6 +3032,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 4S9A74ZB6H; GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.app.woka.WOKAUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3050,6 +3051,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 4S9A74ZB6H; GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.app.woka.WOKAUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3066,14 +3068,14 @@ CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 4S9A74ZB6H; ENABLE_USER_SCRIPT_SANDBOXING = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = OneSignalNotificationServiceExtension; INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3105,7 +3107,7 @@ INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = OneSignalNotificationServiceExtension; INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3200,6 +3202,14 @@ minimumVersion = 11.1.0; }; }; + 9CE1C3A02CC2ED330046042C /* XCRemoteSwiftPackageReference "JWPlayerKit-package" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/jwplayer/JWPlayerKit-package.git"; + requirement = { + kind = exactVersion; + version = 4.19.1; + }; + }; 9CF698092C89A324006007EF /* XCRemoteSwiftPackageReference "lottie-spm" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/airbnb/lottie-spm.git"; @@ -3254,6 +3264,11 @@ package = 9CBA530A2C89A2680046735C /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebasePerformance; }; + 9CE1C3A12CC2ED330046042C /* JWPlayerKit */ = { + isa = XCSwiftPackageProductDependency; + package = 9CE1C3A02CC2ED330046042C /* XCRemoteSwiftPackageReference "JWPlayerKit-package" */; + productName = JWPlayerKit; + }; 9CF6980A2C89A324006007EF /* Lottie */ = { isa = XCSwiftPackageProductDependency; package = 9CF698092C89A324006007EF /* XCRemoteSwiftPackageReference "lottie-spm" */; diff --git a/WOKA.xcodeproj/xcshareddata/xcschemes/WOKA.xcscheme b/WOKA.xcodeproj/xcshareddata/xcschemes/WOKA.xcscheme index 7cc6358..2ecdd02 100644 --- a/WOKA.xcodeproj/xcshareddata/xcschemes/WOKA.xcscheme +++ b/WOKA.xcodeproj/xcshareddata/xcschemes/WOKA.xcscheme @@ -55,7 +55,7 @@ - BGTaskSchedulerPermittedIdentifiers - - com.woka.refresh - API_KEY_ID $(API_KEY_ID) API_KEY_PASS $(API_KEY_PASS) + BGTaskSchedulerPermittedIdentifiers + + com.woka.refresh + GADApplicationIdentifier ca-app-pub-5699008063638916~6654980943 NSUserNotificationsUsageDescription diff --git a/WOKA/Main/Delegate/AppDelegate.swift b/WOKA/Main/Delegate/AppDelegate.swift index c5b82ff..528a0e3 100644 --- a/WOKA/Main/Delegate/AppDelegate.swift +++ b/WOKA/Main/Delegate/AppDelegate.swift @@ -21,8 +21,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? var deviceOrientation = UIInterfaceOrientationMask.portrait - let taskID = "com.woka.refresh" - +// let taskID = "com.woka.refresh" func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask { return deviceOrientation @@ -83,33 +82,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // scheduleTasks() return true } - -// func scheduleTasks(){ -// BGTaskScheduler.shared.getPendingTaskRequests { requests in -// print("Request :- ", requests.count) -// -// guard requests.isEmpty else{ -// return -// } -// -// // submit task to be scheduled -// do{ -// let newTask = BGAppRefreshTaskRequest(identifier: self.taskID) -// // Set when you want the task to run (optional) -// newTask.earliestBeginDate = Date(timeIntervalSinceNow: 15 * 60) // minutes * seconds ie. 1 min * 60 second, it ill trigger in 1 min. -// print("Task Scheduled.") -// try BGTaskScheduler.shared.submit(newTask) -// } catch{ -// print("Issue with task") -// } -// } -// -// } -// -// func handleTask(task : BGAppRefreshTask){ -// self.localNoti(body: "sad") -// task.setTaskCompleted(success: true) -// } // MARK: UISceneSession Lifecycle @@ -125,74 +97,74 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // Use this method to release any resources that were specific to the discarded scenes, as they will not return. } - func scheduleAppRefresh() { - let request = BGAppRefreshTaskRequest(identifier: taskID) - - // Set when you want the task to run (optional) - request.earliestBeginDate = Date(timeIntervalSinceNow: 2 * 60) // 15 minutes from now - - do { - try BGTaskScheduler.shared.submit(request) - print("Could not schedule app refresh scheduled") - } catch { - print("Could not schedule app refresh: \(error)") - } - } +// func scheduleAppRefresh() { +// let request = BGAppRefreshTaskRequest(identifier: taskID) +// +// // Set when you want the task to run (optional) +// request.earliestBeginDate = Date(timeIntervalSinceNow: 2 * 60) // 15 minutes from now +// +// do { +// try BGTaskScheduler.shared.submit(request) +// print("Could not schedule app refresh scheduled") +// } catch { +// print("Could not schedule app refresh: \(error)") +// } +// } - func handleAppRefresh(task: BGAppRefreshTask) { - // Schedule a new refresh task - scheduleAppRefresh() - - // Perform the background task (e.g., fetching data from a server) - let operationQueue = OperationQueue() - operationQueue.maxConcurrentOperationCount = 1 - - let fetchOperation = BlockOperation { - // Perform your background fetch task here (e.g., network call) - self.performBackgroundFetch { newData in - task.setTaskCompleted(success: newData) - } - } - - task.expirationHandler = { - // Cancel the operation if it takes too long - operationQueue.cancelAllOperations() - } - - operationQueue.addOperation(fetchOperation) - } - - func performBackgroundFetch(completion: @escaping (Bool) -> Void) { - // Simulate a network call - DispatchQueue.global().asyncAfter(deadline: .now() + 5) { - // Perform your background work here - let newDataFetched = true // Assume data was fetched - completion(newDataFetched) - print("sdaasdasdasdas") - self.localNoti(body: newDataFetched ? "true" : "false") - } - } - - func localNoti(body : String? = nil){ - //creating the notification content - let content = UNMutableNotificationContent() - - //adding title, subtitle, body and badge - content.title = "Your are out of Geofence, Battery testing" - content.subtitle = "" - content.body = body == nil ? "Please contact your Careperson" : body! - content.badge = 1 - - //getting the notification trigger - //it will be called after 5 seconds - let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false) - - //getting the notification request - let request = UNNotificationRequest(identifier: "SimplifiedIOSNotification", content: content, trigger: trigger) - - //adding the notification to notification center - UNUserNotificationCenter.current().add(request, withCompletionHandler: nil) - } +// func handleAppRefresh(task: BGAppRefreshTask) { +// // Schedule a new refresh task +// scheduleAppRefresh() +// +// // Perform the background task (e.g., fetching data from a server) +// let operationQueue = OperationQueue() +// operationQueue.maxConcurrentOperationCount = 1 +// +// let fetchOperation = BlockOperation { +// // Perform your background fetch task here (e.g., network call) +// self.performBackgroundFetch { newData in +// task.setTaskCompleted(success: newData) +// } +// } +// +// task.expirationHandler = { +// // Cancel the operation if it takes too long +// operationQueue.cancelAllOperations() +// } +// +// operationQueue.addOperation(fetchOperation) +// } +// +// func performBackgroundFetch(completion: @escaping (Bool) -> Void) { +// // Simulate a network call +// DispatchQueue.global().asyncAfter(deadline: .now() + 5) { +// // Perform your background work here +// let newDataFetched = true // Assume data was fetched +// completion(newDataFetched) +// print("sdaasdasdasdas") +// self.localNoti(body: newDataFetched ? "true" : "false") +// } +// } +// +// func localNoti(body : String? = nil){ +// //creating the notification content +// let content = UNMutableNotificationContent() +// +// //adding title, subtitle, body and badge +// content.title = "Your are out of Geofence, Battery testing" +// content.subtitle = "" +// content.body = body == nil ? "Please contact your Careperson" : body! +// content.badge = 1 +// +// //getting the notification trigger +// //it will be called after 5 seconds +// let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false) +// +// //getting the notification request +// let request = UNNotificationRequest(identifier: "SimplifiedIOSNotification", content: content, trigger: trigger) +// +// //adding the notification to notification center +// UNUserNotificationCenter.current().add(request, withCompletionHandler: nil) +// } } extension AppDelegate { diff --git a/WOKA/Main/JWPlayerManager.swift b/WOKA/Main/JWPlayerManager.swift index 3cf924d..ca4d1cd 100644 --- a/WOKA/Main/JWPlayerManager.swift +++ b/WOKA/Main/JWPlayerManager.swift @@ -161,7 +161,8 @@ class JWPlayerManager { .build() } -// DispatchQueue.main.async { + guard let finalConfig else{return} + DispatchQueue.main.async { playerVC.videoIndex = startIndex playerVC.contentType = contentType playerVC.config = finalConfig @@ -180,7 +181,7 @@ class JWPlayerManager { // print("FullScreen") // } } -// } + } } catch { print("Error creating JWPlayer configuration: \(error)") Utilities.dismissProgressHUD() diff --git a/WOKA/OnBoarding Module/Base.lproj/Main.storyboard b/WOKA/OnBoarding Module/Base.lproj/Main.storyboard index 5a39e6c..1bd9192 100644 --- a/WOKA/OnBoarding Module/Base.lproj/Main.storyboard +++ b/WOKA/OnBoarding Module/Base.lproj/Main.storyboard @@ -67,7 +67,7 @@ - +