version 1.1

Fix a calendar bug
rafael-figueiredo-alves · Jun 18, 2022 · f1d373a · f1d373a
1 parent 630cd78
commit f1d373a
Show file tree

Hide file tree

Showing 13 changed files with 14,732 additions and 14,726 deletions.
diff --git a/Android/Release/AndroidManifest.xml b/Android/Release/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="br.DevPegasus.eTasks"
-        android:versionCode="1"
-        android:versionName="1.0"
+        android:versionCode="2"
+        android:versionName="1.1"
         android:installLocation="auto">
 
     <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />

diff --git a/Android/Release/eTasks/AndroidManifest.xml b/Android/Release/eTasks/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="br.DevPegasus.eTasks"
-        android:versionCode="1"
-        android:versionName="1.0"
+        android:versionCode="2"
+        android:versionName="1.1"
         android:installLocation="auto">
 
     <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />

diff --git a/Imagens/Logos/Logo_sobre.png b/Imagens/Logos/Logo_sobre.png
diff --git a/Imagens/Textos/Texto_copyright.png b/Imagens/Textos/Texto_copyright.png
diff --git a/Source/View/Android/eTasks.View.Android.main.fmx b/Source/View/Android/eTasks.View.Android.main.fmx
diff --git a/Source/View/Components/eTasks.View.Components.Calendario.fmx b/Source/View/Components/eTasks.View.Components.Calendario.fmx
diff --git a/Source/View/Components/eTasks.View.Components.Calendario.pas b/Source/View/Components/eTasks.View.Components.Calendario.pas
@@ -108,6 +108,7 @@   TCalendario = class(TFrame)
     Procedure LimpaCalendario;
     Function Mes(value : Integer): string;
     Function DataSelecionada : TDate;
+    Procedure ValidarDia;
   public
     { Public declarations }
     Function Iniciar(FDate : TDate; FParent : TFmxObject) : TCalendario;
@@ -275,8 +276,15 @@ procedure TCalendario.MontarCalendario;
      N_Dia := N_Dia + 1;
    end;
   Seletor.EndAngle := 0;
+  ValidarDia;
   Seletor.Parent := TLabel(FindComponent('Dia_' + inttostr((primeirodia + Fdia) - 1)));
   AnimaSeletor.Start;
 end;
 
+procedure TCalendario.ValidarDia;
+begin
+  if FDia > MonthDays[IsLeapYear(FAno)][FMes] then
+   FDia := MonthDays[IsLeapYear(FAno)][FMes];
+end;
+
 end.
diff --git a/Source/View/Windows/eTasks.View.Windows.main.fmx b/Source/View/Windows/eTasks.View.Windows.main.fmx
diff --git a/Source/eTasks.Consts.pas b/Source/eTasks.Consts.pas
@@ -3,7 +3,7 @@
 interface
 
 Const
- Versao_eTasks = 1;
+ Versao_eTasks = 2;
 
 implementation
 

diff --git a/Win32/Debug/eTasks.loggeduser.ini b/Win32/Debug/eTasks.loggeduser.ini
@@ -1,7 +1,7 @@
 [LoggedUser]
