Add files via upload

Author: pyhoon

Web API Client (1.05).b4xtemplate

@@ -13,21 +13,21 @@ Group=Default Group
 Library1=b4xpages
 Library2=b4xpreferencesdialog
 Library3=core
-Library4=okhttputils2
-Library5=xui views
-Library6=ime
-ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="30"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true" ~\n~    android:smallScreens="true" ~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~'End of default text.~\n~SetActivityAttribute(main, android:windowSoftInputMode, adjustResize|stateHidden)~\n~CreateResourceFromFile(Macro, Core.NetworkClearText) ' Comment this if using https protocol
+Library4=ime
+Library5=okhttputils2
+Library6=xui views
+ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="31"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true" ~\n~    android:smallScreens="true" ~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~'End of default text.~\n~SetActivityAttribute(main, android:windowSoftInputMode, adjustResize|stateHidden)~\n~CreateResourceFromFile(Macro, Core.NetworkClearText) ' Comment this if using https protocol
 Module1=|relative|..\B4XMainPage
 Module2=Starter
 NumberOfFiles=5
 NumberOfLibraries=6
 NumberOfModules=2
-Version=11.5
+Version=12.2
 @EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Web API Client
-	#VersionCode: 4
-	#VersionName: 1.0.3
+	#VersionCode: 6
+	#VersionName: 1.0.5
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
@@ -92,9 +92,6 @@ End Sub
 public boolean _onCreateOptionsMenu(android.view.Menu menu) {
 	 processBA.raiseEvent(null, "create_menu", menu);
 	 return true;
-	
 }
 #End If
-#End Region
-
-'Program code should go into B4XMainPage and other pages.
+#End Region

Web API Client/B4A/$APPNAME$.b4a

@@ -10,30 +10,25 @@ Version=9.85
 #End Region
 
 Sub Process_Globals
-	'These global variables will be declared once when the application starts.
-	'These variables can be accessed from all modules.
 
 End Sub
 
 Sub Service_Create
-	'This is the program entry point.
-	'This is a good place to load resources that are not specific to a single activity.
 
 End Sub
 
 Sub Service_Start (StartingIntent As Intent)
-	Service.StopAutomaticForeground 'Starter service can start in the foreground state in some edge cases.
+	Service.StopAutomaticForeground
 End Sub
 
 Sub Service_TaskRemoved
-	'This event will be raised when the user removes the app from the recent apps list.
+
 End Sub
 
-'Return true to allow the OS default exceptions handler to handle the uncaught exception.
 Sub Application_Error (Error As Exception, StackTrace As String) As Boolean
 	Return True
 End Sub
 
 Sub Service_Destroy
 
-End Sub
+End Sub

Web API Client/B4A/Starter.bas

@@ -17,15 +17,15 @@ Library1=b4xpages
 Library2=b4xpreferencesdialog
 Library3=jcore
 Library4=jfx
-Library5=xui views
-Library6=jokhttputils2
+Library5=jokhttputils2
+Library6=xui views
 Module1=|relative|..\B4XMainPage
 NumberOfFiles=6
 NumberOfLibraries=6
 NumberOfModules=1
-Version=9.5
+Version=9.8
 @EndOfDesignText@
-' Version 1.0.3
+' Version 1.0.5
 #Region Project Attributes 
 	#MainFormWidth: 600
 	#MainFormHeight: 600 

Web API Client/B4J/$APPNAME$.b4j

@@ -14,7 +14,7 @@ Version=9.85
 Sub Class_Globals
 	Private Root As B4XView
 	Private xui As XUI
-	Private URL As String = "http://192.168.0.3:19800/v1/" ' Change to your Web API Server URL
+	Private URL As String = "http://192.168.50.42:19800/v1/" ' Change to your Web API Server URL
 	Private lblTitle As B4XView
 	Private lblBack As B4XView
 	Private clvRecord As CustomListView
@@ -40,7 +40,6 @@ Public Sub Initialize
 '	B4XPages.GetManager.LogEvents = True
 End Sub
 
-'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
 	Root = Root1
 	Root.LoadLayout("MainPage")
