Skip to content

Commit fbbfe92

Browse files
birbilis@zoomicon.combirbilis@zoomicon.com
birbilis@zoomicon.com
authored and
birbilis@zoomicon.com
committed
Added TWaitFrame with Contents-aligned transparent layer and remodelled TAboutFrame similarly (plus made it small in height to fit in smaller landscape mobile screens)
1 parent 344e981 commit fbbfe92

15 files changed

+396
-193
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@ modules/
7575

7676
**Debug/
7777
**Release/
78+
79+
*.app
80+
*.app.zip

‎App/READCOM.App.Globals.dfm

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28001,7 +28001,7 @@ object Globals: TGlobals
2800128001
item
2800228002
MultiResBitmap = <
2800328003
item
28004-
Size = 30
28004+
Size = 136
2800528005
end>
2800628006
IconName = 'Questionmark'
2800728007
SVGText =
@@ -28675,6 +28675,67 @@ object Globals: TGlobals
2867528675
'567,2.7163-2.2783L44.21,21.3711A1.4519,1.4519,0,0,0,44.8818,19.7' +
2867628676
'754Z"/>'#10' </g>'#10'</svg>'#10
2867728677
Opacity = 1.000000000000000000
28678+
end
28679+
item
28680+
MultiResBitmap = <
28681+
item
28682+
Size = 136
28683+
end>
28684+
IconName = 'Hourglass'
28685+
SVGText =
28686+
'<svg id="emoji" viewBox="0 0 72 72" xmlns="http://www.w3.org/200' +
28687+
'0/svg">'#10' <g id="color">'#10' <path fill="#9B9B9A" stroke="none" ' +
28688+
'd="M40.2139,31.1055c0.0039-0.002,0.0068-0.002,0.0107-0.002c0.004' +
28689+
'9-0.0019,0.0088-0.0039,0.0137-0.0058'#9'C45.8926,29.6133,48,23.3076' +
28690+
',48,19.6816V18H24v1.6816c0,3.626,2.1074,9.9317,7.7617,11.4161'#9'c0' +
28691+
'.0049,0.0019,0.0088,0.0039,0.0137,0.0058c0.0039,0,0.0068,0,0.010' +
28692+
'7,0.002c1.792,0.4863,3.0996,1.5361,3.7491,2.8945h0.9296'#9'C37.1143' +
28693+
',32.6416,38.4219,31.5918,40.2139,31.1055z"/>'#10' <path fill="#9B' +
28694+
'9B9A" stroke="none" d="M47,55c-6.0742,0-11-4.9258-11-11c0,6.0742' +
28695+
'-4.9258,11-11,11h-1v4h24v-4H47z"/>'#10' <path fill="#a57939" stro' +
28696+
'ke="none" d="M55,11c0,1.1001-0.9004,2-2,2H19c-1.0996,0-2-0.8999-' +
28697+
'2-2v-1c0-1.1001,0.9004-2,2-2h34c1.0996,0,2,0.8999,2,2'#9'V11z"/>'#10' ' +
28698+
' <path fill="#a57939" stroke="none" d="M55,62c0,1.0996-0.9004,2' +
28699+
'-2,2H19c-1.0996,0-2-0.9004-2-2v-1c0-1.0996,0.9004-2,2-2h34c1.099' +
28700+
'6,0,2,0.9004,2,2'#9'V62z"/>'#10' <line x1="36" x2="36" y1="39" y2="4' +
28701+
'4" fill="#FFFFFF" stroke="none" stroke-linecap="round" stroke-li' +
28702+
'nejoin="round" stroke-miterlimit="10" stroke-width="2"/>'#10' </g>'#10 +
28703+
' <g id="hair"/>'#10' <g id="skin"/>'#10' <g id="skin-shadow"/>'#10' <g i' +
28704+
'd="line">'#10' <path fill="none" stroke="#000000" stroke-linecap=' +
28705+
'"round" stroke-linejoin="round" stroke-miterlimit="10" stroke-wi' +
28706+
'dth="2" d="M31,34c-7.2725-1.9092-10-9.5454-10-14.3184C21,14.9092' +
28707+
',21,13,21,13"/>'#10' <path fill="none" stroke="#000000" stroke-li' +
28708+
'necap="round" stroke-linejoin="round" stroke-miterlimit="10" str' +
28709+
'oke-width="2" d="M21,59c0,0,0-1.9092,0-6.6816C21,47.5459,23.7275' +
28710+
',39.9092,31,38"/>'#10' <path fill="none" stroke="#000000" stroke-' +
28711+
'linecap="round" stroke-linejoin="round" stroke-miterlimit="10" s' +
28712+
'troke-width="2" d="M31,38c1-0.2715,2-0.8945,2-2c0-1.1045-1-1.728' +
28713+
'5-2-2"/>'#10' <path fill="none" stroke="#000000" stroke-linecap="' +
28714+
'round" stroke-linejoin="round" stroke-miterlimit="10" stroke-wid' +
28715+
'th="2" d="M41,34c7.2725-1.9092,10-9.5454,10-14.3184C51,14.9092,5' +
28716+
'1,13,51,13"/>'#10' <path fill="none" stroke="#000000" stroke-line' +
28717+
'cap="round" stroke-linejoin="round" stroke-miterlimit="10" strok' +
28718+
'e-width="2" d="M51,59c0,0,0-1.9092,0-6.6816C51,47.5459,48.2725,3' +
28719+
'9.9092,41,38"/>'#10' <path fill="none" stroke="#000000" stroke-li' +
28720+
'necap="round" stroke-linejoin="round" stroke-miterlimit="10" str' +
28721+
'oke-width="2" d="M41,38c-1-0.2715-2-0.8945-2-2c0-1.1045,1-1.7285' +
28722+
',2-2"/>'#10' <path fill="none" stroke="#000000" stroke-linecap="r' +
28723+
'ound" stroke-linejoin="round" stroke-miterlimit="10" stroke-widt' +
28724+
'h="2" d="M25,55c6.0742,0,11-4.9258,11-11c0,6.0742,4.9258,11,11,1' +
28725+
'1"/>'#10' <path fill="none" stroke="#000000" stroke-linecap="roun' +
28726+
'd" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="' +
28727+
'2" d="M55,11c0,1.1001-0.9004,2-2,2H19c-1.0996,0-2-0.8999-2-2v-1c' +
28728+
'0-1.1001,0.9004-2,2-2h34c1.0996,0,2,0.8999,2,2V11z"/>'#10' <line ' +
28729+
'x1="47" x2="25" y1="18" y2="18" fill="none" stroke="#000000" str' +
28730+
'oke-linecap="round" stroke-linejoin="round" stroke-miterlimit="1' +
28731+
'0" stroke-width="2"/>'#10' <path fill="none" stroke="#000000" str' +
28732+
'oke-linecap="round" stroke-linejoin="round" stroke-miterlimit="1' +
28733+
'0" stroke-width="2" d="M55,62c0,1.0996-0.9004,2-2,2H19c-1.0996,0' +
28734+
'-2-0.9004-2-2v-1c0-1.0996,0.9004-2,2-2h34c1.0996,0,2,0.9004,2,2V' +
28735+
'62z"/>'#10' <line x1="36" x2="36" y1="39" y2="44" fill="none" str' +
28736+
'oke="#000000" stroke-linecap="round" stroke-linejoin="round" str' +
28737+
'oke-miterlimit="10" stroke-width="2"/>'#10' </g>'#10'</svg>'#10
28738+
Opacity = 1.000000000000000000
2867828739
end>
2867928740
Destination = <
2868028741
item
@@ -28809,8 +28870,8 @@ object Globals: TGlobals
2880928870
Layers = <
2881028871
item
2881128872
Name = 'Questionmark'
28812-
SourceRect.Right = 30.000000000000000000
28813-
SourceRect.Bottom = 30.000000000000000000
28873+
SourceRect.Right = 136.000000000000000000
28874+
SourceRect.Bottom = 136.000000000000000000
2881428875
end>
2881528876
end
2881628877
item
@@ -28925,6 +28986,14 @@ object Globals: TGlobals
2892528986
SourceRect.Bottom = 136.000000000000000000
2892628987
end>
2892728988
end
28989+
item
28990+
Layers = <
28991+
item
28992+
Name = 'Hourglass'
28993+
SourceRect.Right = 136.000000000000000000
28994+
SourceRect.Bottom = 136.000000000000000000
28995+
end>
28996+
end
2892828997
item
2892928998
Layers = <>
2893028999
end>