-Email=teacherrafael_ccaasbc@hotmail.com
-Password=6Ia3aMIFVRaY+
-uID=pWvPC42heVabzIy2wwF13KViZ0e2
-Token=eyJhbGciOiJSUzI1NiIsImtpZCI6IjJjZGFiZDIwNzVjODQxNDI0NDY3MTNlM2U0NGU5ZDcxOGU3YzJkYjQiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vZXRhc2tzLWQ2OTg4IiwiYXVkIjoiZXRhc2tzLWQ2OTg4IiwiYXV0aF90aW1lIjoxNjMxMDQ5MzkyLCJ1c2VyX2lkIjoicFd2UEM0MmhlVmFiekl5Mnd3RjEzS1ZpWjBlMiIsInN1YiI6InBXdlBDNDJoZVZhYnpJeTJ3d0YxM0tWaVowZTIiLCJpYXQiOjE2MzEwNDkzOTIsImV4cCI6MTYzMTA1Mjk5MiwiZW1haWwiOiJ0ZWFjaGVycmFmYWVsX2NjYWFzYmNAaG90bWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsidGVhY2hlcnJhZmFlbF9jY2Fhc2JjQGhvdG1haWwuY29tIl19LCJzaWduX2luX3Byb3ZpZGVyIjoicGFzc3dvcmQifX0.FstnD6Rlji_D3wio1kpYCj0qYRgFUaUVstulArmelDjg2w7FhX7_QW6_eyDFCCpTiSB3952pIqNUNtN0qGuHdUd_iSwnYeD2cZdEWExlJnmS9VYR-kpRABu-U5oyF80Q0xcb7iHLy-nxvWfYU09XDvjm04LUNrhfzZruGABzkXw9xEqd0bLCsJWX4XkEVGWq2NqmKIE-ptnsDUcMt9MfCizrRd3Dr6qVnUwduJote9MZj4WldILnNJBKppot4oLKKoHQUU-IlnBKzwLj5-4i7R0mJtEoG_NC-fhiCmucRcK24QwJFBgEqfbsaFI_r3ST2AiAMnP04FuwjWNt6YdpSA
-RefreshToken=ACzBnCi8LhI9shy_CV0uhad2sDrQS9pddOum7Ga7wEY5ptW2j7Re0rwX_DW2fYQ_fdJVMWX9CCTkaC_WDbhfG0eN4DYF3Kf4C1jVODYs9APEAjiq5TDSaAjfFAEl3nGhidJ9-eWBEIjRf5d0TuaNltzUhVAwwV38DjOIAqvc0GebRD7_-XRwsV10yANPe_eZ5RdwDych1w-8LZRy_l8GzDpEngF4T9wX1w
-Logged=07/09/2021 18:16:33
+Email=teste@gmail.com
+Password=4AH6nB1Iq
+uID=Jbo81zVHQLgo2TqpWSTjgSXqRPu1
+Token=eyJhbGciOiJSUzI1NiIsImtpZCI6ImY5MGZiMWFlMDQ4YTU0OGZiNjgxYWQ2MDkyYjBiODY5ZWE0NjdhYzYiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vZXRhc2tzLWQ2OTg4IiwiYXVkIjoiZXRhc2tzLWQ2OTg4IiwiYXV0aF90aW1lIjoxNjU1NTgzMzAwLCJ1c2VyX2lkIjoiSmJvODF6VkhRTGdvMlRxcFdTVGpnU1hxUlB1MSIsInN1YiI6IkpibzgxelZIUUxnbzJUcXBXU1RqZ1NYcVJQdTEiLCJpYXQiOjE2NTU1ODMzMDAsImV4cCI6MTY1NTU4NjkwMCwiZW1haWwiOiJ0ZXN0ZUBnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsidGVzdGVAZ21haWwuY29tIl19LCJzaWduX2luX3Byb3ZpZGVyIjoicGFzc3dvcmQifX0.qrheING6ob2LQB3gznkzY7Mf-3XZFV9NAULNRhBsLsPKonRBp0MIHdQepLMvxjm_0zylkAoXT3lEx3HQ0xYHttQMNdBnwB7GR93nQLVJ2RJdwecoXAT_xzvlBCDqrzFVcpZKAmmepxyUjY7lgfMIli63LB65kXbeHan5NDWUUzTZ36HTC2UtyIIukkUsq7kj5IoNgLvcCftH8iwF5AbT1OAgwL8ahCgEQh9mGcsQuga81MptU6L871nLs_kUg3NvgI94h4T7d0HyVBw0fLeCW4-mDcrPia-kZPP72T7VxMmFb50Z8OUM9FDOWCjYC3hWnghNurDa8moMfCO8d0JRFw
+RefreshToken=AIwUaOlQU2GDvpHYF_xL7oi12msxEZm7SPHJeK19ET3Kv93afzJ20Kahk9PmYr7841pAQvSO69QYWkoASNmHQHhbP2dZYHc3_2zBpGfIUIpbznwH8gjCAIvFPe2xex1VEH1IkMtgiSxiwTbE0JTN6mnkNi3Iri2g2bNHGUMS42Z0pBOf8z3WxHCfg45JU9qvkwI50N3XQBw8
+Logged=18/06/2022 17:15:01
diff --git a/Win32/Release/eTasks.loggeduser.ini b/Win32/Release/eTasks.loggeduser.ini
@@ -0,0 +1,7 @@
+[LoggedUser]
+Email=teste@gmail.com
+Password=4AH6nB1Iq
+uID=Jbo81zVHQLgo2TqpWSTjgSXqRPu1
+Token=eyJhbGciOiJSUzI1NiIsImtpZCI6ImY5MGZiMWFlMDQ4YTU0OGZiNjgxYWQ2MDkyYjBiODY5ZWE0NjdhYzYiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vZXRhc2tzLWQ2OTg4IiwiYXVkIjoiZXRhc2tzLWQ2OTg4IiwiYXV0aF90aW1lIjoxNjU1NTg0MDk1LCJ1c2VyX2lkIjoiSmJvODF6VkhRTGdvMlRxcFdTVGpnU1hxUlB1MSIsInN1YiI6IkpibzgxelZIUUxnbzJUcXBXU1RqZ1NYcVJQdTEiLCJpYXQiOjE2NTU1ODQwOTUsImV4cCI6MTY1NTU4NzY5NSwiZW1haWwiOiJ0ZXN0ZUBnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsidGVzdGVAZ21haWwuY29tIl19LCJzaWduX2luX3Byb3ZpZGVyIjoicGFzc3dvcmQifX0.bj9GcieO3VaVGPoTr8paRfH2O1MS07N2ZopNMGjreYOgkNaqq15Ox1BPpq47lN37xdV5UTTYja_oWIBfJ6gJMt_OUagmg25_cL9CrowWgwJ-fg-UMQoVYUyz_A2PfLJ3nbq5zC1xRvlsnfBDWU_tBVN7pBLDTxk9Eb7C7XXZDgzw4NtJ5yI6LzsB-drp5yjKOuWnor8Ig605yf7s8Igk4n7CVJPYbu49LJxNIx-U00X6Zu3tMKjJ1LLJPpITONPas6fhM1Off0VsaVCl4siOho74h6CO_wleNWtzSftCUodBd3cgUpmg8TDL0tjpitd2mvAazxngvC6G53RphSsWbg
+RefreshToken=AIwUaOn-A91GKuRLGAfcNmOgxa5BgTrqfHqexAx0cBHkKLxgSnx2whhYtSlGGNPUyCrhbT58GfcLTPEflSYYE0QFYCKBRsTLqhnD10W_xcX0WlsoJVm_IAIcarofR_8idfcJC32P8RepY6mbt86qyt_GtuOYxcF5W2uygWINaeJp2steOgKLFKfH8U_shneuE8EJDKG1qSre
+Logged=18/06/2022 17:28:16
diff --git a/eTasks.deployproj b/eTasks.deployproj
@@ -5,7 +5,7 @@
     </ProjectExtensions>
     <PropertyGroup>
         <DeviceId Condition="'$(Platform)'=='Android'">42003880e44364f9</DeviceId>
