LCL-Android-Sqlite: Improves the example to save the data and have better control names

git-svn-id: trunk@39448 -

examples/androidlcl/mainform.lfm

@@ -8,21 +8,21 @@ object form1: Tform1
   ClientWidth = 220
   OnClick = FormClick
   OnCreate = FormCreate
-  OnKeyDown = Button1KeyDown
+  OnKeyDown = btnProgressKeyDown
   OnMouseMove = FormMouseMove
   OnPaint = FormPaint
   LCLVersion = '1.1'
-  object Button1: TButton
+  object btnProgress: TButton
     Left = 96
     Height = 25
     Top = 8
     Width = 116
     Caption = 'Move Progress'
-    OnClick = Button1Click
-    OnKeyDown = Button1KeyDown
-    OnKeyPress = Button1KeyPress
-    OnKeyUp = Button1KeyUp
-    OnUTF8KeyPress = Button1UTF8KeyPress
+    OnClick = btnProgressClick
+    OnKeyDown = btnProgressKeyDown
+    OnKeyPress = btnProgressKeyPress
+    OnKeyUp = btnProgressKeyUp
+    OnUTF8KeyPress = btnProgressUTF8KeyPress
     TabOrder = 0
   end
   object ProgressBar1: TProgressBar
@@ -49,22 +49,22 @@ object form1: Tform1
     Caption = 'CheckBox1'
     TabOrder = 3
   end
-  object Button2: TButton
+  object btnMsgBox: TButton
     Left = 96
     Height = 25
     Top = 160
     Width = 116
     Caption = 'MessageBox'
-    OnClick = Button2Click
+    OnClick = btnMsgBoxClick
     TabOrder = 4
   end
-  object Button3: TButton
+  object btnOpenForm: TButton
     Left = 95
     Height = 25
     Top = 192
     Width = 117
     Caption = 'Open Form2'
-    OnClick = Button3Click
+    OnClick = btnOpenFormClick
     TabOrder = 5
   end
   object Label1: TLabel

examples/androidlcl/mainform.pas

@@ -19,9 +19,9 @@ type
   { Tform1 }
 
   Tform1 = class(TForm)
-    Button1: TButton;
-    Button2: TButton;
-    Button3: TButton;
+    btnProgress: TButton;
+    btnMsgBox: TButton;
+    btnOpenForm: TButton;
     btnShowInfo: TButton;
     CheckBox1: TCheckBox;
     ComboBox1: TComboBox;
@@ -36,14 +36,14 @@ type
     procedure Arrow1MouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure btnShowInfoClick(Sender: TObject);
-    procedure Button1Click(Sender: TObject);
-    procedure Button1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState
+    procedure btnProgressClick(Sender: TObject);
+    procedure btnProgressKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState
       );
-    procedure Button1KeyPress(Sender: TObject; var Key: char);
-    procedure Button1KeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure Button1UTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
-    procedure Button2Click(Sender: TObject);
-    procedure Button3Click(Sender: TObject);
+    procedure btnProgressKeyPress(Sender: TObject; var Key: char);
+    procedure btnProgressKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure btnProgressUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
+    procedure btnMsgBoxClick(Sender: TObject);
+    procedure btnOpenFormClick(Sender: TObject);
     procedure FormClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
@@ -166,14 +166,14 @@ begin
   Device.Vibrate(2000);
 end;
 
-procedure Tform1.Button1Click(Sender: TObject);
+procedure Tform1.btnProgressClick(Sender: TObject);
 var
   sqliteDLL : Pointer;
 begin
 (*  sqliteDLL:=DlOpen('/system/lib/libsqlite.so',RTLD_LAZY);
   DebugLn(IntToHex(PtrUInt(sqliteDLL), 8));
   sqliteDLL:=DlOpen('/data/data/com.pascal.lcltest/lib/libsqlite.so',RTLD_LAZY);*)
-  Button1.Caption := IntToHex(PtrUInt(sqliteDLL), 8);
+  btnProgress.Caption := IntToHex(PtrUInt(sqliteDLL), 8);
   DebugLn('Button1Click');
   ProgressBar1.Position := ProgressBar1.Position + 10;
   DebugLn('Cliboard.AsText='+ClipBoard.AsText);
@@ -184,31 +184,31 @@ begin
 //  Self.AutoAdjustLayout(lapAutoAdjustWithoutHorizontalScrolling, 96, 150, 220, 600);
 end;
 
