Fix a bug on the dialog "Termos"

rafael-figueiredo-alves · Nov 8, 2021 · 630cd78 · 630cd78
1 parent 04c0d88
commit 630cd78
Show file tree

Hide file tree

Showing 22 changed files with 8,432 additions and 8,220 deletions.
diff --git a/Android/Debug/AndroidManifest.xml b/Android/Debug/AndroidManifest.xml
@@ -18,7 +18,7 @@
     <application android:persistent="False" 
         android:restoreAnyVersion="False" 
         android:label="eTasks" 
-        android:debuggable="True" 
+        android:debuggable="False" 
         android:largeHeap="False"
         android:icon="@drawable/ic_launcher"
         android:theme="@style/AppTheme"

diff --git a/Android/Debug/eTasks/AndroidManifest.xml b/Android/Debug/eTasks/AndroidManifest.xml
@@ -18,7 +18,7 @@
     <application android:persistent="False" 
         android:restoreAnyVersion="False" 
         android:label="eTasks" 
-        android:debuggable="True" 
+        android:debuggable="False" 
         android:largeHeap="False"
         android:icon="@drawable/ic_launcher"
         android:theme="@style/AppTheme"

diff --git a/Android/Debug/eTasks/library/lib/armeabi-v7a/gdbserver b/Android/Debug/eTasks/library/lib/armeabi-v7a/gdbserver
diff --git a/Android/Release/eTasks/AndroidManifest.xml b/Android/Release/eTasks/AndroidManifest.xml
@@ -17,7 +17,7 @@
     <application android:persistent="False" 
         android:restoreAnyVersion="False" 
         android:label="eTasks" 
-        android:debuggable="True" 
+        android:debuggable="False" 
         android:largeHeap="False"
         android:icon="@drawable/ic_launcher"
         android:theme="@style/AppTheme"