‎App/READCOM.App.Globals.pas

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ interface
66
System.SysUtils, System.Classes, FMX.Types, FMX.Controls,
77
System.ImageList, FMX.ImgList, FMX.SVGIconImageList;
88

9-
resourcestring
10-
URL_HELP = 'https://github.com/Zoomicon/READCOM_App/wiki';
11-
URL_READCOM = 'https://www.read-com-eu.uma.es';
12-
STR_APP_TITLE = 'READ-COM: Reading Communities';
13-
STR_COMPATIBILITY_MODE = '[Compatibility mode]';
14-
159
type
1610

1711
TGlobals = class(TDataModule)

‎App/READCOM.App.Main.pas

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ implementation
2121
READCOM.Views.Main,
2222
READCOM.App.Debugging,
2323
READCOM.App.Globals, //for TGlobals
24+
READCOM.App.Messages,
2425
READCOM.App.URLs; //for OpenURLinBrowser
2526

2627
procedure ParseCommandLine;

‎App/READCOM.App.Messages.pas

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
unit READCOM.App.Messages;
2+
3+
interface
4+
5+
resourcestring
6+
URL_HELP = 'https://github.com/Zoomicon/READCOM_App/wiki';
7+
URL_READCOM = 'https://www.read-com-eu.uma.es';
8+
STR_APP_TITLE = 'READ-COM: Reading Communities';
9+
STR_COMPATIBILITY_MODE = '[Compatibility mode]';
10+
ERR_DOWNLOAD = 'Download failed (%s)';
11+
12+
implementation
13+
14+
end.