@@ -71,7 +70,7 @@ Private Sub IME_HeightChanged (NewHeight As Int, OldHeight As Int)
 	PrefDialog3.KeyboardHeightChanged(NewHeight)
 End Sub
 
-#If B4j
+#If B4J
 Private Sub SetScrollPaneBackgroundColor(View As CustomListView, Color As Int)
 	Dim SP As JavaObject = View.GetBase.GetView(0)
 	Dim V As B4XView = SP
@@ -104,7 +103,7 @@ End Sub
 Private Sub GetCategories
 	Try
 		Dim i As Long
-		Dim sd As Object = SendData("GET", "category", Null)
+		Dim sd As Object = SendData("GET", "categories", Null)
 		Wait For (sd) Complete (Data As Map)
 		If Data.Get("s") = "ok" Then
 			Dim Items As List = Data.Get("r")
@@ -135,7 +134,7 @@ End Sub
 
 Private Sub GetProducts
 	clvRecord.Clear
-	Dim sd As Object = SendData("GET", $"category/${CategoryId}/product"$, Null)
+	Dim sd As Object = SendData("GET", $"find/product/cid/${CategoryId}"$, Null)
 	Wait For (sd) Complete (Data As Map)
 	If Data.Get("s") = "ok" Then
 		If 204 = Data.Get("a") Then
@@ -146,8 +145,6 @@ Private Sub GetProducts
 				clvRecord.Add(CreateProductItems(Item.Get("product_code"), GetCategoryName(Item.Get("category_id")), Item.Get("product_name"), NumberFormat2(Item.Get("product_price"), 1, 2, 2, True), clvRecord.AsView.Width), Item.Get("id"))
 			Next
 		End If
-	Else
-		xui.MsgboxAsync(Data.Get("e"), "Error")
 	End If
 	Viewing = "Product"
 	lblTitle.Text = GetCategoryName(CategoryId)
@@ -268,10 +265,10 @@ Private Sub ShowDialog1 (Action As String, Item As Map)
 	If Result = xui.DialogResponse_Positive Then
 		If 0 = Item.Get("id") Then ' New row
 			Dim CategoryMap As Map = CreateMap("name": Item.Get("Category Name"))
-			Dim sd As Object = SendData("POST", "category", CategoryMap)
+			Dim sd As Object = SendData("POST", "categories", CategoryMap)
 			Wait For (sd) Complete (Data As Map)
 			If Data.Get("s") = "ok" Then
-				Log(Data.Get("a")) ' 201 Created
+				'Log(Data.Get("a")) ' 201 Created
 				Dim l As List = Data.Get("r")
 				Dim m As Map = l.Get(0)
 				xui.MsgboxAsync("New category created!", $"ID: ${m.Get("id")}"$)
@@ -281,7 +278,7 @@ Private Sub ShowDialog1 (Action As String, Item As Map)
 			End If
 		Else
 			Dim CategoryMap As Map = CreateMap("name": Item.Get("Category Name"))
-			Dim sd As Object = SendData("PUT", $"category/${Item.Get("id")}"$, CategoryMap)
+			Dim sd As Object = SendData("PUT", $"categories/${Item.Get("id")}"$, CategoryMap)
 			Wait For (sd) Complete (Data As Map)
 			If Data.Get("s") = "ok" Then
 				xui.MsgboxAsync("Category updated!", "Edit")
@@ -309,8 +306,8 @@ Private Sub ShowDialog2 (Action As String, Item As Map)
 	If Result = xui.DialogResponse_Positive Then
 		If 0 = Item.Get("id") Then ' New row
 			CategoryId = GetCategoryId(Item.Get("Category"))
-			Dim ProductMap As Map = CreateMap("code": Item.Get("Product Code"), "name": Item.Get("Product Name"), "price": Item.Get("Product Price"))
-			Dim sd As Object = SendData("POST", $"category/${CategoryId}/product"$, ProductMap)
+			Dim ProductMap As Map = CreateMap("cat_id": CategoryId, "code": Item.Get("Product Code"), "name": Item.Get("Product Name"), "price": Item.Get("Product Price"))
+			Dim sd As Object = SendData("POST", $"products"$, ProductMap)
 			Wait For (sd) Complete (Data As Map)
 			If Data.Get("s") = "ok" Then
 				'Log(Data.Get("a")) ' 201 Created
