minor update

MagicFoundation · Nov 22, 2024 · e25708c · e25708c
1 parent ff9cdc1
commit e25708c
Show file tree

Hide file tree

Showing 31 changed files with 728 additions and 566 deletions.
diff --git a/...-dorealign implemented badly/Project1.dpr → ...-dorealign implemented badly/Project1.dpr b/...-dorealign implemented badly/Project1.dpr → ...-dorealign implemented badly/Project1.dpr
diff --git a/...orealign implemented badly/Project1.dproj → ...orealign implemented badly/Project1.dproj b/...orealign implemented badly/Project1.dproj → ...orealign implemented badly/Project1.dproj
diff --git a/...768-dorealign implemented badly/Unit1.fmx → ...768-dorealign implemented badly/Unit1.fmx b/...768-dorealign implemented badly/Unit1.fmx → ...768-dorealign implemented badly/Unit1.fmx
diff --git a/...768-dorealign implemented badly/Unit1.pas → ...768-dorealign implemented badly/Unit1.pas b/...768-dorealign implemented badly/Unit1.pas → ...768-dorealign implemented badly/Unit1.pas
diff --git a/Demos/ALAnimation/_Source/ALAnimationDemo.dproj b/Demos/ALAnimation/_Source/ALAnimationDemo.dproj
diff --git a/Demos/ALConfetti/_Source/ALConfettiDemo.dproj b/Demos/ALConfetti/_Source/ALConfettiDemo.dproj
diff --git a/Demos/ALFacebookLogin/_Source/ALFacebookLoginDemo.dproj b/Demos/ALFacebookLogin/_Source/ALFacebookLoginDemo.dproj
diff --git a/Demos/ALFmxControls/Readme.MD b/Demos/ALFmxControls/Readme.MD
@@ -12,4 +12,4 @@ To Deploy on macOS App Store
 
 * Deploy the application from the IDE.
 * Use the following command to upload the app to the App Store:
-  xcrun altool --upload-app --type macos --file "/Users/<username>/PAServer/scratch-dir/zeus-VMWare/ALFmxControlsDemo.pkg" --username "<AppStoreUsername>" --password "<AppStorePassword>"
+  xcrun altool --upload-app --type macos --file "/Users/<username>/PAServer/scratch-dir/<username>-VMWare/ALFmxControlsDemo.pkg" --username "<AppStoreUsername>" --password "<AppStorePassword>"
diff --git a/Demos/ALFmxControls/_Source/ALFmxControlsDemo.deployproj b/Demos/ALFmxControls/_Source/ALFmxControlsDemo.deployproj
@@ -1064,6 +1064,15 @@
       <RemoteDir>ALFmxControlsDemo\res\drawable-xxhdpi\</RemoteDir>
       <RemoteName>text_select_handle_right_mtrl3_light_outlined_error.png</RemoteName>
     </DeployFile>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include="Android\Merged\res\drawable-xxxhdpi\splashscreen_icon.png">
+      <DeployClass>File</DeployClass>
+      <LocalCommand/>
+      <Operation>0</Operation>
+      <Overwrite>True</Overwrite>
+      <RemoteCommand/>
+      <RemoteDir>ALFmxControlsDemo\res\drawable-xxxhdpi\</RemoteDir>
+      <RemoteName>splashscreen_icon.png</RemoteName>
+    </DeployFile>
     <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include="Android\Merged\res\drawable\notification_bg.xml">
       <DeployClass>File</DeployClass>
       <LocalCommand/>
@@ -3333,6 +3342,15 @@
       <RemoteDir>ALFmxControlsDemo\res\drawable-xxhdpi\</RemoteDir>
       <RemoteName>text_select_handle_right_mtrl3_light_outlined_error.png</RemoteName>
     </DeployFile>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include="Android\Merged\res\drawable-xxxhdpi\splashscreen_icon.png">
+      <DeployClass>File</DeployClass>
+      <LocalCommand/>
+      <Operation>0</Operation>
+      <Overwrite>True</Overwrite>
+      <RemoteCommand/>
+      <RemoteDir>ALFmxControlsDemo\res\drawable-xxxhdpi\</RemoteDir>
+      <RemoteName>splashscreen_icon.png</RemoteName>
+    </DeployFile>
     <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include="Android\Merged\res\drawable\notification_bg.xml">
       <DeployClass>File</DeployClass>
       <LocalCommand/>
