diff --git a/Samples/FMX/Demo/Views/Pages/Router4DelphiDemo.View.Pages.Index.fmx b/Samples/FMX/Demo/Views/Pages/Router4DelphiDemo.View.Pages.Index.fmx index 736b05f..f46a4aa 100644 --- a/Samples/FMX/Demo/Views/Pages/Router4DelphiDemo.View.Pages.Index.fmx +++ b/Samples/FMX/Demo/Views/Pages/Router4DelphiDemo.View.Pages.Index.fmx @@ -23,5 +23,11 @@ object PageIndex: TPageIndex TextSettings.HorzAlign = Center Text = 'Home' end + object Button1: TButton + Position.X = 424.000000000000000000 + Position.Y = 408.000000000000000000 + TabOrder = 0 + Text = 'Button1' + end end end diff --git a/Samples/FMX/Demo/Views/Pages/Router4DelphiDemo.View.Pages.Index.pas b/Samples/FMX/Demo/Views/Pages/Router4DelphiDemo.View.Pages.Index.pas index 2015129..dd44f06 100644 --- a/Samples/FMX/Demo/Views/Pages/Router4DelphiDemo.View.Pages.Index.pas +++ b/Samples/FMX/Demo/Views/Pages/Router4DelphiDemo.View.Pages.Index.pas @@ -20,6 +20,7 @@ type TPageIndex = class(TForm, iRouter4DComponent) Layout1: TLayout; Label1: TLabel; + Button1: TButton; private { Private declarations } public @@ -35,6 +36,7 @@ implementation uses Router4D, + Router4D.History, Router4DelphiDemo.Views.Layouts.Main; {$R *.fmx} diff --git a/Samples/FMX/Demo/Views/Router4DelphiDemo.View.Principal.pas b/Samples/FMX/Demo/Views/Router4DelphiDemo.View.Principal.pas index 67d6073..17c703d 100644 --- a/Samples/FMX/Demo/Views/Router4DelphiDemo.View.Principal.pas +++ b/Samples/FMX/Demo/Views/Router4DelphiDemo.View.Principal.pas @@ -30,9 +30,16 @@ uses {$R *.fmx} procedure TViewPrincipal.Animation(aLayout: TFMXObject); +var + aHeigth : Single; begin + aHeigth := TLayout(aLayout).Height; + TLayout(aLayout).Height := 0; + TLayout(aLayout).Align := TAlignLayout.None; + TLayout(aLayout).AnimateFloat('Height', aHeigth, 0.9); TLayout(aLayout).Opacity := 0; - TLayout(aLayout).AnimateFloat('Opacity', 1, 0.2); + TLayout(aLayout).AnimateFloat('Opacity', 1, 0.9); + //TLayout(aLayout).Align := TAlignLayout.Client; end; procedure TViewPrincipal.FormCreate(Sender: TObject); diff --git a/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Cadastros.fmx b/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Cadastros.fmx index ec1abf1..148963a 100644 --- a/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Cadastros.fmx +++ b/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Cadastros.fmx @@ -63,6 +63,17 @@ object PageCadastros: TPageCadastros Size.Height = 25.000000000000000000 Size.PlatformDefault = False end + object Label2: TLabel + StyledSettings = [Family, Style, FontColor] + Position.X = 128.000000000000000000 + Position.Y = 80.000000000000000000 + Size.Width = 201.000000000000000000 + Size.Height = 49.000000000000000000 + Size.PlatformDefault = False + TextSettings.Font.Size = 18.000000000000000000 + Text = 'Label do Leandro' + TabOrder = 0 + end end object Layout4: TLayout Align = Top diff --git a/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Cadastros.pas b/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Cadastros.pas index 622f81f..7247fa2 100644 --- a/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Cadastros.pas +++ b/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Cadastros.pas @@ -29,6 +29,7 @@ type Layout3: TLayout; Rectangle1: TRectangle; Layout4: TLayout; + Label2: TLabel; procedure Button1Click(Sender: TObject); procedure FormCreate(Sender: TObject); private @@ -72,6 +73,9 @@ begin if (aValue.PropString <> '') and (aValue.Key = 'TelaCadastro') then Label1.Text := aValue.PropString; + if (aValue.PropInteger <> 1) then + Label2.Visible := False; + aValue.Free; end; diff --git a/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Principal.pas b/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Principal.pas index 135f72a..1ccb7a4 100644 --- a/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Principal.pas +++ b/Samples/FMX/SimpleDemo/SimpleDemo.View.Page.Principal.pas @@ -52,6 +52,7 @@ begin .PropString( 'Olá Router4D, Seu Cadastro Recebeu as Props' ) + .PropInteger(0) .Key('TelaCadastro') ); end;