@@ -323,7 +320,7 @@ Private Sub ShowDialog2 (Action As String, Item As Map)
 		Else
 			Dim NewCategoryId As Long = GetCategoryId(Item.Get("Category"))
 			Dim ProductMap As Map = CreateMap("cat_id": NewCategoryId, "code": Item.Get("Product Code"), "name": Item.Get("Product Name"), "price": Item.Get("Product Price"))
-			Dim sd As Object = SendData("PUT", $"category/${CategoryId}/product/${Item.Get("id")}"$, ProductMap)
+			Dim sd As Object = SendData("PUT", $"products/${Item.Get("id")}"$, ProductMap)
 			Wait For (sd) Complete (Data As Map)
 			If Data.Get("s") = "ok" Then
 				xui.MsgboxAsync("Product updated!", "Edit")
@@ -340,16 +337,16 @@ End Sub
 
 Private Sub PrefDialog2_BeforeDialogDisplayed (Template As Object)
 	Try
-	' Fix Linux UI (Long Text Button)
-	Dim btnCancel As B4XView = PrefDialog2.Dialog.GetButton(xui.DialogResponse_Cancel)
-	btnCancel.Width = btnCancel.Width + 20dip
-	btnCancel.Left = btnCancel.Left - 20dip
-	btnCancel.TextColor = xui.Color_Red
-	Dim btnOk As B4XView = PrefDialog2.Dialog.GetButton(xui.DialogResponse_Positive)
-	If btnOk.IsInitialized Then
-		btnOk.Width = btnOk.Width + 20dip
-		btnOk.Left = btnCancel.Left - btnOk.Width
-	End If		
+		' Fix Linux UI (Long Text Button)
+		Dim btnCancel As B4XView = PrefDialog2.Dialog.GetButton(xui.DialogResponse_Cancel)
+		btnCancel.Width = btnCancel.Width + 20dip
+		btnCancel.Left = btnCancel.Left - 20dip
+		btnCancel.TextColor = xui.Color_Red
+		Dim btnOk As B4XView = PrefDialog2.Dialog.GetButton(xui.DialogResponse_Positive)
+		If btnOk.IsInitialized Then
+			btnOk.Width = btnOk.Width + 20dip
+			btnOk.Left = btnCancel.Left - btnOk.Width
+		End If
 	Catch
 		Log(LastException)
 	End Try
@@ -374,19 +371,19 @@ Private Sub ShowDialog3 (Item As Map, Id As Long)
 	Dim btnOk As B4XView = PrefDialog3.Dialog.GetButton(xui.DialogResponse_Positive)
 	btnOk.Left = btnOk.Left - 20dip
 	PrefDialog3.CustomListView1.GetPanel(0).GetView(0).Text = Item.Get("Item")
-	#if b4i
+	#If B4i
 	PrefDialog3.CustomListView1.GetPanel(0).GetView(0).TextSize = 16 ' Text too small in ios
-	#else
+	#Else
 	PrefDialog3.CustomListView1.GetPanel(0).GetView(0).TextSize = 15 ' 14
 	#End If
 	PrefDialog3.CustomListView1.GetPanel(0).GetView(0).Color = xui.Color_Transparent
 	PrefDialog3.CustomListView1.sv.ScrollViewInnerPanel.Color = xui.Color_Transparent
 	Wait For (sf) Complete (Result As Int)
 	If Result = xui.DialogResponse_Positive Then
 		If Viewing = "Product" Then
-			Dim sd As Object = SendData("DELETE", $"category/${CategoryId}/product/${Id}"$, Null)
+			Dim sd As Object = SendData("DELETE", $"products/${Id}"$, Null)
 		Else