@@ -5604,6 +5622,15 @@
       <RemoteDir>ALFmxControlsDemo\res\drawable-xxhdpi\</RemoteDir>
       <RemoteName>text_select_handle_right_mtrl3_light_outlined_error.png</RemoteName>
     </DeployFile>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include="Android\Merged\res\drawable-xxxhdpi\splashscreen_icon.png">
+      <DeployClass>File</DeployClass>
+      <LocalCommand/>
+      <Operation>0</Operation>
+      <Overwrite>True</Overwrite>
+      <RemoteCommand/>
+      <RemoteDir>ALFmxControlsDemo\res\drawable-xxxhdpi\</RemoteDir>
+      <RemoteName>splashscreen_icon.png</RemoteName>
+    </DeployFile>
     <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include="Android\Merged\res\drawable\notification_bg.xml">
       <DeployClass>File</DeployClass>
       <LocalCommand/>
@@ -7882,6 +7909,15 @@
       <RemoteDir>ALFmxControlsDemo\res\drawable-xxhdpi\</RemoteDir>
       <RemoteName>text_select_handle_right_mtrl3_light_outlined_error.png</RemoteName>
     </DeployFile>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include="Android\Merged\res\drawable-xxxhdpi\splashscreen_icon.png">
+      <DeployClass>File</DeployClass>
+      <LocalCommand/>
+      <Operation>0</Operation>
+      <Overwrite>True</Overwrite>
+      <RemoteCommand/>
+      <RemoteDir>ALFmxControlsDemo\res\drawable-xxxhdpi\</RemoteDir>
+      <RemoteName>splashscreen_icon.png</RemoteName>
+    </DeployFile>
     <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include="Android\Merged\res\drawable\notification_bg.xml">
       <DeployClass>File</DeployClass>
       <LocalCommand/>
@@ -9335,7 +9371,7 @@
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
       <RemoteName>[email protected]</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\ipad_launch_image_2x.png">
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\ipad_launch_image_dark_2x.png">
       <DeployClass>iPad_LaunchDark2x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
@@ -9407,25 +9443,25 @@
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
       <RemoteName>[email protected]</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_2x.png">
-      <DeployClass>iPhone_LaunchDark2x</DeployClass>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
+      <DeployClass>iPhone_Launch3x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
       <Overwrite>True</Overwrite>
       <RemoteCommand/>
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
-      <RemoteName>FM_LaunchScreenImage_iPhoneDark@2x.png</RemoteName>
+      <RemoteName>FM_LaunchScreenImage_iPhone@3x.png</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
-      <DeployClass>iPhone_Launch3x</DeployClass>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_dark_2x.png">
+      <DeployClass>iPhone_LaunchDark2x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
       <Overwrite>True</Overwrite>
       <RemoteCommand/>
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
-      <RemoteName>FM_LaunchScreenImage_iPhone@3x.png</RemoteName>
+      <RemoteName>FM_LaunchScreenImage_iPhoneDark@2x.png</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_dark_3x.png">
       <DeployClass>iPhone_LaunchDark3x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
@@ -9552,7 +9588,7 @@
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
       <RemoteName>[email protected]</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\ipad_launch_image_2x.png">
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\ipad_launch_image_dark_2x.png">
       <DeployClass>iPad_LaunchDark2x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
@@ -9624,25 +9660,25 @@
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
       <RemoteName>[email protected]</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_2x.png">
-      <DeployClass>iPhone_LaunchDark2x</DeployClass>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
+      <DeployClass>iPhone_Launch3x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
       <Overwrite>True</Overwrite>
       <RemoteCommand/>
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
-      <RemoteName>FM_LaunchScreenImage_iPhoneDark@2x.png</RemoteName>
+      <RemoteName>FM_LaunchScreenImage_iPhone@3x.png</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
-      <DeployClass>iPhone_Launch3x</DeployClass>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_dark_2x.png">
+      <DeployClass>iPhone_LaunchDark2x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
       <Overwrite>True</Overwrite>
       <RemoteCommand/>
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
-      <RemoteName>FM_LaunchScreenImage_iPhone@3x.png</RemoteName>
+      <RemoteName>FM_LaunchScreenImage_iPhoneDark@2x.png</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_dark_3x.png">
       <DeployClass>iPhone_LaunchDark3x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