-        <DeviceId Condition="'$(Platform)'=='Android64'">42003880e44364f9</DeviceId>
+        <DeviceId Condition="'$(Platform)'=='Android64'"/>
         <DeviceId Condition="'$(Platform)'=='iOSDevice64'"/>
         <DeviceId Condition="'$(Platform)'=='iOSSimulator'">iPhone5</DeviceId>
     </PropertyGroup>
@@ -39,15 +39,6 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_Windows_UWP_44.png" Condition="'$(Config)'=='Release'">
-            <RemoteDir>eTasks\Assets\</RemoteDir>
-            <RemoteName>Logo44x44.png</RemoteName>
-            <DeployClass>UWP_DelphiLogo44</DeployClass>
-            <Operation>1</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-        </DeployFile>
         <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_Windows_UWP_44.png" Condition="'$(Config)'=='Debug'">
             <RemoteDir>eTasks\Assets\</RemoteDir>
             <RemoteName>Logo44x44.png</RemoteName>
@@ -75,15 +66,6 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_Windows_UWP_150.png" Condition="'$(Config)'=='Release'">
-            <RemoteDir>eTasks\Assets\</RemoteDir>
-            <RemoteName>Logo150x150.png</RemoteName>
-            <DeployClass>UWP_DelphiLogo150</DeployClass>
-            <Operation>1</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-        </DeployFile>
         <DeployFile Include="eTasks.todo" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\</RemoteDir>
             <RemoteName>eTasks.todo</RemoteName>
