Skip to content

Commit

Permalink
Athens 12
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeus64 committed Dec 13, 2023
1 parent fa7270d commit 5a9d563
Show file tree
Hide file tree
Showing 18 changed files with 198 additions and 13 deletions.
27 changes: 27 additions & 0 deletions Demos/ALAnimation/_Source/Android/MergeLibraries.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@echo off

set ALBaseDir=%~dp0

set Libraries=%ALBaseDir%\App\

REM Required by fmx.jar, else the app crash at startup with
REM java.lang.NoClassDefFoundError: Failed resolution of: Landroidx/activity/result/contract/ActivityResultContracts$OpenDocument;
set Libraries=%Libraries%;androidx.activity:activity:1.8.1
REM Issue with androidx.activity:activity:1.8.1 transitive dependencies:
REM This library indirectly requires org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 due to one of its transitive dependencies.
REM Additionally, there is another transitive dependency that necessitates org.jetbrains.kotlin:kotlin-stdlib:1.8.22.
REM To resolve this, we are enforcing the use of org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22.
set Libraries=%Libraries%;org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
REM Required else the app crash few seconds after startup with
REM java.lang.NoClassDefFoundError: Failed resolution of: Lcom/google/common/util/concurrent/ListenableFuture;
set Libraries=%Libraries%;com.google.guava:guava:32.1.3-android

"%ALBaseDir%\..\..\..\..\Tools\AndroidMerger\AndroidMerger.exe"^
-LocalMavenRepositoryDir="%ALBaseDir%\..\..\..\..\Libraries\jar\"^
-Libraries="%Libraries%"^
-OutputDir="%ALBaseDir%\Merged"^
-DProj="%ALBaseDir%\..\ALAnimationDemo.dproj"^
-AndroidManifest="%ALBaseDir%\..\AndroidManifest.template.xml"^
-DProjNormalizer="%ALBaseDir%\..\..\..\..\Tools\DProjNormalizer\DProjNormalizer.exe"^
-RJarSwapper="%ALBaseDir%\..\..\..\..\Tools\RJarSwapper\RJarSwapper.bat"^
-UseGradle=true
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"images" : [
<%AppIconImages%>
],
"info" : {
"version" : 1,
"author" : "RAD Studio"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "RAD Studio"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"colors" : [
<%LaunchScreenBackgroundColors%>
],
"info" : {
"version" : 1,
"author" : "RAD Studio"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"images" : [
<%LaunchScreenImages%>
],
"info" : {
"version" : 1,
"author" : "RAD Studio"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreenImage" translatesAutoresizingMaskIntoConstraints="NO" id="uEM-Cj-0ws">
<rect key="frame" x="159" y="405" width="96" height="96"/>
</imageView>
</subviews>
<color key="backgroundColor" name="LaunchScreenBackgroundColor"/>
<constraints>
<constraint firstItem="uEM-Cj-0ws" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="Vvi-3g-k9H"/>
<constraint firstItem="uEM-Cj-0ws" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="eIE-8s-oLP"/>
</constraints>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
<resources>
<image name="LaunchScreenImage" width="96" height="96"/>
<namedColor name="LaunchScreenBackgroundColor">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
13 changes: 0 additions & 13 deletions Demos/ALAnimation/_Source/android/MergeLibraries.bat

This file was deleted.

Binary file not shown.
Binary file not shown.
10 changes: 10 additions & 0 deletions Demos/ALConfetti/_Source/Entitlement.TemplateiOS.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<%getTaskAllowKey%>
<%applicationIdentifier%>
<%pushNotificationKey%>
<%keychainAccessGroups%>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"images" : [
<%AppIconImages%>
],
"info" : {
"version" : 1,
"author" : "RAD Studio"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "RAD Studio"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"colors" : [
<%LaunchScreenBackgroundColors%>
],
"info" : {
"version" : 1,
"author" : "RAD Studio"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"images" : [
<%LaunchScreenImages%>
],
"info" : {
"version" : 1,
"author" : "RAD Studio"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreenImage" translatesAutoresizingMaskIntoConstraints="NO" id="uEM-Cj-0ws">
<rect key="frame" x="159" y="405" width="96" height="96"/>
</imageView>
</subviews>
<color key="backgroundColor" name="LaunchScreenBackgroundColor"/>
<constraints>
<constraint firstItem="uEM-Cj-0ws" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="Vvi-3g-k9H"/>
<constraint firstItem="uEM-Cj-0ws" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="eIE-8s-oLP"/>
</constraints>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
<resources>
<image name="LaunchScreenImage" width="96" height="96"/>
<namedColor name="LaunchScreenBackgroundColor">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
9 changes: 9 additions & 0 deletions Demos/ALConfetti/_Source/info.plist.TemplateiOS.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<%VersionInfoPListKeys%>
<%ExtraInfoPListKeys%>
<%StoryboardInfoPListKey%>
</dict>
</plist>

0 comments on commit 5a9d563

Please sign in to comment.