-procedure Tform1.Button1KeyDown(Sender: TObject; var Key: Word;
+procedure Tform1.btnProgressKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
   DebugLn('[TForm1.Button1KeyDown] '+ LCLProc.DbgsVKCode(Key));
 //  Caption := 'KeyDown ' + LCLProc.DbgsVKCode(Key);
 end;
 
-procedure Tform1.Button1KeyPress(Sender: TObject; var Key: char);
+procedure Tform1.btnProgressKeyPress(Sender: TObject; var Key: char);
 begin
   DebugLn('KeyPress: ' + Key);
 end;
 
-procedure Tform1.Button1KeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+procedure Tform1.btnProgressKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
 begin
   DebugLn('[TForm1.Button1KeyUp] '+ LCLProc.DbgsVKCode(Key));
 //  Caption := 'KeyUp ' + LCLProc.DbgsVKCode(Key);
 end;
 
-procedure Tform1.Button1UTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
+procedure Tform1.btnProgressUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
 begin
   DebugLn('UTF8KeyPress: ' + UTF8Key);
   Caption := UTF8Key;
 end;
 
-procedure Tform1.Button2Click(Sender: TObject);
+procedure Tform1.btnMsgBoxClick(Sender: TObject);
 begin
   Application.OnMessageDialogFinished := @HandleMessageDialogFinished;
   DebugLn('Button2Click A');
@@ -217,7 +217,7 @@ begin
   DebugLn('Button2Click B');
 end;
 
-procedure Tform1.Button3Click(Sender: TObject);
+procedure Tform1.btnOpenFormClick(Sender: TObject);
 begin
   //Form2.Show;
   formsqlite.Show;

examples/androidlcl/nonandroidtest.lpi

@@ -114,10 +114,13 @@
         <FormatVersion Value="1"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
-        <PackageName Value="LCL"/>
+        <PackageName Value="FCL"/>
       </Item1>
+      <Item2>
+        <PackageName Value="LCL"/>
+      </Item2>
     </RequiredPackages>
     <Units Count="4">
       <Unit0>

examples/androidlcl/sqliteform.lfm

@@ -1,19 +1,19 @@
 object formSqlite: TformSqlite
-  Left = 119
+  Left = 154
   Height = 240
-  Top = 244
+  Top = 362
   Width = 257
   Caption = 'formSqlite'
   ClientHeight = 240
   ClientWidth = 257
   LCLVersion = '1.1'
-  object Button1: TButton
+  object btnConnect: TButton
     Left = 8
     Height = 25
     Top = 24
     Width = 112
     Caption = 'Connect'
-    OnClick = Button1Click
+    OnClick = btnConnectClick
     TabOrder = 0
   end
   object DBEdit1: TDBEdit
@@ -54,6 +54,15 @@ object formSqlite: TformSqlite
     OnClick = btnCreateDBClick
     TabOrder = 3
   end
+  object Edit1: TEdit
+    Left = 8
+    Height = 23
+    Top = 136
+    Width = 80
+    ReadOnly = True
+    TabOrder = 4
+    Text = 'Edit1'
+  end
   object SqliteDatasource: TDatasource
     left = 136
     top = 88

examples/androidlcl/sqliteform.pas

@@ -13,13 +13,14 @@ type
   { TformSqlite }
 
   TformSqlite = class(TForm)
-    Button1: TButton;
+    btnConnect: TButton;
     btnCreateDB: TButton;
+    Edit1: TEdit;
     SqliteDatasource: TDatasource;
     DBEdit1: TDBEdit;
     DBNavigator1: TDBNavigator;
     procedure btnCreateDBClick(Sender: TObject);
-    procedure Button1Click(Sender: TObject);
+    procedure btnConnectClick(Sender: TObject);
   private
     { private declarations }
   public
@@ -41,7 +42,7 @@ uses sqlite3ds;
 
 { TformSqlite }
 
-procedure TformSqlite.Button1Click(Sender: TObject);
+procedure TformSqlite.btnConnectClick(Sender: TObject);
 var
   sqlitedb: {$ifdef CPUARM}TSqliteJNIDataset;{$else}TSqlite3Dataset;{$endif}
 begin
@@ -55,6 +56,7 @@ begin
   sqlitedb.TableName := 'TestTable';
   sqlitedb.FieldDefs.Add('FirstFieldStr', ftString);
   sqlitedb.FieldDefs.Add('SecondFieldInt', ftInteger);
+  sqlitedb.SaveOnClose := True;
   sqlitedb.Open();
   SqliteDatasource.DataSet := sqlitedb;
 end;