diff --git a/Android/Release/eTasks/library/lib/armeabi-v7a/gdbserver b/Android/Release/eTasks/library/lib/armeabi-v7a/gdbserver
diff --git a/Android/debug.keystore b/Android/debug.keystore
diff --git a/Android/release.keystore b/Android/release.keystore
diff --git a/Source/View/Android/eTasks.View.Android.login.fmx b/Source/View/Android/eTasks.View.Android.login.fmx
diff --git a/Source/View/Android/eTasks.View.Android.login.pas b/Source/View/Android/eTasks.View.Android.login.pas
@@ -767,6 +767,10 @@ procedure TForm_Android_Login.Btn_Termos_privacidadeClick(Sender: TObject);
   Termos := TViewDialogsMessages.New;
   Form_Android_Login.AddObject(
                                Termos.DialogTermos
+                                               .AcaoBotao(Procedure()
+                                                          begin
+                                                           Termos := nil;
+                                                          end)
                                                .AcaoFundo(Procedure ()
                                                           Begin
                                                            Termos := nil;

diff --git a/Source/View/Dialogs/eTasks.View.Dialogs.Termos.fmx b/Source/View/Dialogs/eTasks.View.Dialogs.Termos.fmx
diff --git a/Source/View/Dialogs/eTasks.View.Dialogs.Termos.pas b/Source/View/Dialogs/eTasks.View.Dialogs.Termos.pas
@@ -5,7 +5,8 @@ interface
 uses
   System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants,
   FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.Objects,
-  FMX.Layouts, FMX.Controls.Presentation, FMX.ScrollBox, FMX.Memo, FMX.Ani;
+  FMX.Layouts, FMX.Controls.Presentation, FMX.ScrollBox, FMX.Memo, FMX.Ani,
+  FMX.Memo.Types;
 
 type
   TDlg_Termos = class(TForm)

diff --git a/Source/View/Windows/eTasks.View.Windows.login.fmx b/Source/View/Windows/eTasks.View.Windows.login.fmx
diff --git a/Win64/Release/AppxManifest.xml b/Win64/Release/AppxManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package
+   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
+  <Identity Name="%projectName%"
+	ProcessorArchitecture="x64"
+			Publisher=""
+			Version="1.0.0.0" />
+  <Properties>
+    <DisplayName>%packageDisplayName%</DisplayName>
+    <PublisherDisplayName>%publisherDisplayName%</PublisherDisplayName>
+    <Description>eTasks</Description>
+    <Logo>Assets\Logo44x44.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="pt-BR" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+  <Applications>
+    <Application Id="br.DevPegasus.eTasks"
+				Executable="eTasks.exe"
+				EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements BackgroundColor="#464646"
+				DisplayName="eTasks"
+				Square150x150Logo="Assets\Logo150x150.png"
+				Square44x44Logo="Assets\Logo44x44.png"
+				Description="eTasks" />
+    </Application>
+  </Applications>
+</Package>
diff --git a/Win64/Release/eTasks/AppxManifest.xml b/Win64/Release/eTasks/AppxManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package
+   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
+  <Identity Name="%projectName%"
+	ProcessorArchitecture="x64"
+			Publisher=""
+			Version="1.0.0.0" />
+  <Properties>
+    <DisplayName>%packageDisplayName%</DisplayName>
+    <PublisherDisplayName>%publisherDisplayName%</PublisherDisplayName>
+    <Description>eTasks</Description>
+    <Logo>Assets\Logo44x44.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="pt-BR" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+  <Applications>
+    <Application Id="br.DevPegasus.eTasks"
+				Executable="eTasks.exe"
+				EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements BackgroundColor="#464646"
+				DisplayName="eTasks"
+				Square150x150Logo="Assets\Logo150x150.png"
+				Square44x44Logo="Assets\Logo44x44.png"
+				Description="eTasks" />
+    </Application>
+  </Applications>
+</Package>
diff --git a/Win64/Release/eTasks/Assets/Logo150x150.png b/Win64/Release/eTasks/Assets/Logo150x150.png
diff --git a/Win64/Release/eTasks/Assets/Logo44x44.png b/Win64/Release/eTasks/Assets/Logo44x44.png
diff --git a/Win64/Release/eTasks/categorias.json b/Win64/Release/eTasks/categorias.json
diff --git a/Win64/Release/eTasks/eTasks.todo b/Win64/Release/eTasks/eTasks.todo
@@ -0,0 +1,2 @@
+
+
diff --git a/Win64/Release/eTasks_@MapFile_.tmp b/Win64/Release/eTasks_@MapFile_.tmp
@@ -0,0 +1,7 @@
+[Files]
+"C:\Meus Projetos\eTasks\Win64\Release\eTasks\AppxManifest.xml"	"AppxManifest.xml"
+"C:\Meus Projetos\eTasks\Win64\Release\eTasks\categorias.json"	"categorias.json"
+"C:\Meus Projetos\eTasks\Win64\Release\eTasks\Assets\Logo44x44.png"	"Assets\Logo44x44.png"
+"C:\Meus Projetos\eTasks\Win64\Release\eTasks\Assets\Logo150x150.png"	"Assets\Logo150x150.png"
+"C:\Meus Projetos\eTasks\Win64\Release\eTasks\eTasks.todo"	"eTasks.todo"
+"C:\Meus Projetos\eTasks\Win64\Release\eTasks\eTasks.exe"	"eTasks.exe"
diff --git a/eTasks.deployproj b/eTasks.deployproj
@@ -5,7 +5,7 @@
     </ProjectExtensions>
     <PropertyGroup>
         <DeviceId Condition="'$(Platform)'=='Android'">42003880e44364f9</DeviceId>
-        <DeviceId Condition="'$(Platform)'=='Android64'"/>
+        <DeviceId Condition="'$(Platform)'=='Android64'">42003880e44364f9</DeviceId>
         <DeviceId Condition="'$(Platform)'=='iOSDevice64'"/>
         <DeviceId Condition="'$(Platform)'=='iOSSimulator'">iPhone5</DeviceId>
     </PropertyGroup>
@@ -21,6 +21,33 @@
             <Overwrite>True</Overwrite>
             <Required>True</Required>
         </DeployFile>
+        <DeployFile Include="Win64\Release\AppxManifest.xml" Condition="'$(Config)'=='Release'">
+            <RemoteDir>eTasks\</RemoteDir>
+            <RemoteName>AppxManifest.xml</RemoteName>
+            <DeployClass>ProjectUWPManifest</DeployClass>
+            <Operation>1</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+        </DeployFile>
+        <DeployFile Include="Source\categorias.json" Condition="'$(Config)'=='Release'">
+            <RemoteDir>eTasks\</RemoteDir>
+            <RemoteName>categorias.json</RemoteName>
+            <DeployClass>ProjectFile</DeployClass>
+            <Operation>0</Operation>
+            <LocalCommand/>
+            <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>
@@ -48,6 +75,34 @@
             <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>
+            <DeployClass>ProjectFile</DeployClass>
+            <Operation>0</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+        </DeployFile>
+        <DeployFile Include="Win64\Release\eTasks.exe" Condition="'$(Config)'=='Release'">
+            <RemoteDir>eTasks\</RemoteDir>
+            <RemoteName>eTasks.exe</RemoteName>
+            <DeployClass>ProjectOutput</DeployClass>
+            <Operation>0</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+            <Required>True</Required>
+        </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>
@@ -117,6 +172,15 @@
     </ItemGroup>
     <ItemGroup Condition="'$(Platform)'=='OSX64'"/>
     <ItemGroup Condition="'$(Platform)'=='Android'">
+        <DeployFile Include="$(BDS)\lib\android\release\mips\libnative-activity.so" Condition="'$(Config)'=='Debug'">
+            <RemoteDir>eTasks\library\lib\mips\</RemoteDir>
+            <RemoteName>libeTasks.so</RemoteName>
+            <DeployClass>AndroidLibnativeMipsFile</DeployClass>
+            <Operation>1</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+        </DeployFile>
         <DeployFile Include="Imagens\SplashScreens\eTasks_470x320.9.png" Condition="'$(Config)'=='Debug'">
             <RemoteDir>eTasks\res\drawable-normal\</RemoteDir>
             <RemoteName>splash_image.png</RemoteName>
@@ -162,15 +226,6 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="$(NDKBasePath)\prebuilt\android-arm\gdbserver\gdbserver" Condition="'$(Config)'=='Release'">
-            <RemoteDir>eTasks\library\lib\armeabi-v7a\</RemoteDir>
-            <RemoteName>gdbserver</RemoteName>
-            <DeployClass>AndroidGDBServer</DeployClass>
-            <Operation>1</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-        </DeployFile>
         <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_48.png" Condition="'$(Config)'=='Debug'">
             <RemoteDir>eTasks\res\drawable-mdpi\</RemoteDir>
             <RemoteName>ic_launcher.png</RemoteName>
@@ -189,6 +244,15 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
+        <DeployFile Include="$(BDS)\lib\android\release\armeabi\libnative-activity.so" Condition="'$(Config)'=='Debug'">
+            <RemoteDir>eTasks\library\lib\armeabi\</RemoteDir>
+            <RemoteName>libeTasks.so</RemoteName>
+            <DeployClass>AndroidLibnativeArmeabiFile</DeployClass>
+            <Operation>1</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+        </DeployFile>
         <DeployFile Include="C:\Meus Projetos\eTasks\Imagens\Icones\Logo_96.png" Condition="'$(Config)'=='Debug'">
             <RemoteDir>eTasks\res\drawable-xhdpi\</RemoteDir>
             <RemoteName>ic_launcher.png</RemoteName>