Set Android MinSdkVersion to 19, Using Name and StoragePath to save l…

…ast state in non-transient way (and with .readcom file extension)
Zoomicon · Jun 5, 2022 · 9b6a330 · 9b6a330
1 parent fbbfe92
commit 9b6a330
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 26 deletions.
diff --git a/App/AndroidManifest.template.xml b/App/AndroidManifest.template.xml
@@ -5,7 +5,7 @@
     android:versionCode="%versionCode%"
     android:versionName="%versionName%"
     android:installLocation="%installLocation%">
-    <uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="%targetSdkVersion%" />
 <%uses-permission%>
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
     <queries>

diff --git a/App/READCOM_App.deployproj b/App/READCOM_App.deployproj
@@ -5,7 +5,7 @@
     </ProjectExtensions>
     <PropertyGroup>
         <DeviceId Condition="'$(Platform)'=='Android'"/>
-        <DeviceId Condition="'$(Platform)'=='Android64'"/>
+        <DeviceId Condition="'$(Platform)'=='Android64'">HGAJGEJN</DeviceId>
         <DeviceId Condition="'$(Platform)'=='iOSDevice64'"/>
     </PropertyGroup>
     <ItemGroup Condition="'$(Platform)'=='OSX64'">
@@ -661,15 +661,6 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="Android\Release\libREADCOM_App.so" Condition="'$(Config)'=='Release'">
-            <RemoteDir>READCOM_App\library\lib\armeabi-v7a\</RemoteDir>
-            <RemoteName>libREADCOM_App.so</RemoteName>
-            <DeployClass>ProjectOutput_Android32</DeployClass>
-            <Operation>1</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-        </DeployFile>
         <DeployFile Include="Android64\Debug\strings.xml" Condition="'$(Config)'=='Debug'">
             <RemoteDir>READCOM_App\res\values\</RemoteDir>
             <RemoteName>strings.xml</RemoteName>

diff --git a/App/READCOM_App.dproj b/App/READCOM_App.dproj
@@ -859,12 +859,6 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Android\Release\libREADCOM_App.so" Configuration="Release" Class="ProjectOutput_Android32">
-                    <Platform Name="Android64">
-                        <RemoteName>libREADCOM_App.so</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
                 <DeployFile LocalName="Android\Release\READCOM_App.classes" Configuration="Release" Class="AndroidClasses">
                     <Platform Name="Android">
                         <Operation>64</Operation>

diff --git a/App/Views/READCOM.Views.Main.pas b/App/Views/READCOM.Views.Main.pas
@@ -174,6 +174,7 @@   TMainForm = class(TForm, IStory)
 implementation
   uses
     System.Contnrs, //for TClassList
+    System.IOUtils, //for TPath
     System.Math, //for Max
     System.Net.URLClient, //for TURLStream (Delphi 11.1+)
     Zoomicon.Helpers.RTL.ClassListHelpers, //for TClassList.Create(TClassArray)
@@ -1121,9 +1122,12 @@ function TMainForm.LoadCommandLineParameter: Boolean;
 
 function TMainForm.LoadSavedState: Boolean;
 begin
+  Log('LoadSavedState');
+
   With SaveState do
   begin
-    //StoragePath := ... //TODO: default is transient, change to make permanent
+    Name := 'SavedState.readcom';
+    StoragePath := TPath.GetHomePath;
     result := LoadFromStream(Stream, false); //don't ActivateHome, keep last Active one (needed in case the OS brought down the app and need to continue from where we were from saved state)
   end;
 end;
@@ -1157,13 +1161,17 @@ function TMainForm.LoadDefaultDocument: Boolean;
 
 procedure TMainForm.SaveCurrentState;
 begin
-  Log('SaveState');
-  //StoragePath := ... //TODO: default is transient, change to make permanent
-  SaveState.Stream.Clear;
+  Log('SaveCurrentState');
 
-  var TheRootStoryItemView := RootStoryItemView;
-  if Assigned(TheRootStoryItemView) then
-    with SaveState do
+  with SaveState do
+  begin
+    Name := 'SavedState.readcom';
+    StoragePath := TPath.GetHomePath;
+
+    Stream.Clear;
+
+    var TheRootStoryItemView := RootStoryItemView;
+    if Assigned(TheRootStoryItemView) then
       try
         TheRootStoryItemView.Save(Stream); //default file format is EXT_READCOM
       except
@@ -1173,7 +1181,8 @@ procedure TMainForm.SaveCurrentState;
           Log(E);
           ShowException(E, @TMainForm.SaveCurrentState);
           end;
-    end;
+      end;
+  end;
 end;
 
 procedure TMainForm.FormSaveState(Sender: TObject);

diff --git a/Zoomicon.Media/Zoomicon.Media.FMX.dproj b/Zoomicon.Media/Zoomicon.Media.FMX.dproj
@@ -6,7 +6,7 @@
         <FrameworkType>None</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">OSX64</Platform>
         <TargetedPlatforms>168979</TargetedPlatforms>
         <AppType>Package</AppType>
         <Platform>OSX64</Platform>