Version 1.5

Fixed bug in MobileHTMLViewer due to changes in Android Declare engine in 2023r3 Additions to MobilePopupMenu Additions to MobileScrollableArea Additions to MobileSwitch Additions to MobileTextArea Additions to MobileTextField
XojoGermany · Oct 10, 2023 · 17a3b46 · 17a3b46
1 parent 2046feb
commit 17a3b46
Show file tree

Hide file tree

Showing 19 changed files with 768 additions and 11 deletions.
diff --git a/AndroidDesignExtensions.xojo_project b/AndroidDesignExtensions.xojo_project
@@ -1,5 +1,5 @@
 Type=Mobile
-RBProjectVersion=2023.02
+RBProjectVersion=2023.03
 MinIDEVersion=20190200
 OrigIDEVersion=20230200
 Class=App;App.xojo_code;&h000000001ED647FF;&h0000000000000000;false
@@ -40,6 +40,8 @@ Module=ExtensionsXC;AndroidDesignExtensions/ExtensionsXC.xojo_code;&h00000000678
 Module=HTMLViewerXC;AndroidDesignExtensions/HTMLViewerXC.xojo_code;&h00000000594D07FF;&h000000004BEA7FFF;false
 Module=ImageViewerXC;AndroidDesignExtensions/ImageViewerXC.xojo_code;&h000000002435A7FF;&h000000004BEA7FFF;false
 Module=LabelXC;AndroidDesignExtensions/LabelXC.xojo_code;&h000000007692BFFF;&h000000004BEA7FFF;false
+Module=MoviePlayerXC;AndroidDesignExtensions/MoviePlayerXC.xojo_code;&h0000000078D1C7FF;&h000000004BEA7FFF;false
+Module=PopupMenuXC;AndroidDesignExtensions/PopupMenuXC.xojo_code;&h000000001E123FFF;&h000000004BEA7FFF;false
 Module=ProgressBarXC;AndroidDesignExtensions/ProgressBarXC.xojo_code;&h000000006B098FFF;&h000000004BEA7FFF;false
 Module=ScreenXC;AndroidDesignExtensions/ScreenXC.xojo_code;&h000000005D140FFF;&h000000004BEA7FFF;false
 Module=ScrollableAreaXC;AndroidDesignExtensions/ScrollableAreaXC.xojo_code;&h000000007696EFFF;&h000000004BEA7FFF;false
@@ -90,6 +92,7 @@ MobileThemeColorName=Custom
 MobileThemePrimaryColor=&h00419CFF
 MobileThemeStatusBarColor=&h00F2F2F7
 MobileThemeAccentColor=&h000A84FF
+ManifestPermissions=
 BuildForPlayStore=False
 KeyStoreFile=
 MacBuildArchitecture=1

diff --git a/AndroidDesignExtensions/ApplicationXC.xojo_code b/AndroidDesignExtensions/ApplicationXC.xojo_code
@@ -1,5 +1,6 @@
 #tag Module
 Protected Module ApplicationXC
+	#tag CompatibilityFlags = (TargetAndroid and (Target64Bit))
 	#tag Method, Flags = &h0, Description = 436C61737320696D706C656D656E74696E6720746865204170706C69636174696F6E206F626A6563742E2046726F6D207468652022636C61737322206174747269627574652E
 		Function ClassNameXC(Extends myApp As MobileApplication) As String
 		  #Pragma Unused myApp

diff --git a/AndroidDesignExtensions/DeviceXC.xojo_code b/AndroidDesignExtensions/DeviceXC.xojo_code
@@ -1,5 +1,6 @@
 #tag Module
 Protected Module DeviceXC
+	#tag CompatibilityFlags = (TargetAndroid and (Target64Bit))
 	#tag Method, Flags = &h0, Description = 47657473207468652075696420666F722074686973206465766963652E
 		Function GetUidXC() As Integer
 		  #If TargetAndroid

