Added TWaitFrame with Contents-aligned transparent layer and remodell…

…ed TAboutFrame similarly (plus made it small in height to fit in smaller landscape mobile screens)
Zoomicon · Jun 1, 2022 · fbbfe92 · fbbfe92
1 parent 344e981
commit fbbfe92
Show file tree

Hide file tree

Showing 15 changed files with 396 additions and 193 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,3 +75,6 @@ modules/
 
 **Debug/
 **Release/
+
+*.app
+*.app.zip
diff --git a/App/READCOM.App.Globals.dfm b/App/READCOM.App.Globals.dfm
@@ -28001,7 +28001,7 @@ object Globals: TGlobals
       item
         MultiResBitmap = <
           item
-            Size = 30
+            Size = 136
           end>
         IconName = 'Questionmark'
         SVGText = 
@@ -28675,6 +28675,67 @@ object Globals: TGlobals
           '567,2.7163-2.2783L44.21,21.3711A1.4519,1.4519,0,0,0,44.8818,19.7' +
           '754Z"/>'#10'  </g>'#10'</svg>'#10
         Opacity = 1.000000000000000000
+      end
+      item
+        MultiResBitmap = <
+          item
+            Size = 136
+          end>
+        IconName = 'Hourglass'
+        SVGText = 
+          '<svg id="emoji" viewBox="0 0 72 72" xmlns="http://www.w3.org/200' +
+          '0/svg">'#10'  <g id="color">'#10'    <path fill="#9B9B9A" stroke="none" ' +
+          'd="M40.2139,31.1055c0.0039-0.002,0.0068-0.002,0.0107-0.002c0.004' +
+          '9-0.0019,0.0088-0.0039,0.0137-0.0058'#9'C45.8926,29.6133,48,23.3076' +
+          ',48,19.6816V18H24v1.6816c0,3.626,2.1074,9.9317,7.7617,11.4161'#9'c0' +
+          '.0049,0.0019,0.0088,0.0039,0.0137,0.0058c0.0039,0,0.0068,0,0.010' +
+          '7,0.002c1.792,0.4863,3.0996,1.5361,3.7491,2.8945h0.9296'#9'C37.1143' +
+          ',32.6416,38.4219,31.5918,40.2139,31.1055z"/>'#10'    <path fill="#9B' +
+          '9B9A" stroke="none" d="M47,55c-6.0742,0-11-4.9258-11-11c0,6.0742' +
+          '-4.9258,11-11,11h-1v4h24v-4H47z"/>'#10'    <path fill="#a57939" stro' +
+          'ke="none" d="M55,11c0,1.1001-0.9004,2-2,2H19c-1.0996,0-2-0.8999-' +
+          '2-2v-1c0-1.1001,0.9004-2,2-2h34c1.0996,0,2,0.8999,2,2'#9'V11z"/>'#10'  ' +
+          '  <path fill="#a57939" stroke="none" d="M55,62c0,1.0996-0.9004,2' +
+          '-2,2H19c-1.0996,0-2-0.9004-2-2v-1c0-1.0996,0.9004-2,2-2h34c1.099' +
+          '6,0,2,0.9004,2,2'#9'V62z"/>'#10'    <line x1="36" x2="36" y1="39" y2="4' +
+          '4" fill="#FFFFFF" stroke="none" stroke-linecap="round" stroke-li' +
+          'nejoin="round" stroke-miterlimit="10" stroke-width="2"/>'#10'  </g>'#10 +
+          '  <g id="hair"/>'#10'  <g id="skin"/>'#10'  <g id="skin-shadow"/>'#10'  <g i' +
+          'd="line">'#10'    <path fill="none" stroke="#000000" stroke-linecap=' +
+          '"round" stroke-linejoin="round" stroke-miterlimit="10" stroke-wi' +
+          'dth="2" d="M31,34c-7.2725-1.9092-10-9.5454-10-14.3184C21,14.9092' +
+          ',21,13,21,13"/>'#10'    <path fill="none" stroke="#000000" stroke-li' +
+          'necap="round" stroke-linejoin="round" stroke-miterlimit="10" str' +
+          'oke-width="2" d="M21,59c0,0,0-1.9092,0-6.6816C21,47.5459,23.7275' +
+          ',39.9092,31,38"/>'#10'    <path fill="none" stroke="#000000" stroke-' +
+          'linecap="round" stroke-linejoin="round" stroke-miterlimit="10" s' +
+          'troke-width="2" d="M31,38c1-0.2715,2-0.8945,2-2c0-1.1045-1-1.728' +
+          '5-2-2"/>'#10'    <path fill="none" stroke="#000000" stroke-linecap="' +
+          'round" stroke-linejoin="round" stroke-miterlimit="10" stroke-wid' +
+          'th="2" d="M41,34c7.2725-1.9092,10-9.5454,10-14.3184C51,14.9092,5' +
+          '1,13,51,13"/>'#10'    <path fill="none" stroke="#000000" stroke-line' +
+          'cap="round" stroke-linejoin="round" stroke-miterlimit="10" strok' +
+          'e-width="2" d="M51,59c0,0,0-1.9092,0-6.6816C51,47.5459,48.2725,3' +
+          '9.9092,41,38"/>'#10'    <path fill="none" stroke="#000000" stroke-li' +
+          'necap="round" stroke-linejoin="round" stroke-miterlimit="10" str' +
+          'oke-width="2" d="M41,38c-1-0.2715-2-0.8945-2-2c0-1.1045,1-1.7285' +
+          ',2-2"/>'#10'    <path fill="none" stroke="#000000" stroke-linecap="r' +
+          'ound" stroke-linejoin="round" stroke-miterlimit="10" stroke-widt' +
+          'h="2" d="M25,55c6.0742,0,11-4.9258,11-11c0,6.0742,4.9258,11,11,1' +
+          '1"/>'#10'    <path fill="none" stroke="#000000" stroke-linecap="roun' +
+          'd" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="' +
+          '2" d="M55,11c0,1.1001-0.9004,2-2,2H19c-1.0996,0-2-0.8999-2-2v-1c' +
+          '0-1.1001,0.9004-2,2-2h34c1.0996,0,2,0.8999,2,2V11z"/>'#10'    <line ' +
+          'x1="47" x2="25" y1="18" y2="18" fill="none" stroke="#000000" str' +
+          'oke-linecap="round" stroke-linejoin="round" stroke-miterlimit="1' +
+          '0" stroke-width="2"/>'#10'    <path fill="none" stroke="#000000" str' +
+          'oke-linecap="round" stroke-linejoin="round" stroke-miterlimit="1' +
+          '0" stroke-width="2" d="M55,62c0,1.0996-0.9004,2-2,2H19c-1.0996,0' +
+          '-2-0.9004-2-2v-1c0-1.0996,0.9004-2,2-2h34c1.0996,0,2,0.9004,2,2V' +
+          '62z"/>'#10'    <line x1="36" x2="36" y1="39" y2="44" fill="none" str' +
+          'oke="#000000" stroke-linecap="round" stroke-linejoin="round" str' +
+          'oke-miterlimit="10" stroke-width="2"/>'#10'  </g>'#10'</svg>'#10
+        Opacity = 1.000000000000000000
       end>
     Destination = <
       item