@@ -93,6 +75,15 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
+        <DeployFile Include="Imagens\Icones\Logo_Windows_UWP_150.png" Condition="'$(Config)'=='Release'">
+            <RemoteDir>eTasks\Assets\</RemoteDir>
+            <RemoteName>Logo150x150.png</RemoteName>
+            <DeployClass>UWP_DelphiLogo150</DeployClass>
+            <Operation>1</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+        </DeployFile>
         <DeployFile Include="Win64\Release\eTasks.exe" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\</RemoteDir>
             <RemoteName>eTasks.exe</RemoteName>
@@ -103,6 +94,15 @@
             <Overwrite>True</Overwrite>
             <Required>True</Required>
         </DeployFile>
+        <DeployFile Include="Imagens\Icones\Logo_Windows_UWP_44.png" Condition="'$(Config)'=='Release'">
+            <RemoteDir>eTasks\Assets\</RemoteDir>
+            <RemoteName>Logo44x44.png</RemoteName>
+            <DeployClass>UWP_DelphiLogo44</DeployClass>
+            <Operation>1</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+        </DeployFile>
         <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_Windows_UWP_150.png" Condition="'$(Config)'=='Debug'">
             <RemoteDir>eTasks\Assets\</RemoteDir>
             <RemoteName>Logo150x150.png</RemoteName>
@@ -208,7 +208,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_144.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Icones\Logo_144.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-xxhdpi\</RemoteDir>
             <RemoteName>ic_launcher.png</RemoteName>
             <DeployClass>Android_LauncherIcon144</DeployClass>
@@ -398,7 +398,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_36.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Icones\Logo_36.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-ldpi\</RemoteDir>
             <RemoteName>ic_launcher.png</RemoteName>
             <DeployClass>Android_LauncherIcon36</DeployClass>
@@ -425,7 +425,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_96.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Icones\Logo_96.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-xhdpi\</RemoteDir>
             <RemoteName>ic_launcher.png</RemoteName>
             <DeployClass>Android_LauncherIcon96</DeployClass>
@@ -488,7 +488,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_48.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Icones\Logo_48.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-mdpi\</RemoteDir>
             <RemoteName>ic_launcher.png</RemoteName>
             <DeployClass>Android_LauncherIcon48</DeployClass>
@@ -497,7 +497,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_72.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_72.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-xxhdpi\</RemoteDir>
             <RemoteName>ic_notification.png</RemoteName>
             <DeployClass>Android_NotificationIcon72</DeployClass>
@@ -506,7 +506,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_36.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_36.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-hdpi\</RemoteDir>
             <RemoteName>ic_notification.png</RemoteName>
             <DeployClass>Android_NotificationIcon36</DeployClass>
@@ -624,7 +624,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_72.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Icones\Logo_72.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-hdpi\</RemoteDir>
             <RemoteName>ic_launcher.png</RemoteName>
             <DeployClass>Android_LauncherIcon72</DeployClass>
@@ -651,7 +651,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_96.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_96.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-xxxhdpi\</RemoteDir>
             <RemoteName>ic_notification.png</RemoteName>
             <DeployClass>Android_NotificationIcon96</DeployClass>
@@ -678,7 +678,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_24.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_24.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-mdpi\</RemoteDir>
             <RemoteName>ic_notification.png</RemoteName>
             <DeployClass>Android_NotificationIcon24</DeployClass>
@@ -687,7 +687,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_48.png" Condition="'$(Config)'=='Release'">
+        <DeployFile Include="D:\Meus Projetos\eTasks\Imagens\Notificacoes\Not_48.png" Condition="'$(Config)'=='Release'">
             <RemoteDir>eTasks\res\drawable-xhdpi\</RemoteDir>
             <RemoteName>ic_notification.png</RemoteName>
             <DeployClass>Android_NotificationIcon48</DeployClass>