diff --git a/AndroidDesignExtensions/ExtensionsXC.xojo_code b/AndroidDesignExtensions/ExtensionsXC.xojo_code
@@ -1,6 +1,6 @@
 #tag Module
 Protected Module ExtensionsXC
-	#tag CompatibilityFlags = ( TargetConsole and ( Target32Bit or Target64Bit ) ) or ( TargetWeb and ( Target32Bit or Target64Bit ) ) or ( TargetDesktop and ( Target32Bit or Target64Bit ) ) or ( TargetIOS and ( Target64Bit ) ) or ( TargetAndroid and ( Target64Bit ) )
+	#tag CompatibilityFlags = (TargetAndroid and (Target64Bit))
 	#tag Method, Flags = &h0, Description = 4368616E67652074686520766965772773207A206F7264657220696E2074686520747265652C20736F2069742773206F6E20746F70206F66206F74686572207369626C696E672076696577732E2054686973206F72646572696E67206368616E6765206D617920616666656374206C61796F75742C2069662074686520706172656E7420636F6E7461696E6572207573657320616E206F726465722D646570656E64656E74206C61796F757420736368656D652028652E672E2C204C696E6561724C61796F7574292E205072696F7220746F204275696C642E56455253494F4E5F434F4445532E4B49544B41542074686973206D6574686F642073686F756C6420626520666F6C6C6F7765642062792063616C6C7320746F20726571756573744C61796F7574282920616E64205669657723696E76616C69646174652829206F6E207468652076696577277320706172656E7420746F20666F7263652074686520706172656E7420746F20726564726177207769746820746865206E6577206368696C64206F72646572696E672E
 		Sub BringToFrontXC(Extends ctrl As MobileUIControl)
 		  #Pragma Unused ctrl

diff --git a/AndroidDesignExtensions/HTMLViewerXC.xojo_code b/AndroidDesignExtensions/HTMLViewerXC.xojo_code
@@ -135,7 +135,7 @@ Protected Module HTMLViewerXC
 
 		    #Else
 
-		      Declare Sub findAllAsync Lib "Object:ctrl:MobileHTMLViewer" Alias "findAllAsync(myfind.toString())}//" (myFind As CString)
+		      Declare Sub findAllAsync Lib "Object:ctrl:MobileHTMLViewer:Kotlin" Alias "findAllAsync(myfind.toString())" (myFind As CString)
 
 		    #EndIf
 
@@ -813,7 +813,7 @@ Protected Module HTMLViewerXC
 
 		    #Else
 
-		      Declare Sub saveWebArchive Lib "Object:ctrl:MobileHTMLViewer" Alias "saveWebArchive(myfilename.toString())}//" (myFilename As CString)
+		      Declare Sub saveWebArchive Lib "Object:ctrl:MobileHTMLViewer:Kotlin" Alias "saveWebArchive(myfilename.toString())" (myFilename As CString)
 
 		    #EndIf
 

diff --git a/AndroidDesignExtensions/LabelXC.xojo_code b/AndroidDesignExtensions/LabelXC.xojo_code
@@ -32,7 +32,7 @@ Protected Module LabelXC
 	#tag EndMethod
 
 	#tag Method, Flags = &h0, Description = 53657473207468652072696768742D68616E6420636F6D706F756E64206472617761626C65206F662074686520546578745669657720746F2074686520226572726F72222069636F6E20616E64207365747320616E206572726F72206D65737361676520746861742077696C6C20626520646973706C6179656420696E206120706F707570207768656E207468652054657874566965772068617320666F6375732E205468652069636F6E20616E64206572726F72206D6573736167652077696C6C20626520726573657420746F206E756C6C207768656E20616E79206B6579206576656E7473206361757365206368616E67657320746F20746865205465787456696577277320746578742E20496620746865206572726F72206973206E756C6C2C20746865206572726F72206D65737361676520616E642069636F6E2077696C6C20626520636C65617265642E
