diff --git a/MemLeakTest/Leaktest.dproj b/MemLeakTest/Leaktest.dproj index b9bfd6d..f7b3224 100644 --- a/MemLeakTest/Leaktest.dproj +++ b/MemLeakTest/Leaktest.dproj @@ -1,13 +1,13 @@  {1D6AE582-F517-4A47-80BD-BE11C9D20595} - 19.0 + 20.1 FMX Leaktest.dpr True Debug Win32 - 33817 + 558097 Application @@ -28,8 +28,18 @@ Base true - - true + + true + Base + true + + + true + Base + true + + + true Base true @@ -38,6 +48,11 @@ Base true + + true + Base + true + true Base @@ -49,6 +64,12 @@ true true + + true + Cfg_1 + true + true + true Base @@ -60,6 +81,12 @@ true true + + true + Cfg_2 + true + true + ..\Lib\Classes;..\Lib\Classes\Common;..\Lib\Classes\Common\Detector;..\Lib\Classes\Common\ReedSolomon;..\Lib\Classes\Filtering;..\Lib\Classes\1D Barcodes;..\Lib\Classes\2D Barcodes;..\Lib\Classes\2D Barcodes\Decoder;..\Lib\Classes\2D Barcodes\Detector;$(DCC_UnitSearchPath) true @@ -104,6 +131,7 @@ $(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png $(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png $(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= @@ -128,133 +156,71 @@ $(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png $(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png $(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_640x1136.png $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_50x50.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2008.png - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1004.png iPhoneAndiPad - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_114x114.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1242x2208.png - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_144x144.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_750x1334.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_320x480.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_640x960.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_87x87.png $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_57x57.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1496.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_100x100.png Debug $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_72x72.png DBXSqliteDriver;bindcompdbx;IndyIPCommon;RESTComponents;DBXInterBaseDriver;IndyIPServer;IndySystem;tethering;fmxFireDAC;FireDAC;bindcompfmx;FireDACSqliteDriver;FMXTee;soaprtl;DbxCommonDriver;FmxTeeUI;FireDACIBDriver;fmx;xmlrtl;soapmidas;rtl;DbxClientDriver;CustomIPTransport;dbexpress;IndyCore;bindcomp;dsnap;FireDACCommon;IndyIPClient;RESTBackendComponents;dbxcds;soapserver;bindengine;CloudService;dsnapxml;dbrtl;IndyProtocols;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage) - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png $(MSBuildProjectName) - $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_58x58.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SettingIcon_29x29.png true $(BDS)\bin\Artwork\iOS\iPad\FM_SettingIcon_58x58.png $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_180x180.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x748.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_29x29.png - CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSCameraUsageDescription=The reason for accessing the camera;CFBundleShortVersionString=1.0.0;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSFaceIDUsageDescription=The reason for accessing the face id;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1125x2436.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2436x1125.png + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSCameraUsageDescription=The reason for accessing the camera;CFBundleShortVersionString=1.0.0;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSFaceIDUsageDescription=The reason for accessing the face id;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_120x120.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_828x1792.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1136x640.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1242x2688.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1334x750.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1792x828.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2688x1242.png $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_167x167.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1668x2224.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1668x2388.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_2048x2732.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2224x1668.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2388x1668.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2732x2048.png $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2x.png $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImageDark_2x.png $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_3x.png $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImageDark_3x.png $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImage_2x.png $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageDark_2x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_60x60.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_87x87.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_58x58.png + $(BDS)\bin\Artwork\iOS\iPad\FM_NotificationIcon_40x40.png - - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2208x1242.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_50x50.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_640x1136.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1004.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2008.png + + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSCameraUsageDescription=The reason for accessing the camera;CFBundleShortVersionString=1.0.0;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSFaceIDUsageDescription=The reason for accessing the face id;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers iPhoneAndiPad - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_114x114.png + true + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_750x1334.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1242x2208.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_320x480.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_640x960.png - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_144x144.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_87x87.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_57x57.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1496.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_100x100.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_72x72.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png - DBXSqliteDriver;bindcompdbx;IndyIPCommon;RESTComponents;DBXInterBaseDriver;IndyIPServer;IndySystem;tethering;fmxFireDAC;FireDAC;bindcompfmx;FireDACSqliteDriver;FMXTee;soaprtl;DbxCommonDriver;FmxTeeUI;FireDACIBDriver;fmx;xmlrtl;soapmidas;rtl;DbxClientDriver;CustomIPTransport;dbexpress;IndyCore;bindcomp;dsnap;FireDACCommon;IndyIPClient;RESTBackendComponents;dbxcds;soapserver;bindengine;CloudService;dsnapxml;dbrtl;IndyProtocols;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage) - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_180x180.png + DBXSqliteDriver;bindcompdbx;IndyIPCommon;RESTComponents;DBXInterBaseDriver;IndyIPServer;IndySystem;tethering;fmxFireDAC;FireDAC;bindcompfmx;FireDACSqliteDriver;FMXTee;soaprtl;DbxCommonDriver;FmxTeeUI;FireDACIBDriver;fmx;xmlrtl;soapmidas;rtl;DbxClientDriver;CustomIPTransport;dbexpress;IndyCore;bindcomp;dsnap;FireDACCommon;IndyIPClient;RESTBackendComponents;dbxcds;soapserver;bindengine;CloudService;dsnapxml;dbrtl;IndyProtocols;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage);$(DCC_UsePackage) $(BDS)\bin\Artwork\iOS\iPad\FM_SettingIcon_58x58.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SettingIcon_29x29.png - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png - true - $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_58x58.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x748.png $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_29x29.png - CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSCameraUsageDescription=The reason for accessing the camera;CFBundleShortVersionString=1.0.0;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSFaceIDUsageDescription=The reason for accessing the face id;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1125x2436.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2436x1125.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_180x180.png $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_120x120.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_828x1792.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1136x640.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1242x2688.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1334x750.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_1792x828.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2688x1242.png $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_167x167.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1668x2224.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1668x2388.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_2048x2732.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2224x1668.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2388x1668.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2732x2048.png $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2x.png $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImageDark_2x.png $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_3x.png $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImageDark_3x.png $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImage_2x.png $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageDark_2x.png - 10.0 + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_58x58.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_87x87.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_60x60.png + $(BDS)\bin\Artwork\iOS\iPad\FM_NotificationIcon_40x40.png + + + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + Debug + true + + + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + Debug + true $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png @@ -266,6 +232,16 @@ Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName) + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + $(BDS)\bin\default_app.manifest + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + DEBUG;$(DCC_Define) true @@ -283,6 +259,9 @@ true false + + PerMonitorV2 + false RELEASE;$(DCC_Define) @@ -293,6 +272,9 @@ true PerMonitor + + PerMonitorV2 + MainSource @@ -301,10 +283,6 @@
Form2
fmx - - Cfg_2 - Base - Base @@ -312,6 +290,10 @@ Cfg_1 Base + + Cfg_2 + Base + Delphi.Personality.12 @@ -329,44 +311,26 @@ JVCL Plugin Components - - - - true - - - - - true - - + + true - - - .\ + + true - + + true - - - Leaktest.exe - true - - - - - true - - + + 1 @@ -379,14 +343,14 @@ 0 - + classes - 1 + 64 classes - 1 + 64 @@ -431,7 +395,6 @@ 1 - library\lib\armeabi-v7a @@ -458,6 +421,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -478,6 +451,66 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -488,6 +521,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -508,6 +551,16 @@ 1 + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + res\drawable-ldpi @@ -648,6 +701,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -671,6 +774,11 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 @@ -684,7 +792,7 @@ 1 .dylib - + 1 .dylib @@ -698,6 +806,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .dll;.bpl @@ -712,7 +825,7 @@ 1 .dylib - + 1 .dylib @@ -726,6 +839,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .bpl @@ -744,7 +862,7 @@ 0 - + 0 @@ -755,355 +873,322 @@ Contents\Resources\StartUp\ 0 + + Contents\Resources\StartUp\ + 0 + 0 - - - 1 - - + + 1 - + 1 - - - 1 - - + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - + + + ..\ 1 - + + ..\ 1 - + + ..\ 1 - - + + + Contents 1 - + + Contents 1 - + + Contents 1 - - + + + Contents\Resources 1 - + + Contents\Resources 1 - + + Contents\Resources 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - + + library\lib\arm64-v8a 1 - - 1 1 - + 1 - - - - 1 - - + 1 - + + Contents\MacOS 1 - - - + + Contents\MacOS 1 - + + Contents\MacOS 1 - - 1 + + 0 - - - 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - - - 1 - - + + 1 - + 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\ 1 + ..\ 1 - + + ..\ 1 - + 1 1 - + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - 1 - + - 1 + ..\$(PROJECTNAME).launchscreen + 64 - - 1 + + ..\$(PROJECTNAME).launchscreen + 64 - + 1 1 - + 1 - - - 1 - - + + + Assets 1 - + + Assets 1 - - - 1 - - + + + Assets 1 - + + Assets 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 @@ -1112,7 +1197,7 @@ ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 @@ -1122,199 +1207,93 @@ ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - - 1 - - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - - - ..\ - 1 - - - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - ..\ - 1 - - - ..\ - 1 - - - - - Contents - 1 - - - Contents - 1 - - - - - Contents\Resources - 1 - - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - - 1 - - - Contents\MacOS - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets - 1 - - - Assets - 1 - - - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + - + + + - - - + + + True True True - True + True + False + False True + False 12 diff --git a/MemLeakTest/Leaktest.res b/MemLeakTest/Leaktest.res index cbd4e66..b89dd9e 100644 Binary files a/MemLeakTest/Leaktest.res and b/MemLeakTest/Leaktest.res differ diff --git a/UnitTest/dUnitXTest.dproj b/UnitTest/dUnitXTest.dproj index 9445f37..b635aac 100644 --- a/UnitTest/dUnitXTest.dproj +++ b/UnitTest/dUnitXTest.dproj @@ -1,11 +1,11 @@  {DABEF7D9-D889-4A40-A4B5-F386C8384304} - 19.0 + 20.1 DUnitXTest.dpr True Debug - Win32 + Win64 3 Console FMX @@ -28,8 +28,8 @@ Base true - - true + + true Base true @@ -38,6 +38,11 @@ Base true + + true + Base + true + true Base @@ -121,6 +126,7 @@ $(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png $(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png $(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= @@ -153,42 +159,47 @@ $(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png $(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png $(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png true - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png iPhoneAndiPad - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png Debug - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png $(MSBuildProjectName) $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_60x60.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_NotificationIcon_40x40.png - - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png - true - $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png - $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png - $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png + + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= iPhoneAndiPad + true $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png - CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png - $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_180x180.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImageDark_2x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_3x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImageDark_3x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_58x58.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_87x87.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_60x60.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_167x167.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImage_2x.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageDark_2x.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SettingIcon_58x58.png + $(BDS)\bin\Artwork\iOS\iPad\FM_NotificationIcon_40x40.png CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts @@ -199,6 +210,13 @@ FireDACASADriver;FireDACSqliteDriver;bindcompfmx;DBXSqliteDriver;FireDACPgDriver;FireDACODBCDriver;RESTBackendComponents;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;FireDACCommon;bindcomp;inetdb;tethering;DBXInterBaseDriver;xmlrtl;DbxCommonDriver;IndyProtocols;dbxcds;DBXMySQLDriver;FireDACCommonDriver;bindcompdbx;soaprtl;bindengine;FMXTee;fmxFireDAC;CustomIPTransport;FireDAC;dsnap;IndyIPServer;fmxase;IndyCore;IndyIPCommon;CloudService;FireDACIBDriver;FmxTeeUI;inet;fmxobj;FireDACMySQLDriver;soapmidas;soapserver;inetdbxpress;dsnapxml;fmxdae;RESTComponents;dbexpress;IndyIPClient;$(DCC_UsePackage);$(DCC_UsePackage) true + + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts + Debug + true + FireDACASADriver;FireDACSqliteDriver;bindcompfmx;DBXSqliteDriver;FireDACPgDriver;FireDACODBCDriver;RESTBackendComponents;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;FireDACCommon;bindcomp;inetdb;tethering;DBXInterBaseDriver;xmlrtl;DbxCommonDriver;IndyProtocols;dbxcds;DBXMySQLDriver;FireDACCommonDriver;bindcompdbx;soaprtl;bindengine;FMXTee;fmxFireDAC;CustomIPTransport;FireDAC;dsnap;IndyIPServer;fmxase;IndyCore;IndyIPCommon;CloudService;FireDACIBDriver;FmxTeeUI;inet;fmxobj;FireDACMySQLDriver;soapmidas;soapserver;inetdbxpress;dsnapxml;fmxdae;RESTComponents;dbexpress;IndyIPClient;$(DCC_UsePackage);$(DCC_UsePackage);$(DCC_UsePackage) + true + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) 1033 @@ -246,10 +264,6 @@ MainSource - - Cfg_2 - Base - Base @@ -257,6 +271,10 @@ Cfg_1 Base + + Cfg_2 + Base + Delphi.Personality.12 @@ -271,66 +289,30 @@ Microsoft Office XP Sample Automation Server Wrapper Components - - - - true - - - - - DUnitXTest.exe - true - - - - - .\ - true - - - - - true - - - - - true - - - - - true - - + + + true - - - DUnitXTest.exe + + true - + + true - - - .\ - true - - - - - true - - + + + + + 1 @@ -339,14 +321,14 @@ 0 - + classes - 1 + 64 classes - 1 + 64 @@ -391,7 +373,6 @@ 1 - library\lib\armeabi-v7a @@ -418,6 +399,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -438,6 +429,66 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -448,6 +499,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -468,6 +529,16 @@ 1 + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + res\drawable-ldpi @@ -608,6 +679,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -628,6 +749,10 @@ 1 .framework + + 1 + .framework + 0 @@ -641,6 +766,10 @@ 1 .dylib + + 1 + .dylib + 0 .dll;.bpl @@ -655,7 +784,7 @@ 1 .dylib - + 1 .dylib @@ -667,6 +796,10 @@ 1 .dylib + + 1 + .dylib + 0 .bpl @@ -685,7 +818,7 @@ 0 - + 0 @@ -694,280 +827,231 @@ 0 + + 0 + 0 - - - 1 - - + + 1 - + 1 - - + + + + + + Contents\Resources 1 - + + Contents\Resources 1 - + + Contents\Resources 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - + + library\lib\arm64-v8a 1 - - 1 1 - - 1 - - - - + 1 - + 1 - + 1 - - - + 1 - + 1 - - 1 + + 0 - - - 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - - - 1 - - + + 1 - + 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + + + 1 1 - + 1 - - - 1 - - + + + Assets 1 - + + Assets 1 - - - 1 - - + + + Assets 1 - + + Assets 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 @@ -976,82 +1060,27 @@ ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - - - 1 - - - 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 @@ -1061,139 +1090,91 @@ ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - - - - - - 1 - - - 1 - - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - - - - Contents\Resources + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - - 1 - - - 1 - - - 1 - - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + - + + + - - - + + + False False False - False + False False + False True True diff --git a/UnitTest/dUnitXTest.res b/UnitTest/dUnitXTest.res index 8758bbb..427c4ee 100644 Binary files a/UnitTest/dUnitXTest.res and b/UnitTest/dUnitXTest.res differ diff --git a/demo/aTestApp/FmxTestApp.deployproj b/demo/aTestApp/FmxTestApp.deployproj index 622e80d..5b898e2 100644 --- a/demo/aTestApp/FmxTestApp.deployproj +++ b/demo/aTestApp/FmxTestApp.deployproj @@ -4,1164 +4,322 @@ 12 - 9CNAY1Q81V - 9CNAY1Q81V - + + + 00008030-001958DA1140802E + 75BFDCD9-EEE7-4C66-9D86-41C581DDF4C4 - - - FmxTestApp\ - FmxTestApp.exe - ProjectOutput - 0 - - - True - True - - - FmxTestApp\ - FmxTestApp.exe - ProjectOutput - 0 - - - True - True - - + - - - FmxTestApp\res\drawable-large\ - splash_image.png - Android_SplashImage640 - 1 - - - True - - - FmxTestApp\res\drawable-large\ - splash_image.png - Android_SplashImage640 - 1 - - - True - - - FmxTestApp\res\values\ - strings.xml - Android_Strings - 1 - - - True - - - FmxTestApp\res\drawable\ - splash_image_def.xml - AndroidSplashImageDef - 1 - - - True - - - FmxTestApp\res\values\ - colors.xml - Android_Colors - 1 - - - True - - - FmxTestApp\res\values\ - styles.xml - AndroidSplashStyles - 1 - - - True - - - FmxTestApp\res\drawable-hdpi\ - ic_launcher.png - Android_LauncherIcon72 - 1 - - - True - - - FmxTestApp\res\drawable-hdpi\ - ic_launcher.png - Android_LauncherIcon72 - 1 - - - True - - - FmxTestApp\res\drawable-mdpi\ - ic_launcher.png - Android_LauncherIcon48 - 1 - - - True - - - FmxTestApp\res\drawable-mdpi\ - ic_launcher.png - Android_LauncherIcon48 - 1 - - - True - - - FmxTestApp\res\values\ - strings.xml - Android_Strings - 1 - - - True - - - FmxTestApp\res\values-v21\ - styles.xml - AndroidSplashStylesV21 - 1 - - - True - - - FmxTestApp\res\drawable-xlarge\ - splash_image.png - Android_SplashImage960 - 1 - - - True - - - FmxTestApp\res\drawable-xlarge\ - splash_image.png - Android_SplashImage960 - 1 - - - True - - - FmxTestApp\res\drawable-xhdpi\ - ic_notification.png - Android_NotificationIcon48 - 1 - - - True - - - FmxTestApp\res\values-v21\ - styles.xml - AndroidSplashStylesV21 - 1 - - - True - - - FmxTestApp\res\drawable-xhdpi\ - ic_notification.png - Android_NotificationIcon48 - 1 - - - True - - - FmxTestApp\library\lib\armeabi\ - libFmxTestApp.so - AndroidLibnativeArmeabiFile - 1 - - - True - - - FmxTestApp\library\lib\armeabi\ - libFmxTestApp.so - AndroidLibnativeArmeabiFile - 1 - - - True - - - FmxTestApp\res\drawable-ldpi\ - ic_launcher.png - Android_LauncherIcon36 - 1 - - - True - - - FmxTestApp\classes\ - classes.dex - AndroidClassesDexFile - 1 - - - True - - - FmxTestApp\res\drawable-hdpi\ - ic_notification.png - Android_NotificationIcon36 - 1 - - - True - - - FmxTestApp\res\drawable-ldpi\ - ic_launcher.png - Android_LauncherIcon36 - 1 - - - True - - - FmxTestApp\res\drawable-hdpi\ - ic_notification.png - Android_NotificationIcon36 - 1 - - - True - - - FmxTestApp\res\values\ - colors.xml - Android_Colors - 1 - - - True - - - FmxTestApp\res\drawable\ - splash_image_def.xml - AndroidSplashImageDef - 1 - - - True - - - FmxTestApp\library\lib\armeabi-v7a\ - libFmxTestApp.so - ProjectOutput - 1 - - - True - True - - - FmxTestApp\classes\ - FmxTestApp.classes - AndroidClasses - 64 - - - True - - - FmxTestApp\res\drawable-xxxhdpi\ - ic_notification.png - Android_NotificationIcon96 - 1 - - - True - - - FmxTestApp\classes\ - classes.dex - AndroidClassesDexFile - 1 - - - True - - - FmxTestApp\res\drawable-xxxhdpi\ - ic_notification.png - Android_NotificationIcon96 - 1 - - - True - - - FmxTestApp\library\lib\armeabi-v7a\ - gdbserver - AndroidGDBServer - 1 - - - True - - - FmxTestApp\res\drawable-normal\ - splash_image.png - Android_SplashImage470 - 1 - - - True - - - FmxTestApp\res\drawable-xxhdpi\ - ic_notification.png - Android_NotificationIcon72 - 1 - - - True - - - FmxTestApp\library\lib\armeabi-v7a\ - gdbserver - AndroidGDBServer - 1 - - - True - - - FmxTestApp\res\drawable-normal\ - splash_image.png - Android_SplashImage470 - 1 - - - True - - - FmxTestApp\res\drawable-xxhdpi\ - ic_notification.png - Android_NotificationIcon72 - 1 - - - True - - - FmxTestApp\res\drawable-xxhdpi\ - ic_launcher.png - Android_LauncherIcon144 - 1 - - - True - - - FmxTestApp\res\drawable-xxhdpi\ - ic_launcher.png - Android_LauncherIcon144 - 1 - - - True - - - FmxTestApp\res\drawable-xxxhdpi\ - ic_launcher.png - Android_LauncherIcon192 - 1 - - - True - - - FmxTestApp\res\drawable-xxxhdpi\ - ic_launcher.png - Android_LauncherIcon192 - 1 - - - True - - - FmxTestApp\res\drawable-xhdpi\ - ic_launcher.png - Android_LauncherIcon96 - 1 - - - True - - - FmxTestApp\res\drawable-xhdpi\ - ic_launcher.png - Android_LauncherIcon96 - 1 - - - True - - - FmxTestApp\ - AndroidManifest.xml - ProjectAndroidManifest - 1 - - - True - - - FmxTestApp\ - libaTestApp.so - AndroidLibnativeX86File - 0 - - - True - - - FmxTestApp\res\values\ - styles.xml - AndroidSplashStyles - 1 - - - True - - - FmxTestApp\ - AndroidManifest.xml - ProjectAndroidManifest - 1 - - - True - - - FmxTestApp\library\lib\armeabi-v7a\ - libFmxTestApp.so - ProjectOutput - 1 - - - True - True - - - FmxTestApp\res\drawable-mdpi\ - ic_notification.png - Android_NotificationIcon24 - 1 - - - True - - - FmxTestApp\res\drawable-small\ - splash_image.png - Android_SplashImage426 - 1 - - - True - - - FmxTestApp\res\drawable-small\ - splash_image.png - Android_SplashImage426 - 1 - - - True - - - FmxTestApp\library\lib\mips\ - libFmxTestApp.so - AndroidLibnativeMipsFile - 1 - - - True - - - FmxTestApp\classes\ - FmxTestApp.classes - AndroidClasses - 64 - - - True - - - FmxTestApp\library\lib\mips\ - libFmxTestApp.so - AndroidLibnativeMipsFile - 1 - - - True - - - FmxTestApp\res\drawable-mdpi\ - ic_notification.png - Android_NotificationIcon24 - 1 - - - True - - - + - - - FmxTestApp.app\ - FmxTestApp - ProjectOutput - 1 - - - True - True - - - FmxTestApp.app\ - Default-Landscape-1242w-2688h@3x.png - iPhone_Launch2688x1242 - 1 - - - True - - - FmxTestApp.app\ - Default-1242w-2688h@3x.png - iPhone_Launch1242x2688 - 1 - - - True - - - FmxTestApp.app\ - Default-Landscape-750w-1334h@2x.png - iPhone_Launch1334 - 1 - - - True - - - FmxTestApp.app\ - Info.plist - ProjectiOSInfoPList - 1 - - - True - - - FmxTestApp.app\..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF\ - aTestApp - ProjectiOSDeviceDebug - 1 - - - True - - - FmxTestApp.app\ - Info.plist - ProjectiOSInfoPList - 1 - - - True - - - FmxTestApp.app\ - Default-2048w-2732h@2x~ipad.png - iPad_Launch2048x2732 - 1 - - - True - - - FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_ApplicationIcon_152x152.png - iPad_AppIcon152 - 1 - - - True - - - FmxTestApp.app\ - FM_ApplicationIcon_114x114.png - iPhone_AppIcon114 - 0 - - - True - - - FmxTestApp.app\ - FM_ApplicationIcon_114x114.png - iPhone_AppIcon114 - 0 - - - True - - - FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_ApplicationIcon_152x152.png - iPad_AppIcon152 - 1 - - - True - - - FmxTestApp.app\ - FM_SettingIcon_29x29.png - iPad_Setting29 - 0 - - - True - - - FmxTestApp.app\ - FM_ApplicationIcon_60x60.png - iPhone_AppIcon60 - 0 - - - True - - - FmxTestApp.app\ - FM_ApplicationIcon_60x60.png - iPhone_AppIcon60 - 0 - - - True - - - FmxTestApp.app\ - Default-667h@2x.png - iPhone_Launch750 - 1 - - - True - - - FmxTestApp.app\ - FM_SettingIcon_29x29.png - iPad_Setting29 - 0 - - - True - - - FmxTestApp.app\ - Default-Landscape@2x.png - iPad_Launch2048 - 1 - - - True - - - FmxTestApp.app\ - Default-750w-1334h@2x.png - iPhone_Launch750 - 1 - - - True - - - FmxTestApp.app\ - Default-Landscape-1668w-2388h@2x~ipad.png - iPad_Launch2388x1668 - 1 - - - True - - - FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_SettingIcon_58x58.png - iPad_Setting58 + + + + FmxTestApp.app\ + FmxTestApp + ProjectOutput 1 True + True - + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_SettingIcon_58x58.png - iPad_Setting58 + FM_ApplicationIcon_1024x1024.png + iOS_AppStore1024 1 True - + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_ApplicationIcon_167x167.png - iPad_AppIcon167 - 1 - - - True - - - FmxTestApp.app\ - Default~ipad.png - iPad_Launch768 - 1 - - - True - - - FmxTestApp.app\ - FM_ApplicationIcon_76x76.png - iPad_AppIcon76 - 0 - - - True - - - FmxTestApp.app\ - FM_ApplicationIcon_76x76.png - iPad_AppIcon76 - 0 - - - True - - - FmxTestApp.app\ - Default.png - iPhone_Launch320 + FM_ApplicationIcon_1024x1024.png + iOS_AppStore1024 1 True - - FmxTestApp.app\ - Default-Landscape-1536w-2048h@2x~ipad.png - iPad_Launch2048x1536 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPhone@3x.png + iPhone_Launch3x 1 True - - FmxTestApp.app\ - Default.png - iPhone_Launch320 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPhone@3x.png + iPhone_Launch3x 1 True - - FmxTestApp.app\ - FM_SpotlightSearchIcon_40x40.png - iPhone_Spotlight40 - 0 - - - True - - - FmxTestApp.app\ - FM_SpotlightSearchIcon_40x40.png - iPhone_Spotlight40 - 0 - - - True - - - FmxTestApp.app\ - FmxTestApp - ProjectOutput + + FmxTestApp.app\..\ + FmxTestApp.entitlements + ProjectiOSEntitlements 1 True - True - + FmxTestApp.app\ - Default-Landscape@2x~ipad.png - iPad_Launch2048x1536 + Info.plist + ProjectiOSInfoPList 1 True - - FmxTestApp.app\ - ResourceRules.plist - ProjectiOSDeviceResourceRules + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_ApplicationIcon_152x152.png + iPad_AppIcon152 1 True - + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_SpotlightSearchIcon_120x120.png - iPhone_Spotlight120 + FM_ApplicationIcon_152x152.png + iPad_AppIcon152 1 True - - FmxTestApp.app\ - Default-1668w-2388h@2x~ipad.png - iPad_Launch1668x2388 - 1 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\ + FmxTestApp.launchscreen + ProjectiOSLaunchScreen + 64 True - - FmxTestApp.app\ - Default-Portrait@2x.png - iPad_Launch1536 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPhone@2x.png + iPhone_Launch2x 1 True - - FmxTestApp.app\ - Default-1125w-2436h@3x.png - iPhone_Launch1125 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPhone@2x.png + iPhone_Launch2x 1 True - - FmxTestApp.app\ - Default-568h@2x.png - iPhone_Launch640x1136 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SettingIcon_58x58.png + iPad_Setting58 1 True - + FmxTestApp.app\ - Default-640w-1136h@2x.png - iPhone_Launch640x1136 + Info.plist + ProjectiOSInfoPList 1 True - + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_ApplicationIcon_120x120.png - iPhone_AppIcon120 + FM_ApplicationIcon_167x167.png + iPad_AppIcon167 1 True - - FmxTestApp.app\ - FM_SpotlightSearchIcon_40x40.png - iPad_SpotLight40 - 0 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\ + FmxTestApp.launchscreen + ProjectiOSLaunchScreen + 64 True - + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_ApplicationIcon_120x120.png - iPhone_AppIcon120 + FM_ApplicationIcon_167x167.png + iPad_AppIcon167 1 True - - FmxTestApp.app\ - FM_ApplicationIcon_87x87.png - iPhone_AppIcon87 - 0 - - - True - - - FmxTestApp.app\ - FM_SpotlightSearchIcon_40x40.png - iPad_SpotLight40 - 0 - - - True - - - FmxTestApp.app\ - Default-Landscape-2048w-2732h@2x~ipad.png - iPad_Launch2732x2048 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SettingIcon_58x58.png + iPad_Setting58 1 True - - FmxTestApp.app\ - FM_ApplicationIcon_87x87.png - iPhone_AppIcon87 - 0 - - - True - - - FmxTestApp.app\ - ResourceRules.plist - ProjectiOSDeviceResourceRules + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPadDark@2x.png + iPad_LaunchDark2x 1 True - + FmxTestApp.app\ - Default@2x.png - iPhone_Launch640 + FmxTestApp + ProjectOutput 1 True + True - - FmxTestApp.app\ - Default@2x.png - iPhone_Launch640 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPadDark@2x.png + iPad_LaunchDark2x 1 True - - FmxTestApp.app\ - FM_SpotlightSearchIcon_100x100.png - iPad_SpotLight100 - 0 - - - True - - - FmxTestApp.app\ - FM_SpotlightSearchIcon_100x100.png - iPad_SpotLight100 - 0 - - - True - - - FmxTestApp.app\ - Default-Landscape~ipad.png - iPad_Launch1024x768 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SpotlightSearchIcon_120x120.png + iPhone_Spotlight120 1 True - - FmxTestApp.app\ - Default-Landscape~ipad.png - iPad_Launch1024x768 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SpotlightSearchIcon_120x120.png + iPhone_Spotlight120 1 True - - FmxTestApp.app\ - Default-1668w-2224h@2x~ipad.png - iPad_Launch1668 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_NotificationIcon_40x40.png + iPhone_Notification40 1 True - - FmxTestApp.app\ - FM_ApplicationIcon_144x144.png - iPad_AppIcon144 - 0 - - - True - - - FmxTestApp.app\ - FM_ApplicationIcon_144x144.png - iPad_AppIcon144 - 0 - - - True - - - FmxTestApp.app\ - Default-Landscape-1668w-2224h@2x~ipad.png - iPad_Launch2224 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_NotificationIcon_40x40.png + iPhone_Notification40 1 True - - FmxTestApp.app\ - FM_SpotlightSearchIcon_29x29.png - iPhone_Spotlight29 - 0 - - - True - - - FmxTestApp.app\ - Default-Landscape-640w-1136h@2x.png - iPhone_Launch1136x640 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_ApplicationIcon_120x120.png + iPhone_AppIcon120 1 True - - FmxTestApp.app\ - FM_SpotlightSearchIcon_29x29.png - iPhone_Spotlight29 - 0 - - - True - - - FmxTestApp.app\ - Default-Portrait@2x~ipad.png - iPad_Launch1536x2048 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_ApplicationIcon_120x120.png + iPhone_AppIcon120 1 True - - FmxTestApp.app\ - FM_ApplicationIcon_72x72.png - iPad_AppIcon72 - 0 - - - True - - - FmxTestApp.app\ - FM_ApplicationIcon_72x72.png - iPad_AppIcon72 - 0 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_NotificationIcon_60x60.png + iPhone_Notification60 + 1 True - - FmxTestApp.app\ - Default-Landscape-736h@3x.png - iPhone_Launch2208 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_NotificationIcon_60x60.png + iPhone_Notification60 1 True - - FmxTestApp.app\ - Default-Landscape-1242w-2208h@3x.png - iPhone_Launch2208 + + FmxTestApp.app\..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF\ + FmxTestApp + ProjectiOSDeviceDebug 1 True - - FmxTestApp.app\ - Default-1242w-2208h@3x.png - iPhone_Launch1242 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SettingIcon_58x58.png + iPhone_Setting58 1 True - - FmxTestApp.app\ - Default-736h@3x.png - iPhone_Launch1242 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SettingIcon_87x87.png + iPhone_Setting87 1 True - - FmxTestApp.app\ - FM_ApplicationIcon_57x57.png - iPhone_AppIcon57 - 0 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SettingIcon_58x58.png + iPhone_Setting58 + 1 True - - FmxTestApp.app\ - FM_ApplicationIcon_57x57.png - iPhone_AppIcon57 - 0 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SettingIcon_87x87.png + iPhone_Setting87 + 1 True @@ -1184,15 +342,6 @@ True - - FmxTestApp.app\ - Default-1536w-2048h@2x~ipad.png - iPad_Launch1536x2048 - 1 - - - True - FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ FM_ApplicationIcon_180x180.png @@ -1202,10 +351,10 @@ True - - FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_SpotlightSearchIcon_80x80.png - iPad_SpotLight80 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPhoneDark@3x.png + iPhone_LaunchDark3x 1 @@ -1220,110 +369,83 @@ True - - FmxTestApp.app\..\ - aTestApp.entitlements - ProjectiOSEntitlements - 1 - - - True - - + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ - FM_ApplicationIcon_180x180.png - iPhone_AppIcon180 + FM_NotificationIcon_40x40.png + iPad_Notification40 1 True - - FmxTestApp.app\ - Default-Landscape.png - iPad_Launch1024 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPhoneDark@2x.png + iPhone_LaunchDark2x 1 True - - FmxTestApp.app\ - Default-Portrait~ipad.png - iPad_Launch768x1024 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPad@2x.png + iPad_Launch2x 1 True - - FmxTestApp.app\..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF\ - FmxTestApp - ProjectiOSDeviceDebug + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_ApplicationIcon_180x180.png + iPhone_AppIcon180 1 True - - FmxTestApp.app\ - Default-Portrait~ipad.png - iPad_Launch768x1024 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPhoneDark@2x.png + iPhone_LaunchDark2x 1 True - - FmxTestApp.app\ - FM_SpotlightSearchIcon_50x50.png - iPad_SpotLight50 - 0 - - - True - - - FmxTestApp.app\ - FM_SpotlightSearchIcon_50x50.png - iPad_SpotLight50 - 0 - - - True - - - FmxTestApp.app\ - Default-828w-1792h@2x.png - iPhone_Launch828 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPhoneDark@3x.png + iPhone_LaunchDark3x 1 True - - FmxTestApp.app\ - Default-Landscape-1125w-2436h@3x.png - iPhone_Launch2436 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_SpotlightSearchIcon_80x80.png + iPad_SpotLight80 1 True - - FmxTestApp.app\ - FM_SpotlightSearchIcon_58x58.png - iPhone_Spotlight58 - 0 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset\ + FM_NotificationIcon_40x40.png + iPad_Notification40 + 1 True - - FmxTestApp.app\ - FM_SpotlightSearchIcon_58x58.png - iPhone_Spotlight58 - 0 + + FmxTestApp.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\ + FM_LaunchScreenImage_iPad@2x.png + iPad_Launch2x + 1 True @@ -1337,14 +459,6 @@ True - - FmxTestApp.app\ - Default-Landscape-828w-1792h@2x.png - iPhone_Launch1792 - 1 - - - True - + diff --git a/demo/aTestApp/FmxTestApp.dproj b/demo/aTestApp/FmxTestApp.dproj index 42e5a3a..5c428a8 100644 --- a/demo/aTestApp/FmxTestApp.dproj +++ b/demo/aTestApp/FmxTestApp.dproj @@ -1,13 +1,13 @@  {8F95EBC4-91B8-4B17-B17B-4FCE0BE2560D} - 19.4 + 20.1 FMX FmxTestApp.dpr True Debug - Android - 33809 + Win32 + 558097 Application @@ -28,6 +28,11 @@ Base true + + true + Base + true + true Base @@ -233,6 +238,32 @@ $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_58x58.png $(BDS)\bin\Artwork\iOS\iPad\FM_NotificationIcon_40x40.png + + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSCameraUsageDescription=The reason for accessing the camera;CFBundleShortVersionString=1.0.0;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSFaceIDUsageDescription=The reason for accessing the face id;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers + iPhoneAndiPad + true + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_180x180.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png + FireDACSqliteDriver;bindcompfmx;DBXSqliteDriver;RESTBackendComponents;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;FireDACCommon;bindcomp;tethering;DBXInterBaseDriver;xmlrtl;DbxCommonDriver;IndyProtocols;dbxcds;FireDACCommonDriver;bindcompdbx;soaprtl;bindengine;FMXTee;fmxFireDAC;CustomIPTransport;FireDAC;dsnap;IndyIPServer;fmxase;IndyCore;IndyIPCommon;CloudService;FireDACIBDriver;FmxTeeUI;inet;soapmidas;soapserver;dsnapxml;RESTComponents;dbexpress;IndyIPClient;$(DCC_UsePackage);$(DCC_UsePackage) + $(BDS)\bin\Artwork\iOS\iPad\FM_SettingIcon_58x58.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_167x167.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_2x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImageDark_2x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImage_3x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_LaunchImageDark_3x.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImage_2x.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageDark_2x.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_60x60.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_87x87.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_NotificationIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SettingIcon_58x58.png + $(BDS)\bin\Artwork\iOS\iPad\FM_NotificationIcon_40x40.png + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts Debug @@ -383,1098 +414,440 @@ Microsoft Office XP Sample Automation Server Wrapper Components - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_launcher.png - true - - - - - ic_notification.png - true - - - - - ic_notification.png - true - - - - - ic_notification.png - true - - - - - ic_notification.png - true - - - - - ic_notification.png - true - - - - - splash_image.png - true - - - - - splash_image.png - true - - - - - splash_image.png - true - - - - - splash_image.png - true - - - - - splash_image.png - true - - - - - splash_image.png - true - - - - - splash_image.png - true - - - - - splash_image.png - true - - - - - true - - - - - true - - - - + + + + + true - - + + true - - + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true - - - true - - - + + + + + + FM_LaunchScreenImage_iPadDark@2x.png true - + + + + + + + + + + + + + + + + + + + + FM_LaunchScreenImage_iPad@2x.png true - - - true - - - + true - + + + + + true - - - Default-Landscape.png - true - - - + + + + + + + + + - Default-Landscape.png - true - - - - - Default-Landscape~ipad.png true - + - Default-Landscape~ipad.png true - + + + + + - Default-Landscape~ipad.png - true - - - - - Default-Landscape@2x.png true - + + + - Default-Landscape@2x.png - true - - - - - Default-Landscape@2x~ipad.png true - + + + + + + + - Default-Landscape@2x~ipad.png + FM_LaunchScreenImage_iPhoneDark@2x.png true - + - Default-Landscape-1536w-2048h@2x~ipad.png + FM_LaunchScreenImage_iPhoneDark@3x.png true - + + + + + + + + + + + + - Default-Landscape-1668w-2224h@2x~ipad.png + FM_LaunchScreenImage_iPhone@2x.png true - + + + - Default-Landscape-1668w-2388h@2x~ipad.png + FM_LaunchScreenImage_iPhone@3x.png true - + + + + + + + + - Default-Landscape-2048w-2732h@2x~ipad.png true - - - Default-Portrait@2x.png - true - - - + - Default-Portrait@2x.png - true - - - - - Default-Portrait@2x~ipad.png true - + - Default-Portrait@2x~ipad.png true - + - Default-1536w-2048h@2x~ipad.png true - + + - Default-1668w-2224h@2x~ipad.png true - + + + + + + + + + - Default-1668w-2388h@2x~ipad.png true - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Default-2048w-2732h@2x~ipad.png - true - - - - - Default~ipad.png true - + + - Default~ipad.png - true - - - - - Default-Portrait~ipad.png + Info.plist true - + - Default-Portrait~ipad.png + 64 true - + + - Default-Portrait~ipad.png + FmxTestApp true - - - true + + + + 1 - - - - true + + Contents\MacOS + 1 - - - - true + + 0 - - - - true + + + + classes + 64 - - - - true + + classes + 64 - - - - true + + + + res\xml + 1 - - - - true + + res\xml + 1 - - - - true + + + + library\lib\armeabi-v7a + 1 - - - - true + + + + library\lib\armeabi + 1 - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - Default-1125w-2436h@3x.png - true - - - - - Default-Landscape-640w-1136h@2x.png - true - - - - - Default-736h@3x.png - true - - - - - Default-736h@3x.png - true - - - - - Default-1242w-2208h@3x.png - true - - - - - Default-1242w-2688h@3x.png - true - - - - - Default-Landscape-750w-1334h@2x.png - true - - - - - Default-Landscape-828w-1792h@2x.png - true - - - - - Default-Landscape-736h@3x.png - true - - - - - Default-Landscape-736h@3x.png - true - - - - - Default-Landscape-1242w-2208h@3x.png - true - - - - - Default-Landscape-1125w-2436h@3x.png - true - - - - - Default-Landscape-1242w-2688h@3x.png - true - - - - - Default.png - true - - - - - Default.png - true - - - - - Default.png - true - - - - - Default-568h@2x.png - true - - - - - Default-568h@2x.png - true - - - - - Default-640w-1136h@2x.png - true - - - - - Default@2x.png - true - - - - - Default@2x.png - true - - - - - Default@2x.png - true - - - - - Default-667h@2x.png - true - - - - - Default-667h@2x.png - true - - - - - Default-750w-1334h@2x.png - true - - - - - Default-828w-1792h@2x.png - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - libFmxTestApp.so - true - - - - - libFmxTestApp.so - true - - - - - libaTestApp.so - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - classes.dex - true - - - - - libFmxTestApp.so - true - - - - - true - - - - - true - - - - - true - - - - - classes.dex - true - - - - - true - - - - - 64 - true - - - - - libFmxTestApp.so - true - - - - - true - - - - - true - - - - - styles.xml - true - - - - - true - - - - - aTestApp - true - - - - - true - - - - - Info.plist - true - - - - - FmxTestApp - true - - - - - ResourceRules.plist - true - - - - - aTestApp - true - - - - - true - - - - - Info.plist - true - - - - - FmxTestApp - true - - - - - ResourceRules.plist - true - - - - - FmxTestApp - true - - - - - true - - - - - Info.plist - true - - - - - FmxTestApp - true - - - - - ResourceRules.plist - true - - - - - FmxTestApp.exe - true - - - - - FmxTestApp.exe - true - - - - + + library\lib\armeabi 1 - - Contents\MacOS + + + + library\lib\armeabi-v7a 1 - - 0 - - + - classes - 64 + library\lib\mips + 1 - classes - 64 + library\lib\mips + 1 - + - classes + library\lib\armeabi-v7a 1 - classes + library\lib\arm64-v8a 1 - + + + library\lib\armeabi-v7a + 1 + + + - res\xml + res\drawable 1 - res\xml + res\drawable 1 - + - library\lib\armeabi-v7a + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 1 - + - library\lib\armeabi + res\values 1 - library\lib\armeabi + res\values 1 - + + + res\values-v21 + 1 + - library\lib\armeabi-v7a + res\values-v21 1 - + - library\lib\mips + res\values-v31 1 - library\lib\mips + res\values-v31 1 - - + - library\lib\armeabi-v7a + res\drawable-anydpi-v26 1 - library\lib\arm64-v8a + res\drawable-anydpi-v26 1 - + + + res\drawable + 1 + - library\lib\armeabi-v7a + res\drawable 1 - + res\drawable 1 @@ -1484,23 +857,23 @@ 1 - + - res\values + res\drawable 1 - res\values + res\drawable 1 - + - res\values-v21 + res\drawable-anydpi-v33 1 - res\values-v21 + res\drawable-anydpi-v33 1 @@ -1514,6 +887,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -1659,853 +1042,599 @@ res\drawable-large 1 - - res\drawable-large - 1 - - - - - res\drawable-xlarge - 1 - - - res\drawable-xlarge - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - Contents\MacOS - 1 - .framework - - - Contents\MacOS - 1 - .framework - - - Contents\MacOS - 1 - .framework - - - 0 - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - 0 - .dll;.bpl - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - Contents\MacOS - 1 - .dylib - - - 0 - .bpl - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - Contents\Resources\StartUp\ - 0 - - - Contents\Resources\StartUp\ - 0 - - - Contents\Resources\StartUp\ - 0 - - - 0 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - + + res\drawable-large 1 - - + + + res\drawable-xlarge 1 - + + res\drawable-xlarge 1 - + + + + res\values 1 - - - + + res\values 1 - + + + + res\drawable-anydpi-v24 1 - + + res\drawable-anydpi-v24 1 - - + + + res\drawable 1 - + + res\drawable 1 - + + + + res\drawable-night-anydpi-v21 1 - - - + + res\drawable-night-anydpi-v21 1 - + + + + res\drawable-anydpi-v31 1 - + + res\drawable-anydpi-v31 1 - - + + + res\drawable-night-anydpi-v31 1 - + + res\drawable-night-anydpi-v31 1 + + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\MacOS 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 + + 0 - - + + + Contents\MacOS 1 + .framework - + + Contents\MacOS 1 + .framework - + + Contents\MacOS 1 + .framework + + + 0 - + 1 + .dylib 1 + .dylib - + 1 + .dylib - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\MacOS 1 + .dylib - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\MacOS 1 + .dylib - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 + .dylib - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + + 0 + .dll;.bpl - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 + .dylib - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 + .dylib - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + .dylib - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 + .dylib - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 + .dylib - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 + .dylib - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + + 0 + .bpl - + + + 0 + + + 0 + - 1 + 0 - 1 + 0 - - 1 + + 0 - - - - 1 + + Contents\Resources\StartUp\ + 0 - - 1 + + Contents\Resources\StartUp\ + 0 - - 1 + + Contents\Resources\StartUp\ + 0 - - - - 1 + + 0 - + + + 1 - + 1 - - - 1 - - + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - + + + ..\ 1 - + + ..\ 1 - + + ..\ 1 - - + + + Contents 1 - + + Contents 1 - + + Contents 1 - - + + + Contents\Resources 1 - + + Contents\Resources 1 - + + Contents\Resources 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - + + library\lib\arm64-v8a 1 - - 1 1 - + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\MacOS 1 - - - + + Contents\MacOS + 1 + + + Contents\MacOS 1 - - 1 + + 0 - + + + + library\lib\armeabi-v7a 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\ 1 + ..\ 1 - + + ..\ 1 - + 1 1 - + 1 - + + + ..\$(PROJECTNAME).launchscreen + 64 + + + ..\$(PROJECTNAME).launchscreen + 64 + + + 1 1 - + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Assets 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Assets 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - + - ..\ + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - ..\ - 1 - - - ..\ + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - Contents - 1 - - - Contents + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - Contents\Resources - 1 - - - Contents\Resources + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - - 1 - - - Contents\MacOS - 1 - - - Contents\MacOS + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 @@ -2513,6 +1642,7 @@ + @@ -2525,6 +1655,7 @@ True True True + True False False True diff --git a/demo/aTestApp/FmxTestApp.res b/demo/aTestApp/FmxTestApp.res index 36f26e2..fa2ce16 100644 Binary files a/demo/aTestApp/FmxTestApp.res and b/demo/aTestApp/FmxTestApp.res differ diff --git a/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/AppIcon.appiconset/Contents.json b/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..8ef417d --- /dev/null +++ b/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/AppIcon.appiconset/Contents.json @@ -0,0 +1,9 @@ +{ + "images" : [ + <%AppIconImages%> + ], + "info" : { + "version" : 1, + "author" : "RAD Studio" + } +} diff --git a/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/Contents.json b/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/Contents.json new file mode 100644 index 0000000..975d66d --- /dev/null +++ b/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "RAD Studio" + } +} diff --git a/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/LaunchScreenBackgroundColor.colorset/Contents.json b/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/LaunchScreenBackgroundColor.colorset/Contents.json new file mode 100644 index 0000000..3474965 --- /dev/null +++ b/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/LaunchScreenBackgroundColor.colorset/Contents.json @@ -0,0 +1,9 @@ +{ + "colors" : [ + <%LaunchScreenBackgroundColors%> + ], + "info" : { + "version" : 1, + "author" : "RAD Studio" + } +} diff --git a/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/LaunchScreenImage.imageset/Contents.json b/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/LaunchScreenImage.imageset/Contents.json new file mode 100644 index 0000000..1aee7d6 --- /dev/null +++ b/demo/aTestApp/LaunchScreen.TemplateiOS/Assets/LaunchScreenImage.imageset/Contents.json @@ -0,0 +1,9 @@ +{ + "images" : [ + <%LaunchScreenImages%> + ], + "info" : { + "version" : 1, + "author" : "RAD Studio" + } +} diff --git a/demo/aTestApp/LaunchScreen.TemplateiOS/LaunchScreen.storyboard b/demo/aTestApp/LaunchScreen.TemplateiOS/LaunchScreen.storyboard new file mode 100644 index 0000000..240ac5b --- /dev/null +++ b/demo/aTestApp/LaunchScreen.TemplateiOS/LaunchScreen.storyboard @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo/vclTestApp/vclTestApp.dproj b/demo/vclTestApp/vclTestApp.dproj index 185e869..bbc3977 100644 --- a/demo/vclTestApp/vclTestApp.dproj +++ b/demo/vclTestApp/vclTestApp.dproj @@ -1,7 +1,7 @@  {6B826825-AB00-41E0-B049-0C28B21DCC48} - 19.0 + 20.1 VCL VclTestApp.dpr True @@ -99,10 +99,6 @@
mainFrm
dfm - - Cfg_2 - Base - Base @@ -110,6 +106,10 @@ Cfg_1 Base + + Cfg_2 + Base + Delphi.Personality.12 @@ -124,13 +124,8 @@ Microsoft Office XP Sample Automation Server Wrapper Components - - - - VclTestApp.exe - true - - + + 1 @@ -143,14 +138,14 @@ 0 - + classes - 1 + 64 classes - 1 + 64 @@ -195,7 +190,6 @@ 1 - library\lib\armeabi-v7a @@ -222,6 +216,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -242,6 +246,66 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -252,6 +316,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -272,6 +346,16 @@ 1 + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + res\drawable-ldpi @@ -412,6 +496,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -435,6 +569,11 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 @@ -448,7 +587,7 @@ 1 .dylib - + 1 .dylib @@ -462,6 +601,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .dll;.bpl @@ -476,7 +620,7 @@ 1 .dylib - + 1 .dylib @@ -490,6 +634,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .bpl @@ -508,7 +657,7 @@ 0 - + 0 @@ -519,355 +668,322 @@ Contents\Resources\StartUp\ 0 + + Contents\Resources\StartUp\ + 0 + 0 - - - 1 - - + + 1 - + 1 - - - 1 - - + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - + + + ..\ 1 - + + ..\ 1 - + + ..\ 1 - - + + + Contents 1 - + + Contents 1 - + + Contents 1 - - + + + Contents\Resources 1 - + + Contents\Resources 1 - + + Contents\Resources 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - + + library\lib\arm64-v8a 1 - - 1 1 - - 1 - - - - + 1 - + 1 - + + Contents\MacOS 1 - - - + + Contents\MacOS 1 - + + Contents\MacOS 1 - - 1 + + 0 - - - 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - - - 1 - - + + 1 - + 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\ 1 + ..\ 1 - + + ..\ 1 - + 1 1 - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - 1 - + - 1 + ..\$(PROJECTNAME).launchscreen + 64 - - 1 + + ..\$(PROJECTNAME).launchscreen + 64 - + 1 1 - + 1 - - - 1 - - + + + Assets 1 - + + Assets 1 - - - 1 - - + + + Assets 1 - + + Assets 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 @@ -876,7 +992,7 @@ ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 @@ -886,192 +1002,83 @@ ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - - - ..\ - 1 - - - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - ..\ - 1 - - - ..\ - 1 - - - - - Contents - 1 - - - Contents - 1 - - - - - Contents\Resources - 1 - - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - - 1 - - - Contents\MacOS - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - - - 1 - - - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + - + + + - - - + + + True diff --git a/demo/vclTestApp/vclTestApp.res b/demo/vclTestApp/vclTestApp.res index 37895de..de33d34 100644 Binary files a/demo/vclTestApp/vclTestApp.res and b/demo/vclTestApp/vclTestApp.res differ diff --git a/demo/webcam/Webcam.dproj b/demo/webcam/Webcam.dproj index 7719a5b..6669710 100644 --- a/demo/webcam/Webcam.dproj +++ b/demo/webcam/Webcam.dproj @@ -1,7 +1,7 @@  {0D414F4F-0E95-416D-93A9-8B458A21D7FE} - 19.0 + 20.1 VCL Webcam.dpr True @@ -113,10 +113,6 @@ - - Cfg_2 - Base - Base @@ -124,6 +120,10 @@ Cfg_1 Base + + Cfg_2 + Base + Delphi.Personality.12 @@ -138,13 +138,8 @@ Microsoft Office XP Sample Automation Server Wrapper Components - - - - Webcam.exe - true - - + + 1 @@ -157,14 +152,14 @@ 0 - + classes - 1 + 64 classes - 1 + 64 @@ -235,6 +230,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -255,6 +260,66 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -265,6 +330,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -285,6 +360,16 @@ 1 + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + res\drawable-ldpi @@ -425,6 +510,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -448,6 +583,11 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 @@ -461,7 +601,7 @@ 1 .dylib - + 1 .dylib @@ -475,6 +615,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .dll;.bpl @@ -489,7 +634,7 @@ 1 .dylib - + 1 .dylib @@ -503,6 +648,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .bpl @@ -521,7 +671,7 @@ 0 - + 0 @@ -532,355 +682,322 @@ Contents\Resources\StartUp\ 0 + + Contents\Resources\StartUp\ + 0 + 0 - - - 1 - - + + 1 - + 1 - - - 1 - - + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - + + + ..\ 1 - + + ..\ 1 - + + ..\ 1 - - + + + Contents 1 - + + Contents 1 - + + Contents 1 - - + + + Contents\Resources 1 - + + Contents\Resources 1 - + + Contents\Resources 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - + + library\lib\arm64-v8a 1 - - 1 1 - - 1 - - - - + 1 - + 1 - + + Contents\MacOS 1 - - - + + Contents\MacOS 1 - + + Contents\MacOS 1 - - 1 + + 0 - - - 1 - - - 1 - - + + + library\lib\armeabi-v7a 1 - - - 1 - - + + 1 - + 1 - + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - + + ..\ 1 + ..\ 1 - + + ..\ 1 - + 1 1 - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - 1 - + - 1 + ..\$(PROJECTNAME).launchscreen + 64 - - 1 + + ..\$(PROJECTNAME).launchscreen + 64 - + 1 1 - + 1 - - - 1 - - + + + Assets 1 - + + Assets 1 - - - 1 - - + + + Assets 1 - + + Assets 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 @@ -889,7 +1006,7 @@ ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 @@ -899,192 +1016,83 @@ ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - - - ..\ - 1 - - - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 - - - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - ..\ - 1 - - - ..\ - 1 - - - - - Contents - 1 - - - Contents - 1 - - - - - Contents\Resources - 1 - - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - - 1 - - - Contents\MacOS - 1 - - - Contents\MacOS - 1 - - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - 1 - - - 1 - - - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + + + - - - - + + + True diff --git a/demo/webcam/Webcam.dsv b/demo/webcam/Webcam.dsv new file mode 100644 index 0000000..c399068 --- /dev/null +++ b/demo/webcam/Webcam.dsv @@ -0,0 +1,51 @@ +[ClosedView_QzpcRGV2XERlbHBoaVxaWGluZ1xVbml0VGVzdFxUZXN0LnBhcw==] +Module=C:\Dev\Delphi\ZXing\UnitTest\Test.pas +CursorX=78 +CursorY=59 +TopLine=46 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=C:\Dev\Delphi\ZXing\UnitTest\Test.pas +[ClosedView_QzpcRGV2XERlbHBoaVxaWGluZ1xMaWJcQ2xhc3Nlc1xDb21tb25cWlhpbmcuUmVhZFJlc3VsdC5w +YXM=] +Module=C:\Dev\Delphi\ZXing\Lib\Classes\Common\ZXing.ReadResult.pas +CursorX=54 +CursorY=329 +TopLine=323 +LeftCol=1 +Elisions={{153,0},{241,39},{'IMetaData implementations'}} +Bookmarks= +EditViewName=C:\Dev\Delphi\ZXing\Lib\Classes\Common\ZXing.ReadResult.pas + +[ClosedView_QzpcRGV2XERlbHBoaVxaWGluZ1xkZW1vXHdlYmNhbVxWRnJhbWVzLnBhcw==] +Module=C:\Dev\Delphi\ZXing\demo\webcam\VFrames.pas +CursorX=12 +CursorY=100 +TopLine=97 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName= +[ClosedView_QzpcRGV2XERlbHBoaVxaWGluZ1xsaWJcQ2xhc3Nlc1wxRCBCYXJjb2Rlc1xaWGluZy5PbmVELlVQ +Q0VBTkV4dGVuc2lvbjJTdXBwb3J0LnBhcw==] +Module=C:\Dev\Delphi\ZXing\lib\Classes\1D Barcodes\ZXing.OneD.UPCEANExtension2Support.pas +CursorX=49 +CursorY=99 +TopLine=79 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=C:\Dev\Delphi\ZXing\lib\Classes\1D Barcodes\ZXing.OneD.UPCEANExtension2Support.pas + +[ClosedView_QzpcRGV2XERlbHBoaVxaWGluZ1xsaWJcQ2xhc3Nlc1wxRCBCYXJjb2Rlc1xaWGluZy5PbmVELlVQ +Q0VBTkV4dGVuc2lvbjJTdXBwb3J0LnBhcw==] +Module=C:\Dev\Delphi\ZXing\lib\Classes\1D Barcodes\ZXing.OneD.UPCEANExtension2Support.pas +CursorX=49 +CursorY=99 +TopLine=79 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=C:\Dev\Delphi\ZXing\lib\Classes\1D Barcodes\ZXing.OneD.UPCEANExtension2Support.pas + diff --git a/demo/webcam/Webcam.res b/demo/webcam/Webcam.res index 6672c28..7073882 100644 Binary files a/demo/webcam/Webcam.res and b/demo/webcam/Webcam.res differ diff --git a/unitTest/Images/EAN_8690504009085-beGood.png b/unitTest/Images/EAN_8690504009085-beGood.png new file mode 100644 index 0000000..6641906 Binary files /dev/null and b/unitTest/Images/EAN_8690504009085-beGood.png differ diff --git a/unitTest/Images/EAN_8690504009085-v2.png b/unitTest/Images/EAN_8690504009085-v2.png new file mode 100644 index 0000000..ba921df Binary files /dev/null and b/unitTest/Images/EAN_8690504009085-v2.png differ diff --git a/unitTest/Images/EAN_8690504009085.png b/unitTest/Images/EAN_8690504009085.png new file mode 100644 index 0000000..d72284b Binary files /dev/null and b/unitTest/Images/EAN_8690504009085.png differ