Skip to content

Commit

Permalink
Minor Update in Demos
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zeus64
Zeus64 committed Sep 20, 2023
1 parent 22abeaa commit d7d8005
Show file tree
Hide file tree
Showing 36 changed files with 7,297 additions and 8,323 deletions.
42 changes: 5 additions & 37 deletions Demos/ALAnimation/_Source/ALAnimationDemo.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="4">
<DeployFile Class="AndroidSplashImageDef" Configuration="Debug" LocalName="..\Android64\Debug\splash_image_def.xml">
<DeployFile Class="AndroidSplashImageDef" Configuration="Debug" LocalName="Android64\Debug\splash_image_def.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
Expand All @@ -412,7 +412,7 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashStyles" Configuration="Debug" LocalName="..\Android64\Debug\styles.xml">
<DeployFile Class="AndroidSplashStyles" Configuration="Debug" LocalName="Android64\Debug\styles.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
Expand All @@ -436,7 +436,7 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashStylesV21" Configuration="Debug" LocalName="..\Android64\Debug\styles-v21.xml">
<DeployFile Class="AndroidSplashStylesV21" Configuration="Debug" LocalName="Android64\Debug\styles-v21.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
Expand Down Expand Up @@ -464,7 +464,7 @@
<RemoteName>styles.xml</RemoteName>
</Platform>
</DeployFile>
<DeployFile Class="Android_Colors" Configuration="Debug" LocalName="..\Android64\Debug\colors.xml">
<DeployFile Class="Android_Colors" Configuration="Debug" LocalName="Android64\Debug\colors.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
Expand Down Expand Up @@ -908,7 +908,7 @@
<RemoteName>splash_image.png</RemoteName>
</Platform>
</DeployFile>
<DeployFile Class="Android_Strings" Configuration="Debug" LocalName="..\Android64\Debug\strings.xml">
<DeployFile Class="Android_Strings" Configuration="Debug" LocalName="Android64\Debug\strings.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
Expand Down Expand Up @@ -1045,36 +1045,4 @@
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists(&#39;$(BDS)\Bin\CodeGear.Delphi.Targets&#39;)"/>
<Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists(&#39;$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj&#39;)"/>
<Import Project="$(MSBuildProjectName).deployproj" Condition="Exists(&#39;$(MSBuildProjectName).deployproj&#39;)"/>
<PropertyGroup Condition="&#39;$(Config)&#39;==&#39;Debug&#39; And &#39;$(Platform)&#39;==&#39;Android&#39;">
<PreBuildEvent>&#34;..\..\..\Tools\RJarSwapper\RJarSwapper.bat&#34; -RJarDir=&#34;android\Merged\libs\&#34; -IsAabPackage=&#34;false&#34;</PreBuildEvent>
<PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
<PreLinkEvent/>
<PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
<PostBuildEvent/>
<PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
</PropertyGroup>
<PropertyGroup Condition="&#39;$(Config)&#39;==&#39;Debug&#39; And &#39;$(Platform)&#39;==&#39;Android64&#39;">
<PreBuildEvent>&#34;..\..\..\Tools\RJarSwapper\RJarSwapper.bat&#34; -RJarDir=&#34;android\Merged\libs\&#34; -IsAabPackage=&#34;false&#34;</PreBuildEvent>
<PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
<PreLinkEvent/>
<PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
<PostBuildEvent/>
<PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
</PropertyGroup>
<PropertyGroup Condition="&#39;$(Config)&#39;==&#39;Release&#39; And &#39;$(Platform)&#39;==&#39;Android&#39;">
<PreBuildEvent>&#34;..\..\..\Tools\RJarSwapper\RJarSwapper.bat&#34; -RJarDir=&#34;android\Merged\libs\&#34; -IsAabPackage=&#34;true&#34;</PreBuildEvent>
<PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
<PreLinkEvent/>
<PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
<PostBuildEvent/>
<PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
</PropertyGroup>
<PropertyGroup Condition="&#39;$(Config)&#39;==&#39;Release&#39; And &#39;$(Platform)&#39;==&#39;Android64&#39;">
<PreBuildEvent>&#34;..\..\..\Tools\RJarSwapper\RJarSwapper.bat&#34; -RJarDir=&#34;android\Merged\libs\&#34; -IsAabPackage=&#34;true&#34;</PreBuildEvent>
<PreBuildEventIgnoreExitCode>False</PreBuildEventIgnoreExitCode>
<PreLinkEvent/>
<PreLinkEventIgnoreExitCode>False</PreLinkEventIgnoreExitCode>
<PostBuildEvent/>
<PostBuildEventIgnoreExitCode>False</PostBuildEventIgnoreExitCode>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Demos/ALAnimation/_Source/android/MergeLibraries.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set ALBaseDir=%~dp0
-LocalMavenRepositoryDir="%ALBaseDir%\..\..\..\..\Libraries\jar\"^
-Libraries="%ALBaseDir%\App\"^
-OutputDir="%ALBaseDir%\Merged"^
-DProj="%ALBaseDir%\..\ALFmxFilterEffectsDemo.dproj"^
-DProj="%ALBaseDir%\..\ALAnimationDemo.dproj"^
-AndroidManifest="%ALBaseDir%\..\AndroidManifest.template.xml"^
-DProjNormalizer="%ALBaseDir%\..\..\..\..\Tools\DProjNormalizer\DProjNormalizer.exe"^
-RJarSwapper="%ALBaseDir%\..\..\..\..\Tools\RJarSwapper\RJarSwapper.bat"^
Expand Down
Binary file modified ...ebookLogin/_Source/android/Merged/libs/32bit/com.alcinoe-alcinoe-facebook-share-1.0.0.jar
View file
Binary file not shown.
Binary file modified Demos/ALFacebookLogin/_Source/android/Merged/libs/32bit/r.jar
View file
Binary file not shown.
Binary file modified ...ebookLogin/_Source/android/Merged/libs/64bit/com.alcinoe-alcinoe-facebook-share-1.0.0.jar
View file
Binary file not shown.
Binary file modified Demos/ALFacebookLogin/_Source/android/Merged/libs/64bit/r.jar
View file
Binary file not shown.
Binary file modified Demos/ALFacebookLogin/_Source/android/Merged/libs/r-aab.jar
View file
Binary file not shown.
Binary file modified Demos/ALFacebookLogin/_Source/android/Merged/libs/r-apk.jar
View file
Binary file not shown.
56 changes: 52 additions & 4 deletions Demos/ALFmxControls/_Source/ALFmxControls.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@
<JavaReference Include="android\Merged\libs\32bit\androidx.versionedparcelable-versionedparcelable-1.1.1.jar">
<ContainerId>ClassesdexFile</ContainerId>
</JavaReference>
<JavaReference Include="android\Merged\libs\32bit\com.alcinoe-alcinoe-common-1.0.0.jar">
<JavaReference Include="android\Merged\libs\32bit\com.alcinoe-alcinoe-common-1.0.1.jar">
<ContainerId>ClassesdexFile</ContainerId>
</JavaReference>
<JavaReference Include="android\Merged\libs\32bit\com.alcinoe-alcinoe-datepicker-1.0.0.jar">
Expand Down Expand Up @@ -536,7 +536,7 @@
<JavaReference Include="android\Merged\libs\64bit\androidx.versionedparcelable-versionedparcelable-1.1.1.jar">
<ContainerId>ClassesdexFile64</ContainerId>
</JavaReference>
<JavaReference Include="android\Merged\libs\64bit\com.alcinoe-alcinoe-common-1.0.0.jar">
<JavaReference Include="android\Merged\libs\64bit\com.alcinoe-alcinoe-common-1.0.1.jar">
<ContainerId>ClassesdexFile64</ContainerId>
</JavaReference>
<JavaReference Include="android\Merged\libs\64bit\com.alcinoe-alcinoe-datepicker-1.0.0.jar">
Expand Down Expand Up @@ -641,6 +641,54 @@
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="4">
<DeployFile Class="AndroidSplashImageDef" Configuration="Debug" LocalName="Android64\Debug\splash_image_def.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashImageDef" Configuration="Debug" LocalName="Android\Debug\splash_image_def.xml">
<Platform Name="Android">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashImageDef" Configuration="Release" LocalName="Android64\Release\splash_image_def.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashImageDef" Configuration="Release" LocalName="Android\Release\splash_image_def.xml">
<Platform Name="Android">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashStyles" Configuration="Debug" LocalName="Android64\Debug\styles.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashStyles" Configuration="Debug" LocalName="Android\Debug\styles.xml">
<Platform Name="Android">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashStyles" Configuration="Release" LocalName="Android64\Release\styles.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashStyles" Configuration="Release" LocalName="Android\Release\styles.xml">
<Platform Name="Android">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile Class="AndroidSplashStylesV21" Configuration="Debug" LocalName="Android64\Debug\styles-v21.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
Expand Down Expand Up @@ -669,7 +717,7 @@
<RemoteName>styles.xml</RemoteName>
</Platform>
</DeployFile>
<DeployFile Class="Android_Colors" Configuration="Debug" LocalName="..\Android64\Debug\colors.xml">
<DeployFile Class="Android_Colors" Configuration="Debug" LocalName="Android64\Debug\colors.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
Expand Down Expand Up @@ -1113,7 +1161,7 @@
<RemoteName>splash_image.png</RemoteName>
</Platform>
</DeployFile>
<DeployFile Class="Android_Strings" Configuration="Debug" LocalName="..\Android64\Debug\strings.xml">
<DeployFile Class="Android_Strings" Configuration="Debug" LocalName="Android64\Debug\strings.xml">
<Platform Name="Android64">
<Enabled>false</Enabled>
<Overwrite>true</Overwrite>
Expand Down
2 changes: 1 addition & 1 deletion Demos/ALFmxControls/_Source/android/MergeLibraries.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set ALBaseDir=%~dp0
set Libraries=%ALBaseDir%\App\
set Libraries=%Libraries%;com.alcinoe:alcinoe-edittext:1.0.0
set Libraries=%Libraries%;com.alcinoe:alcinoe-datepicker:1.0.0
set Libraries=%Libraries%;com.alcinoe:alcinoe-common:1.0.0
set Libraries=%Libraries%;com.alcinoe:alcinoe-common:1.0.1
set Libraries=%Libraries%;com.google.android.exoplayer:exoplayer-core:2.18.2
set Libraries=%Libraries%;com.google.android.exoplayer:exoplayer-hls:2.18.2

Expand Down
Binary file removed Demos/ALFmxControls/_Source/android/Merged/libs/32bit/com.alcinoe-alcinoe-common-1.0.0.jar
View file
Binary file not shown.
Binary file added Demos/ALFmxControls/_Source/android/Merged/libs/32bit/com.alcinoe-alcinoe-common-1.0.1.jar
View file
Binary file not shown.
Binary file modified .../ALFmxControls/_Source/android/Merged/libs/32bit/com.alcinoe-alcinoe-datepicker-1.0.0.jar
View file
Binary file not shown.
Binary file modified Demos/ALFmxControls/_Source/android/Merged/libs/32bit/com.alcinoe-alcinoe-edittext-1.0.0.jar
View file
Binary file not shown.
Binary file modified Demos/ALFmxControls/_Source/android/Merged/libs/32bit/r.jar
View file
Binary file not shown.
Binary file removed Demos/ALFmxControls/_Source/android/Merged/libs/64bit/com.alcinoe-alcinoe-common-1.0.0.jar
View file
Binary file not shown.
Binary file added Demos/ALFmxControls/_Source/android/Merged/libs/64bit/com.alcinoe-alcinoe-common-1.0.1.jar
View file
Binary file not shown.
Binary file modified .../ALFmxControls/_Source/android/Merged/libs/64bit/com.alcinoe-alcinoe-datepicker-1.0.0.jar
View file
Binary file not shown.
Binary file modified Demos/ALFmxControls/_Source/android/Merged/libs/64bit/com.alcinoe-alcinoe-edittext-1.0.0.jar
View file
Binary file not shown.
Binary file modified Demos/ALFmxControls/_Source/android/Merged/libs/64bit/r.jar
View file
Binary file not shown.
Binary file modified Demos/ALFmxControls/_Source/android/Merged/libs/r-aab.jar
View file
Binary file not shown.
Binary file modified Demos/ALFmxControls/_Source/android/Merged/libs/r-apk.jar
View file
Binary file not shown.
Loading

0 comments on commit d7d8005

Please sign in to comment.