‎App/READCOM_App.dpr

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ uses
4040
Zoomicon.Media.Models in '..\Zoomicon.Media\Zoomicon.Media.Models.pas',
4141
Zoomicon.Puzzler.Classes in '..\Zoomicon.Puzzler\Zoomicon.Puzzler.Classes.pas',
4242
Zoomicon.Puzzler.Models in '..\Zoomicon.Puzzler\Zoomicon.Puzzler.Models.pas',
43+
Zoomicon.Text in '..\Zoomicon.Text\Zoomicon.Text.pas',
4344
READCOM.App.Globals in 'READCOM.App.Globals.pas' {Globals: TDataModule},
4445
READCOM.App.Models in 'READCOM.App.Models.pas',
4546
READCOM.App.URLs in 'READCOM.App.URLs.pas',
4647
READCOM.Views.Options.StoryItemOptions in 'Views\Options\READCOM.Views.Options.StoryItemOptions.pas' {StoryItemOptions: TFrame},
4748
READCOM.Views.Options.ImageStoryItemOptions in 'Views\Options\READCOM.Views.Options.ImageStoryItemOptions.pas' {ImageStoryItemOptions: TFrame},
49+
READCOM.Views.Options.TextStoryItemOptions in 'Views\Options\READCOM.Views.Options.TextStoryItemOptions.pas' {TextStoryItemOptions: TFrame},
4850
READCOM.Views.StoryItem in 'Views\READCOM.Views.StoryItem.pas' {StoryItem: TFrame},
4951
READCOM.Views.ImageStoryItem in 'Views\READCOM.Views.ImageStoryItem.pas' {ImageStoryItem: TFrame},
5052
READCOM.Views.AudioStoryItem in 'Views\READCOM.Views.AudioStoryItem.pas' {AudioStoryItem: TFrame},
@@ -53,10 +55,10 @@ uses
5355
READCOM.Views.Menu.HUD in 'Views\READCOM.Views.Menu.HUD.pas' {StoryHUD: TFrame},
5456
READCOM.Views.Main in 'Views\READCOM.Views.Main.pas' {MainForm},
5557
READCOM.Views.About in 'Views\READCOM.Views.About.pas' {AboutFrame: TFrame},
58+
READCOM.Views.Wait in 'Views\READCOM.Views.Wait.pas' {WaitFrame: TFrame},
5659
READCOM.App.Main in 'READCOM.App.Main.pas',
5760
READCOM.App.Debugging in 'READCOM.App.Debugging.pas',
58-
Zoomicon.Text in '..\Zoomicon.Text\Zoomicon.Text.pas',
59-
READCOM.Views.Options.TextStoryItemOptions in 'Views\Options\READCOM.Views.Options.TextStoryItemOptions.pas' {TextStoryItemOptions: TFrame},
61+
READCOM.App.Messages in 'READCOM.App.Messages.pas',
6062
FMX.Image32SVG in '..\3rdPartyLib\SVGIconImageList\Source\FMX.Image32SVG.pas',
6163
Img32.SVG.Core in '..\3rdPartyLib\SVGIconImageList\Image32\source\Img32.SVG.Core.pas';
6264