-		Sub SetErrorXC(Extends ctrl As MobileLabel, error As String)
+		Sub SetErrorXC(Extends ctrl As MobileLabel, error As CString)
 		  #Pragma Unused ctrl
 
 		  #If TargetAndroid

diff --git a/AndroidDesignExtensions/MoviePlayerXC.xojo_code b/AndroidDesignExtensions/MoviePlayerXC.xojo_code
@@ -0,0 +1,217 @@
+#tag Module
+Protected Module MoviePlayerXC
+	#tag CompatibilityFlags = (TargetAndroid and (Target64Bit))
+	#tag Method, Flags = &h0
+		Function CanPauseXC(Extends ctrl As MobileMoviePlayer) As Boolean
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Function canPause Lib "Object:ctrl:MobileMoviePlayer" As Boolean
+		    Return canPause
+
+		  #EndIf
+		End Function
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Function CanSeekBackwardXC(Extends ctrl As MobileMoviePlayer) As Boolean
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Function canSeekBackward Lib "Object:ctrl:MobileMoviePlayer" As Boolean
+		    Return canSeekBackward
+
+		  #EndIf
+		End Function
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Function CanSeekForwardXC(Extends ctrl As MobileMoviePlayer) As Boolean
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Function canSeekForward Lib "Object:ctrl:MobileMoviePlayer" As Boolean
+		    Return canSeekForward
+
+		  #EndIf
+		End Function
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Function GetBufferPercentageXC(Extends ctrl As MobileMoviePlayer) As Integer
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Function getBufferPercentage Lib "Object:ctrl:MobileMoviePlayer" As Integer
+		    Return getBufferPercentage
+
+		  #EndIf
+		End Function
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Function GetCurrentPositionXC(Extends ctrl As MobileMoviePlayer) As Integer
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Function getCurrentPosition Lib "Object:ctrl:MobileMoviePlayer" As Integer
+		    Return getCurrentPosition
+
+		  #EndIf
+		End Function
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Function IsPlayingXC(Extends ctrl As MobileMoviePlayer) As Boolean
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Function isPlaying Lib "Object:ctrl:MobileMoviePlayer" As Boolean
+		    Return isPlaying
+
+		  #EndIf
+		End Function
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Function ResolveAdjustedSizeXC(Extends ctrl As MobileMoviePlayer, desiredSize As Integer, measureSpec As Integer) As Integer
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Function resolveAdjustedSize Lib "Object:ctrl:MobileMoviePlayer" (myDesiredSize As Integer, myMeasureSpec As Integer) As Integer
+		    Return resolveAdjustedSize(desiredSize, measureSpec)
+
+		  #Else
+
+		    #Pragma Unused desiredSize
+		    #Pragma Unused measureSpec
+
+		  #EndIf
+		End Function
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Sub ResumeXC(Extends ctrl As MobileMoviePlayer)
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Sub resume Lib "Object:ctrl:MobileMoviePlayer"
+		    resume
+
+		  #EndIf
+		End Sub
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Sub SeekToXC(Extends ctrl As MobileMoviePlayer, msec As Integer)
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Sub seekTo Lib "Object:ctrl:MobileMoviePlayer" (myMsec As Integer)
+		    seekTo(msec)
+
+		  #Else
+
+		    #Pragma Unused msec
+
+		  #EndIf
+		End Sub
+	#tag EndMethod
+
+	#tag Method, Flags = &h0, Description = 536574732077686963682074797065206F6620617564696F20666F6375732077696C6C2062652072657175657374656420647572696E672074686520706C61796261636B2C206F7220636F6E6669677572657320706C61796261636B20746F206E6F74207265717565737420617564696F20666F6375732E2056616C69642076616C75657320666F7220666F6375732072657175657374732061726520417564696F4D616E6167657223415544494F464F4355535F4741494E2C20417564696F4D616E6167657223415544494F464F4355535F4741494E5F5452414E5349454E542C20417564696F4D616E6167657223415544494F464F4355535F4741494E5F5452414E5349454E545F4D41595F4455434B2C20616E6420417564696F4D616E6167657223415544494F464F4355535F4741494E5F5452414E5349454E545F4558434C55534956452E204F722075736520417564696F4D616E6167657223415544494F464F4355535F4E4F4E4520746F2065787072657373207468617420617564696F20666F6375732073686F756C64206E6F7420626520726571756573746564207768656E20706C61796261636B207374617274732E20596F752063616E20666F7220696E7374616E6365207573652074686973207768656E20706C6179696E6720612073696C656E7420616E696D6174696F6E207468726F756768207468697320636C6173732C20616E6420796F7520646F6E27742077616E7420746F20616666656374206F7468657220617564696F206170706C69636174696F6E7320706C6179696E6720696E20746865206261636B67726F756E642E
+		Sub SetAudioFocusRequestXC(Extends ctrl As MobileMoviePlayer, focusGain As Integer)
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Sub setAudioFocusRequest Lib "Object:ctrl:MobileMoviePlayer" (myFocusGain As Integer)
+		    setAudioFocusRequest(focusGain)
+
+		  #Else
+
+		    #Pragma Unused focusGain
+
+		  #EndIf
+		End Sub
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Sub StopPlaybackXC(Extends ctrl As MobileMoviePlayer)
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Sub stopPlayback Lib "Object:ctrl:MobileMoviePlayer"
+		    stopPlayback
+
+		  #EndIf
+		End Sub
+	#tag EndMethod
+
+	#tag Method, Flags = &h0
+		Sub SuspendXC(Extends ctrl As MobileMoviePlayer)
+		  #Pragma Unused ctrl
+
+		  #If TargetAndroid
+
+		    Declare Sub suspend Lib "Object:ctrl:MobileMoviePlayer"
+		    suspend
+
+		  #EndIf
+		End Sub
+	#tag EndMethod
+
+
+	#tag ViewBehavior
+		#tag ViewProperty
+			Name="Name"
+			Visible=true
+			Group="ID"
+			InitialValue=""
+			Type="String"
+			EditorType=""
+		#tag EndViewProperty
+		#tag ViewProperty
+			Name="Index"
+			Visible=true
+			Group="ID"
+			InitialValue="-2147483648"
+			Type="Integer"
+			EditorType=""
+		#tag EndViewProperty
+		#tag ViewProperty
+			Name="Super"
+			Visible=true
+			Group="ID"
+			InitialValue=""
+			Type="String"
+			EditorType=""
+		#tag EndViewProperty
+		#tag ViewProperty
+			Name="Left"
+			Visible=true
+			Group="Position"
+			InitialValue="0"
+			Type="Integer"
+			EditorType=""
+		#tag EndViewProperty
+		#tag ViewProperty
+			Name="Top"
+			Visible=true
+			Group="Position"
+			InitialValue="0"
+			Type="Integer"
+			EditorType=""
+		#tag EndViewProperty
+	#tag EndViewBehavior
+End Module
+#tag EndModule
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,7 +135,7 @@ Protected Module HTMLViewerXC @@
     		    #Else
-    		      Declare Sub findAllAsync Lib "Object:ctrl:MobileHTMLViewer" Alias "findAllAsync(myfind.toString())}//" (myFind As CString)
+    		      Declare Sub findAllAsync Lib "Object:ctrl:MobileHTMLViewer:Kotlin" Alias "findAllAsync(myfind.toString())" (myFind As CString)
     		    #EndIf
@@ Expand Down Expand Up / @@ -813,7 +813,7 @@ Protected Module HTMLViewerXC @@
     		    #Else
-    		      Declare Sub saveWebArchive Lib "Object:ctrl:MobileHTMLViewer" Alias "saveWebArchive(myfilename.toString())}//" (myFilename As CString)
+    		      Declare Sub saveWebArchive Lib "Object:ctrl:MobileHTMLViewer:Kotlin" Alias "saveWebArchive(myfilename.toString())" (myFilename As CString)
     		    #EndIf
@@ Expand Down @@