@@ -28809,8 +28870,8 @@ object Globals: TGlobals
         Layers = <
           item
             Name = 'Questionmark'
-            SourceRect.Right = 30.000000000000000000
-            SourceRect.Bottom = 30.000000000000000000
+            SourceRect.Right = 136.000000000000000000
+            SourceRect.Bottom = 136.000000000000000000
           end>
       end
       item
@@ -28925,6 +28986,14 @@ object Globals: TGlobals
             SourceRect.Bottom = 136.000000000000000000
           end>
       end
+      item
+        Layers = <
+          item
+            Name = 'Hourglass'
+            SourceRect.Right = 136.000000000000000000
+            SourceRect.Bottom = 136.000000000000000000
+          end>
+      end
       item
         Layers = <>
       end>

diff --git a/App/READCOM.App.Globals.pas b/App/READCOM.App.Globals.pas
@@ -6,12 +6,6 @@ interface
   System.SysUtils, System.Classes, FMX.Types, FMX.Controls,
   System.ImageList, FMX.ImgList, FMX.SVGIconImageList;
 
-resourcestring
-  URL_HELP = 'https://github.com/Zoomicon/READCOM_App/wiki';
-  URL_READCOM = 'https://www.read-com-eu.uma.es';
-  STR_APP_TITLE = 'READ-COM: Reading Communities';
-  STR_COMPATIBILITY_MODE = '[Compatibility mode]';
-
 type
 
   TGlobals = class(TDataModule)

diff --git a/App/READCOM.App.Main.pas b/App/READCOM.App.Main.pas
@@ -21,6 +21,7 @@ implementation
     READCOM.Views.Main,
     READCOM.App.Debugging,
     READCOM.App.Globals, //for TGlobals
+    READCOM.App.Messages,
     READCOM.App.URLs; //for OpenURLinBrowser
 
 procedure ParseCommandLine;

diff --git a/App/READCOM.App.Messages.pas b/App/READCOM.App.Messages.pas
@@ -0,0 +1,14 @@
+unit READCOM.App.Messages;
+
+interface
+
+resourcestring
+  URL_HELP = 'https://github.com/Zoomicon/READCOM_App/wiki';
+  URL_READCOM = 'https://www.read-com-eu.uma.es';
+  STR_APP_TITLE = 'READ-COM: Reading Communities';
+  STR_COMPATIBILITY_MODE = '[Compatibility mode]';
+  ERR_DOWNLOAD = 'Download failed (%s)';
+
+implementation
+
+end.
diff --git a/App/READCOM_App.dpr b/App/READCOM_App.dpr
@@ -40,11 +40,13 @@ uses
   Zoomicon.Media.Models in '..\Zoomicon.Media\Zoomicon.Media.Models.pas',
   Zoomicon.Puzzler.Classes in '..\Zoomicon.Puzzler\Zoomicon.Puzzler.Classes.pas',
   Zoomicon.Puzzler.Models in '..\Zoomicon.Puzzler\Zoomicon.Puzzler.Models.pas',