@@ -9780,7 +9816,7 @@
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
       <RemoteName>[email protected]</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\ipad_launch_image_2x.png">
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\ipad_launch_image_dark_2x.png">
       <DeployClass>iPad_LaunchDark2x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
@@ -9852,25 +9888,25 @@
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
       <RemoteName>[email protected]</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_2x.png">
-      <DeployClass>iPhone_LaunchDark2x</DeployClass>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
+      <DeployClass>iPhone_Launch3x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
       <Overwrite>True</Overwrite>
       <RemoteCommand/>
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
-      <RemoteName>FM_LaunchScreenImage_iPhoneDark@2x.png</RemoteName>
+      <RemoteName>FM_LaunchScreenImage_iPhone@3x.png</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
-      <DeployClass>iPhone_Launch3x</DeployClass>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_dark_2x.png">
+      <DeployClass>iPhone_LaunchDark2x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
       <Overwrite>True</Overwrite>
       <RemoteCommand/>
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
-      <RemoteName>FM_LaunchScreenImage_iPhone@3x.png</RemoteName>
+      <RemoteName>FM_LaunchScreenImage_iPhoneDark@2x.png</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Debug&#39;" Include=".\iOS\Icons\iphone_launch_image_dark_3x.png">
       <DeployClass>iPhone_LaunchDark3x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
@@ -9997,7 +10033,7 @@
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
       <RemoteName>[email protected]</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\ipad_launch_image_2x.png">
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\ipad_launch_image_dark_2x.png">
       <DeployClass>iPad_LaunchDark2x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
@@ -10069,25 +10105,25 @@
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
       <RemoteName>[email protected]</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_2x.png">
-      <DeployClass>iPhone_LaunchDark2x</DeployClass>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
+      <DeployClass>iPhone_Launch3x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
       <Overwrite>True</Overwrite>
       <RemoteCommand/>
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
-      <RemoteName>FM_LaunchScreenImage_iPhoneDark@2x.png</RemoteName>
+      <RemoteName>FM_LaunchScreenImage_iPhone@3x.png</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
-      <DeployClass>iPhone_Launch3x</DeployClass>
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_dark_2x.png">
+      <DeployClass>iPhone_LaunchDark2x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>
       <Overwrite>True</Overwrite>
       <RemoteCommand/>
       <RemoteDir>ALFmxControlsDemo.app\..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset\</RemoteDir>
-      <RemoteName>FM_LaunchScreenImage_iPhone@3x.png</RemoteName>
+      <RemoteName>FM_LaunchScreenImage_iPhoneDark@2x.png</RemoteName>
     </DeployFile>
-    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_3x.png">
+    <DeployFile Condition="&#39;$(Config)&#39;==&#39;Release&#39;" Include=".\iOS\Icons\iphone_launch_image_dark_3x.png">
       <DeployClass>iPhone_LaunchDark3x</DeployClass>
       <LocalCommand/>
       <Operation>1</Operation>

diff --git a/Demos/ALFmxControls/_Source/ALFmxControlsDemo.dpr b/Demos/ALFmxControls/_Source/ALFmxControlsDemo.dpr
@@ -2,11 +2,16 @@ program ALFmxControlsDemo;
 
 {$R 'Resources.res' 'Resources\Resources.rc'}
 
+{$I Alcinoe.inc}
+
 uses
   System.StartUpCopy,
   FMX.Forms,
   FMX.Types,
   FMX.Skia,
+  {$IF defined(ALAppleOS)}
+  FMX.Context.Metal,
+  {$ENDIF}
   Main in 'Main.pas' {MainForm},
   ScrollBoxDemo in 'ScrollBoxDemo.pas' {ScrollBoxDemoForm};
 
@@ -21,7 +26,10 @@ begin
   GlobalUseVulkan := False;
   {$ENDIF}
   //GlobalUseGPUCanvas := True;
-  //GlobalUseMetal := True;
+  {$IF defined(ALAppleOS)}
+  if TCustomContextMetal.IsMetalSupported then
+    GlobalUseMetal := True;
+  {$ENDIF}
   Application.Initialize;
   Application.CreateForm(TMainForm, MainForm);
   Application.Run;