‎App/READCOM_App.dproj

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@
525525
<DCCReference Include="..\Zoomicon.Media\Zoomicon.Media.Models.pas"/>
526526
<DCCReference Include="..\Zoomicon.Puzzler\Zoomicon.Puzzler.Classes.pas"/>
527527
<DCCReference Include="..\Zoomicon.Puzzler\Zoomicon.Puzzler.Models.pas"/>
528+
<DCCReference Include="..\Zoomicon.Text\Zoomicon.Text.pas"/>
528529
<DCCReference Include="READCOM.App.Globals.pas">
529530
<Form>Globals</Form>
530531
<DesignClass>TDataModule</DesignClass>
@@ -539,6 +540,10 @@
539540
<Form>ImageStoryItemOptions</Form>
540541
<DesignClass>TFrame</DesignClass>
541542
</DCCReference>
543+
<DCCReference Include="Views\Options\READCOM.Views.Options.TextStoryItemOptions.pas">
544+
<Form>TextStoryItemOptions</Form>
545+
<DesignClass>TFrame</DesignClass>
546+
</DCCReference>
542547
<DCCReference Include="Views\READCOM.Views.StoryItem.pas">
543548
<Form>StoryItem</Form>
544549
<DesignClass>TFrame</DesignClass>
@@ -567,14 +572,13 @@
567572
<Form>AboutFrame</Form>
568573
<DesignClass>TFrame</DesignClass>
569574
</DCCReference>
570-
<DCCReference Include="READCOM.App.Main.pas"/>
571-
<DCCReference Include="READCOM.App.Debugging.pas"/>
572-
<DCCReference Include="..\Zoomicon.Text\Zoomicon.Text.pas"/>
573-
<DCCReference Include="Views\Options\READCOM.Views.Options.TextStoryItemOptions.pas">
574-
<Form>TextStoryItemOptions</Form>
575-
<FormType>fmx</FormType>
575+
<DCCReference Include="Views\READCOM.Views.Wait.pas">
576+
<Form>WaitFrame</Form>
576577
<DesignClass>TFrame</DesignClass>
577578
</DCCReference>
579+
<DCCReference Include="READCOM.App.Main.pas"/>
580+
<DCCReference Include="READCOM.App.Debugging.pas"/>
581+
<DCCReference Include="READCOM.App.Messages.pas"/>
578582
<DCCReference Include="..\3rdPartyLib\SVGIconImageList\Source\FMX.Image32SVG.pas"/>
579583
<DCCReference Include="..\3rdPartyLib\SVGIconImageList\Image32\source\Img32.SVG.Core.pas"/>
580584
<RcItem Include="Default.readcom">

0 commit comments

Comments
 (0)