+  Zoomicon.Text in '..\Zoomicon.Text\Zoomicon.Text.pas',
   READCOM.App.Globals in 'READCOM.App.Globals.pas' {Globals: TDataModule},
   READCOM.App.Models in 'READCOM.App.Models.pas',
   READCOM.App.URLs in 'READCOM.App.URLs.pas',
   READCOM.Views.Options.StoryItemOptions in 'Views\Options\READCOM.Views.Options.StoryItemOptions.pas' {StoryItemOptions: TFrame},
   READCOM.Views.Options.ImageStoryItemOptions in 'Views\Options\READCOM.Views.Options.ImageStoryItemOptions.pas' {ImageStoryItemOptions: TFrame},
+  READCOM.Views.Options.TextStoryItemOptions in 'Views\Options\READCOM.Views.Options.TextStoryItemOptions.pas' {TextStoryItemOptions: TFrame},
   READCOM.Views.StoryItem in 'Views\READCOM.Views.StoryItem.pas' {StoryItem: TFrame},
   READCOM.Views.ImageStoryItem in 'Views\READCOM.Views.ImageStoryItem.pas' {ImageStoryItem: TFrame},
   READCOM.Views.AudioStoryItem in 'Views\READCOM.Views.AudioStoryItem.pas' {AudioStoryItem: TFrame},
@@ -53,10 +55,10 @@ uses
   READCOM.Views.Menu.HUD in 'Views\READCOM.Views.Menu.HUD.pas' {StoryHUD: TFrame},
   READCOM.Views.Main in 'Views\READCOM.Views.Main.pas' {MainForm},
   READCOM.Views.About in 'Views\READCOM.Views.About.pas' {AboutFrame: TFrame},
+  READCOM.Views.Wait in 'Views\READCOM.Views.Wait.pas' {WaitFrame: TFrame},
   READCOM.App.Main in 'READCOM.App.Main.pas',
   READCOM.App.Debugging in 'READCOM.App.Debugging.pas',
-  Zoomicon.Text in '..\Zoomicon.Text\Zoomicon.Text.pas',
-  READCOM.Views.Options.TextStoryItemOptions in 'Views\Options\READCOM.Views.Options.TextStoryItemOptions.pas' {TextStoryItemOptions: TFrame},
+  READCOM.App.Messages in 'READCOM.App.Messages.pas',
   FMX.Image32SVG in '..\3rdPartyLib\SVGIconImageList\Source\FMX.Image32SVG.pas',
   Img32.SVG.Core in '..\3rdPartyLib\SVGIconImageList\Image32\source\Img32.SVG.Core.pas';
 

diff --git a/App/READCOM_App.dproj b/App/READCOM_App.dproj
@@ -525,6 +525,7 @@
         <DCCReference Include="..\Zoomicon.Media\Zoomicon.Media.Models.pas"/>
         <DCCReference Include="..\Zoomicon.Puzzler\Zoomicon.Puzzler.Classes.pas"/>
         <DCCReference Include="..\Zoomicon.Puzzler\Zoomicon.Puzzler.Models.pas"/>
+        <DCCReference Include="..\Zoomicon.Text\Zoomicon.Text.pas"/>
         <DCCReference Include="READCOM.App.Globals.pas">
             <Form>Globals</Form>
             <DesignClass>TDataModule</DesignClass>
@@ -539,6 +540,10 @@
             <Form>ImageStoryItemOptions</Form>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
+        <DCCReference Include="Views\Options\READCOM.Views.Options.TextStoryItemOptions.pas">
+            <Form>TextStoryItemOptions</Form>
+            <DesignClass>TFrame</DesignClass>
+        </DCCReference>
         <DCCReference Include="Views\READCOM.Views.StoryItem.pas">
             <Form>StoryItem</Form>
             <DesignClass>TFrame</DesignClass>
@@ -567,14 +572,13 @@
             <Form>AboutFrame</Form>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
-        <DCCReference Include="READCOM.App.Main.pas"/>
-        <DCCReference Include="READCOM.App.Debugging.pas"/>
-        <DCCReference Include="..\Zoomicon.Text\Zoomicon.Text.pas"/>
-        <DCCReference Include="Views\Options\READCOM.Views.Options.TextStoryItemOptions.pas">
-            <Form>TextStoryItemOptions</Form>
-            <FormType>fmx</FormType>
+        <DCCReference Include="Views\READCOM.Views.Wait.pas">
+            <Form>WaitFrame</Form>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
+        <DCCReference Include="READCOM.App.Main.pas"/>
+        <DCCReference Include="READCOM.App.Debugging.pas"/>
+        <DCCReference Include="READCOM.App.Messages.pas"/>
         <DCCReference Include="..\3rdPartyLib\SVGIconImageList\Source\FMX.Image32SVG.pas"/>
         <DCCReference Include="..\3rdPartyLib\SVGIconImageList\Image32\source\Img32.SVG.Core.pas"/>
         <RcItem Include="Default.readcom">