-			Dim sd As Object = SendData("DELETE", $"category/${CategoryId}"$, Null)
+			Dim sd As Object = SendData("DELETE", $"categories/${CategoryId}"$, Null)
 		End If
 		Wait For (sd) Complete (Data As Map)
 		If Data.Get("s") = "ok" Then
@@ -456,31 +453,19 @@ Sub SendData (Method As String, EndPoint As String, Payload As Map) As Resumable
 		'Log("Link:" & Link)
 		indLoading.Show
 		j.Initialize("", Me)
-		Select Case Method.ToUpperCase
+		Select Method.ToUpperCase
 			Case "POST"
-				#if b4i
-				j.PostString(Link, Map2JSON(Payload)) ' old version of B4i
-				#else
 				j.PostString(Link, Payload.As(JSON).ToString)
-				#End If
 			Case "PUT"
-				#if b4i
-				j.PutString(Link, Map2JSON(Payload)) ' old version of B4i
-				#else
 				j.PutString(Link, Payload.As(JSON).ToString)
-				#End If
 			Case "DELETE"
 				j.Delete(Link)
 			Case Else ' GET
 				j.Download(Link)
 		End Select
 		Wait For (j) JobDone(j As HttpJob)
 		If j.Success Then
-			#if b4i
-			Data = JSON2Map(j.GetString) ' old version of B4i
-			#else
 			Data = j.GetString.As(JSON).ToMap 'ignore
-			#End If
 			Data.Put("a", j.Response.StatusCode)
 			#if B4J
 			lblStatus.Text = "Connected to " & URL
@@ -490,11 +475,7 @@ Sub SendData (Method As String, EndPoint As String, Payload As Map) As Resumable
 			lblStatus.TextColor = xui.Color_White
 		Else
 			If j.ErrorMessage.Contains($""s": "error""$) Then
-				#if b4i
-				Data = JSON2Map(j.ErrorMessage) ' old version of B4i
-				#else
 				Data = j.ErrorMessage.As(JSON).ToMap 'ignore
-				#End If
 				Data.Put("a", j.Response.StatusCode)
 			Else
 				Data = CreateMap("s": "error", "e": j.ErrorMessage, "m": "")
@@ -517,20 +498,4 @@ Sub SendData (Method As String, EndPoint As String, Payload As Map) As Resumable
 	j.Release
 	indLoading.Hide
 	Return Data
-End Sub
-
-#if b4i
-Private Sub Map2JSON (Map As Map) As String
-	Dim gen As JSONGenerator
-	gen.Initialize(Map)
-	Return gen.ToString
-End Sub
-
-Private Sub JSON2Map (str As String) As Map
-	Dim par As JSONParser
-	par.Initialize(str)
-	Dim m As Map = par.NextObject
-	Dim ser As B4XSerializator
-	Return ser.ConvertBytesToObject(ser.ConvertObjectToBytes(m)) ' convert map to writable map in B4i
-End Sub
-#End If
+End Sub

Web API Client/B4XMainPage.bas

@@ -14,18 +14,18 @@ Library1=b4xpages
 Library2=b4xpreferencesdialog
 Library3=icore
 Library4=ihttputils2
-Library5=xui views
-Library6=ijson
+Library5=ijson
+Library6=xui views
 Module1=|relative|..\B4XMainPage
 NumberOfFiles=5
 NumberOfLibraries=6
 NumberOfModules=1
-Version=7.8
+Version=8.1
 @EndOfDesignText@
 'Code module
 #Region  Project Attributes 
 	#ApplicationLabel: Web API Client
-	#Version: 1.0.3
+	#Version: 1.0.5
 	'Orientation possible values: Portrait, LandscapeLeft, LandscapeRight and PortraitUpsideDown
 	#iPhoneOrientations: Portrait, LandscapeLeft, LandscapeRight
 	#iPadOrientations: Portrait, LandscapeLeft, LandscapeRight, PortraitUpsideDown
@@ -40,6 +40,7 @@ Version=7.8
 	#CertificateFile: ios_development.cer
 	#ProvisionFile: development.mobileprovision
 #End If
+
 Sub Process_Globals
 	Public App As Application
 	Public NavControl As NavigationController