Assembly v 2.5 (14.05.22)

adslbarxatov · May 14, 2022 · 76e8da8 · 76e8da8
1 parent 3853a8f
commit 76e8da8
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 20 deletions.
diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml
@@ -16,7 +16,7 @@ jobs:
 # Константы, используемые далее по тексту
     env:
       PROJ: EnchantIt
-      TAG: 2.0.4
+      TAG: 2.5
 
     steps:
 # Проверка состава репозитория

diff --git a/.release/PADetector.apk b/.release/PADetector.apk
diff --git a/.release/Release.md b/.release/Release.md
@@ -1,8 +1,6 @@
-_Изменения для v 2.0.4_:
+_Изменения для v 2.5_:
+- Implemented the graphical representation for PRNG data (test mode);
+- Implemented the combined method for PRN generation;
 - Xamarin support libraries have been updated;
-- Some adjustments applied to the user interface;
 - Added some extra warnings about the availability of the app;
-- Implemented the “messaging system”: app now able to translate PRNG flow into “pseudotext” messages with probability of meaningful answers. The next step will open translation into small images (in progress for now);
-- User interface has been improved;
-- Some tips and texts have been updated;
 - User guide has been updated
diff --git a/Changes.log b/Changes.log
@@ -1,7 +1,8 @@
 PA detector changes log:
 
-ToDo:
-- Create the painter
+Version 2.5:
+• Implemented the graphical representation for PRNG data (test mode);
+• Implemented the combined method for PRN generation
 
 Version 2.0.4:
 • Xamarin support libraries have been updated

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# EnchantIt v 2.0.4
+# EnchantIt v 2.5
 
 
 PA detector (formerly known as EnchantIt), the paranormal activity search tool

diff --git a/src/AndroidManifest.xml b/src/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- enchantit.huawei -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.RD_AAOW.EnchantIt"
-		android:installLocation="internalOnly" android:versionCode="600204" android:versionName="2.0.4">
+		android:installLocation="internalOnly" android:versionCode="600205" android:versionName="2.5">
 
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="31" />
 

diff --git a/src/EnchantIt_en_us.resx b/src/EnchantIt_en_us.resx
@@ -224,18 +224,24 @@ Swipe this screen to the right to start the experiment</value>
   <data name="ManualPage" xml:space="preserve">
     <value>User videoguide</value>
   </data>
-  <data name="MethodCore" xml:space="preserve">
+  <data name="Method00" xml:space="preserve">
     <value>Method based on OS kernel entropy</value>
   </data>
+  <data name="Method01" xml:space="preserve">
+    <value>Method based on WiFi signal</value>
+  </data>
+  <data name="Method02" xml:space="preserve">
+    <value>Combined method (core + WiFi)</value>
+  </data>
+  <data name="MethodName" xml:space="preserve">
+    <value>Method {0:D}: </value>
+  </data>
   <data name="MethodPage" xml:space="preserve">
     <value>Complete description</value>
   </data>
   <data name="MethodSelect" xml:space="preserve">
     <value>Select random number generation method:</value>
   </data>
-  <data name="MethodWiFi" xml:space="preserve">
-    <value>Default method based on WiFi signal</value>
-  </data>
   <data name="NextButton" xml:space="preserve">
     <value>Next</value>
   </data>

diff --git a/src/EnchantIt_ru_ru.resx b/src/EnchantIt_ru_ru.resx
@@ -224,18 +224,24 @@
   <data name="ManualPage" xml:space="preserve">
     <value>Видеоруководство</value>
   </data>
-  <data name="MethodCore" xml:space="preserve">
-    <value>Метод, основанный на энтропии ядра ОС</value>
+  <data name="Method00" xml:space="preserve">
+    <value>Метод на базе энтропии ядра ОС</value>
+  </data>
+  <data name="Method01" xml:space="preserve">
+    <value>Метод на базе сигнала WiFi</value>
+  </data>
+  <data name="Method02" xml:space="preserve">
+    <value>Комбинированный метод (ядро + WiFi)</value>
+  </data>
+  <data name="MethodName" xml:space="preserve">
+    <value>Метод {0:D}: </value>
   </data>
   <data name="MethodPage" xml:space="preserve">
     <value>Полное описание</value>
   </data>
   <data name="MethodSelect" xml:space="preserve">
     <value>Выберите метод генерации случайных чисел:</value>
   </data>
-  <data name="MethodWiFi" xml:space="preserve">
-    <value>Стандартный метод на базе сигнала WiFi</value>
-  </data>
   <data name="NextButton" xml:space="preserve">
     <value>Далее</value>
   </data>

diff --git a/src/MasterPage.xaml b/src/MasterPage.xaml
@@ -6,6 +6,6 @@
 
 	<mypages:SolutionPage x:Name="SolutionPage" />
 	<mypages:TTM1Page x:Name="TTM1Page" />
-	<!--<mypages:TTM2Page x:Name="TTM2Page" />-->
+	<mypages:TTM2Page x:Name="TTM2Page" />
 	<mypages:AboutPage x:Name="AboutPage" />
 </CarouselPage>