From d644cf2ee6e70c975e75a3fe33e8b09f67b442e5 Mon Sep 17 00:00:00 2001
From: Andrey Zakharov <mediaexplorer74@hotmail.com>
Date: Tue, 16 Nov 2021 15:17:20 +0300
Subject: [PATCH] .

---
 AstoriaUWP/AstoriaUWP.csproj    | 12 +++++++++---
 AstoriaUWP/EmuPage.xaml.cs      |  4 ++--
 AstoriaUWP/MainPage.xaml        |  2 +-
 AstoriaUWP/MainPage.xaml.cs     |  9 ++++-----
 AstoriaUWP/Package.appxmanifest |  6 +++---
 README.md                       | 19 ++++++++++++-------
 6 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/AstoriaUWP/AstoriaUWP.csproj b/AstoriaUWP/AstoriaUWP.csproj
index 1eba858..29ca4d2 100644
--- a/AstoriaUWP/AstoriaUWP.csproj
+++ b/AstoriaUWP/AstoriaUWP.csproj
@@ -17,12 +17,18 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>AstoriaUWP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|arm</AppxBundlePlatforms>
     <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-    <PackageCertificateThumbprint>17E9959043E6A7C22F619A9C0E5B6BCF507E64B7</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>
+    </PackageCertificateThumbprint>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/AstoriaUWP/EmuPage.xaml.cs b/AstoriaUWP/EmuPage.xaml.cs
index 3407a03..ede94b7 100644
--- a/AstoriaUWP/EmuPage.xaml.cs
+++ b/AstoriaUWP/EmuPage.xaml.cs
@@ -126,8 +126,8 @@ private async void Render()
 
                 ContentDialog msgDialog = new ContentDialog()
                 {
-                    Title = "Activity_main.xml not found :( " +
-                      "It must be created manually. Use target x86 and your desktop pc to fix this xml problems.)",
+                    Title = "Activity_main.xml not found! " +
+                      "It must be created manually (in App Storage).",
                     Content = "Activity_main.xml critical problems: " + ex.Message,
                     PrimaryButtonText = "OK"
                 };
diff --git a/AstoriaUWP/MainPage.xaml b/AstoriaUWP/MainPage.xaml
index 646a9db..92c9c0b 100644
--- a/AstoriaUWP/MainPage.xaml
+++ b/AstoriaUWP/MainPage.xaml
@@ -14,7 +14,7 @@
         
         <ListBox x:Name="AppListBox" Margin="0,43,0,65" SelectionChanged="AppListBox_SelectionChanged">
             <ListBoxItem Content="Settings"/>
-            <ListBoxItem Content="Install Apk"/>
+            <ListBoxItem Content="Load and install testdpc7.apk"/>
         </ListBox>
         <!--<ScrollViewer FontFamily="Segoe UI Symbol"/>-->
     </Grid>
diff --git a/AstoriaUWP/MainPage.xaml.cs b/AstoriaUWP/MainPage.xaml.cs
index 3be6ac4..fac6e00 100644
--- a/AstoriaUWP/MainPage.xaml.cs
+++ b/AstoriaUWP/MainPage.xaml.cs
@@ -156,7 +156,7 @@ private async void AppListBox_SelectionChanged(object sender, SelectionChangedEv
                     Frame.Navigate(typeof(SettingsPage));
                 }
 
-                if (str_idx == "Install Apk")
+                if (str_idx == "Load and install testdpc7.apk")
                 {
                     // Go to Setting Page
                     Frame.Navigate(typeof(InstallApkPage));
@@ -169,13 +169,12 @@ private async void AppListBox_SelectionChanged(object sender, SelectionChangedEv
 
                     if (Result == false)
                     {
-                        Debug.WriteLine("Some problems: helloworld.apk test file not found at Pictures folder");
+                        Debug.WriteLine("Some problems: testdpc7.apk test file not found at Pictures folder");
 
                         ContentDialog msgDialog = new ContentDialog()
                         {
-                            Title = "Caution: helloworld.apk test file not found at Pictures folder",
-                            Content = "Install button is for test purposes only. " +
-                            "To install your own apk file, run(click) it via Explorer.",
+                            Title = "Caution: testdpc7.apk test file not found at Pictures folder",
+                            Content = "Install button is for test purposes only.",
                             PrimaryButtonText = "OK"
                         };
 
diff --git a/AstoriaUWP/Package.appxmanifest b/AstoriaUWP/Package.appxmanifest
index a06689e..0a14702 100644
--- a/AstoriaUWP/Package.appxmanifest
+++ b/AstoriaUWP/Package.appxmanifest
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"  xmlns:iot="http://schemas.microsoft.com/appx/manifest/iot/windows10"  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap mp iot uap3">
-  <Identity Name="AstoriaUWPv0006" Publisher="CN=media" Version="0.0.6.0" />
+  <Identity Name="AstoriaUWPv0007" Publisher="CN=media" Version="0.0.7.0" />
   <mp:PhoneIdentity PhoneProductId="ac6319f9-004f-4ef0-8c76-cd14b9dfecec" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
-    <DisplayName>Astoria 0.0.0.6</DisplayName>
+    <DisplayName>Astoria 0.0.0.7</DisplayName>
     <PublisherDisplayName>mediaexplorer</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -15,7 +15,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="DalvikUWPCSharp.App">
-      <uap:VisualElements DisplayName="Astoria 0.0.0.6" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="DalvikUWPCSharp" BackgroundColor="transparent">
+      <uap:VisualElements DisplayName="Astoria 0.0.0.7" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Project Astoria Remake" BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png">
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />
diff --git a/README.md b/README.md
index 7bae7a4..89c8d12 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# AstoriaUWP 0.0.0.6
+# AstoriaUWP 0.0.0.7
 
 Forked from: https://github.com/Ticomware/AstoriaUWP
 
@@ -8,7 +8,9 @@ Forked from: https://github.com/Ticomware/AstoriaUWP
 Original status: Archived (Public archive)
 
 ## My actions (my 2 cents) 
+
 1. Renamed DalvikUWPCSharp.sln onto AstoriaUWP.sln :)
+
 2. Lite bugfix (some try...catch added to avoid accident app halts...)
 
 ## Description
@@ -24,24 +26,27 @@ Note: This project was created as a proof-of-concept over a short amount of time
 ![Shot 1](Images/shot1.png)
 
 ## Coding "workbench"
-Visual Studio 2022 (But VS 2017 compatibility remained, for Live WinPhone debugging, heh!)
-Windows SDK 16053
+
+1. Visual Studio 2022 (But VS 2017 compatibility remained, for Live WinPhone debugging, heh!)
+
+2. Windows SDK 16053
+
 
 ## Test scenario
 
 Place _ASTORIA_/5 Test/testdpc7.apk at Pictures folder
 
-Run AstoriaUWP, and click Install Apk Button.
+Run AstoriaUWP, and click "Load and install testdpc7.apk" button.
 
-After loading phase, click Install app button.
+After loading phase, click "Install app" button.
 
-After installing phase, click App list.
+After installing phase, click "Apps list" button.
 
 Go to App Storage, find Layout folder.
 
 Place _ASTORIA_/5 Test/activity_main.xml at Layout folder.
 
-Try to run Emulator by tapping on TestDpc7 item.
+Try to run Emulator by tapping on "TestDpc7" item at apps list
 
 In result, the button 1 must be generated on Emu screen...