From 5b909f6d1acb3c8854f95a13232711558f851acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Przyby=C5=82a?= <wojprz@st.amu.edu.pl>
Date: Sat, 9 Jan 2021 18:15:51 +0100
Subject: [PATCH 1/2] =?UTF-8?q?POS-44=20Poprawiono=20wy=C5=9Bwietlanie=20b?=
 =?UTF-8?q?=C5=82=C4=99d=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Klient/Klient/Klient.Android/MainActivity.cs | 39 +++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/Klient/Klient/Klient.Android/MainActivity.cs b/Klient/Klient/Klient.Android/MainActivity.cs
index c7a2135..de6d9f5 100644
--- a/Klient/Klient/Klient.Android/MainActivity.cs
+++ b/Klient/Klient/Klient.Android/MainActivity.cs
@@ -45,16 +45,10 @@ namespace Klient.Droid
             var Login = FindViewById<EditText>(Resource.Id.Login).Text;
             SecureString Password = new NetworkCredential("", FindViewById<EditText>(Resource.Id.Password).Text).SecurePassword;
 
-            if (Login.Length < 3 || Login.Length > 12)
+           
+            if (string.IsNullOrWhiteSpace(new NetworkCredential("", Password).Password))
             {
                 FindViewById<TextView>(Resource.Id.ErrorLogIn).Text = "Hasło musi mieć od 3 do 12 znaków!";
-                FindViewById<EditText>(Resource.Id.Login).Text = "";
-                FindViewById<EditText>(Resource.Id.Password).Text = "";
-            }
-            else if (string.IsNullOrWhiteSpace(new NetworkCredential("", Password).Password))
-            {
-                FindViewById<TextView>(Resource.Id.ErrorLogIn).Text = "Hasło musi mieć od 3 do 12 znaków!";
-                FindViewById<EditText>(Resource.Id.Login).Text = "";
                 FindViewById<EditText>(Resource.Id.Password).Text = "";
             }
             else
@@ -85,7 +79,6 @@ namespace Klient.Droid
                 {
                     string msg = await response.Content.ReadAsStringAsync();
                     FindViewById<TextView>(Resource.Id.ErrorLogIn).Text = msg;
-                    FindViewById<EditText>(Resource.Id.Login).Text = "";
                     FindViewById<EditText>(Resource.Id.Password).Text = "";
                     
                 }
@@ -101,14 +94,35 @@ namespace Klient.Droid
             var Login = FindViewById<EditText>(Resource.Id.NewLogin).Text;
             SecureString Password = new NetworkCredential("", FindViewById<EditText>(Resource.Id.NewPassword).Text).SecurePassword;
             SecureString Password2 = new NetworkCredential("", FindViewById<EditText>(Resource.Id.RepeatPassword).Text).SecurePassword;
+            
+            if (Login.Length < 3 || Login.Length > 12)
+            {
+                FindViewById<TextView>(Resource.Id.ErrorRegister).Text = "Login musi mięć od 3 do 12 znaków!";
+                FindViewById<EditText>(Resource.Id.NewPassword).Text = "";
+                FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
 
-            if (new NetworkCredential("", Password).Password != new NetworkCredential("", Password2).Password)
+            }
+            else if (new NetworkCredential("", Password).Password.Length < 8 || new NetworkCredential("", Password).Password.Length > 20)
+            {
+                FindViewById<TextView>(Resource.Id.ErrorRegister).Text = "Hasło musi mieć od 8 do 20 znaków!";
+                FindViewById<EditText>(Resource.Id.NewPassword).Text = "";
+                FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
+
+            }
+
+            else if (new NetworkCredential("", Password).Password != new NetworkCredential("", Password2).Password)
             {
                 FindViewById<TextView>(Resource.Id.ErrorRegister).Text = "Hasła muszą być identyczne!";
-                FindViewById<EditText>(Resource.Id.NewLogin).Text = "";
-                FindViewById<EditText>(Resource.Id.Password).Text = "";
+                FindViewById<EditText>(Resource.Id.NewPassword).Text = "";
                 FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
             }
+            else if(string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.NewLogin).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.Email).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.NewPassword).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.RepeatPassword).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.Name).Text) || string.IsNullOrEmpty(FindViewById<EditText>(Resource.Id.Surname).Text))
+            {
+                FindViewById<TextView>(Resource.Id.ErrorRegister).Text = "Wartości nie mogą być puste!";
+                FindViewById<EditText>(Resource.Id.NewPassword).Text = "";
+                FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
+            }
+
             else
             {
                 var values = new Dictionary<string, string>
@@ -131,7 +145,6 @@ namespace Klient.Droid
                 {
                     string msg = await response.Content.ReadAsStringAsync();
                     FindViewById<TextView>(Resource.Id.ErrorRegister).Text = msg;
-                    FindViewById<EditText>(Resource.Id.NewLogin).Text = "";
                     FindViewById<EditText>(Resource.Id.Password).Text = "";
                     FindViewById<EditText>(Resource.Id.RepeatPassword).Text = "";
                 }

From 6126c2d929e9d104d1abb2223298cc3936066f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Przyby=C5=82a?= <wojprz@st.amu.edu.pl>
Date: Sat, 9 Jan 2021 19:27:00 +0100
Subject: [PATCH 2/2] =?UTF-8?q?POS-39=20Dodanie=20ekranu=20informacji=20do?=
 =?UTF-8?q?=20g=C5=82=C3=B3wnego=20ekranu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Klient/Klient/Klient.Android/MainActivity.cs  |  8 ++-
 .../Klient/Klient.Android/Poszukiwacz.csproj  |  5 ++
 .../Resources/layout/ekranInformacji.xml      | 57 +++++++++++++++++++
 .../Resources/layout/ekranLogowania.xml       |  2 +-
 .../Resources/layout/ekranPoLogowaniu.xml     |  3 +-
 .../Resources/layout/ekranPoZdjeciu.xml       |  9 +++
 .../Resources/layout/ekranProfil.xml          |  3 +-
 .../Resources/layout/ekranRejestracji.xml     |  2 +-
 .../Resources/layout/ekranStartowy.xml        | 17 +-----
 9 files changed, 86 insertions(+), 20 deletions(-)
 create mode 100644 Klient/Klient/Klient.Android/Resources/layout/ekranInformacji.xml

diff --git a/Klient/Klient/Klient.Android/MainActivity.cs b/Klient/Klient/Klient.Android/MainActivity.cs
index de6d9f5..e286b2d 100644
--- a/Klient/Klient/Klient.Android/MainActivity.cs
+++ b/Klient/Klient/Klient.Android/MainActivity.cs
@@ -172,9 +172,13 @@ namespace Klient.Droid
         [Java.Interop.Export("about")]
         public void MainScreenAbout(View v)
         {
-           SetContentView(Resource.Layout.ekranStartowy);
+           SetContentView(Resource.Layout.ekranInformacji);
+        }
+        [Java.Interop.Export("GoToMainScreenFromInformation")]
+        public void GoToMainScreenFromInformation(View v)
+        {
+            SetContentView(Resource.Layout.ekranStartowy);
         }
-
         [Java.Interop.Export("LoadFromFolder")]
         public void LoadFile(View v)
         {
diff --git a/Klient/Klient/Klient.Android/Poszukiwacz.csproj b/Klient/Klient/Klient.Android/Poszukiwacz.csproj
index c111326..26b87d0 100644
--- a/Klient/Klient/Klient.Android/Poszukiwacz.csproj
+++ b/Klient/Klient/Klient.Android/Poszukiwacz.csproj
@@ -149,6 +149,11 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResourceAnalysisConfig Include="Resources\layout\ekranInformacji.xml">
+      <SubType>Designer</SubType>
+    </AndroidResourceAnalysisConfig>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranInformacji.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranInformacji.xml
new file mode 100644
index 0000000..6b6adc4
--- /dev/null
+++ b/Klient/Klient/Klient.Android/Resources/layout/ekranInformacji.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffbdd7f0"
+    android:paddingTop="30dp">
+    <TextView
+        android:text="Poszukiwacz"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="25px"
+        android:minHeight="25px"
+        android:id="@+id/title"
+        android:layout_centerHorizontal="true"
+        android:textSize="50dp"
+        android:textStyle="bold" />
+    <TextView
+        android:text="Poszukiwacz jest aplikacją mobilną pozwalającą na wyszukiwanie w Internece stron zawierających schematy i tutoriale na podstawie treści zadania. \n Jednocześnie pomaga w nauce, jaki i przyśpiesza proces dokonywania researchu danych. "
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/textView1"
+        android:layout_below="@id/title"
+        android:layout_centerInParent="true"
+        android:gravity="center_horizontal" />
+    <TextView
+        android:text="Poszukiwacz 2021"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/text1"
+        android:textColor="#ff000000"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
+    <Button
+        android:text="Back"
+        android:layout_width="38.5dp"
+        android:layout_height="35.0dp"
+        android:id="@+id/backInformation"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
+        android:gravity="center"
+        android:onClick="GoToMainScreenFromInformation" />
+
+
+
+
+
+</RelativeLayout>
+    
    

diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml
index 9b6b755..884e872 100644
--- a/Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml
+++ b/Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml
@@ -92,7 +92,7 @@
         android:layout_below="@id/In"
         android:layout_centerHorizontal="true" />
     <TextView
-        android:text="Poszukiwacz 2020"
+        android:text="Poszukiwacz 2021"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranPoLogowaniu.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranPoLogowaniu.xml
index 5ee46b3..272781e 100644
--- a/Klient/Klient/Klient.Android/Resources/layout/ekranPoLogowaniu.xml
+++ b/Klient/Klient/Klient.Android/Resources/layout/ekranPoLogowaniu.xml
@@ -21,7 +21,8 @@
         android:layout_marginLeft="75dp"
         android:onClick="LoadFromFolder" />
     <TextView
-        android:text="Poszukiwacz 2020"
+        android:text="Poszukiwacz 2021"
+        android:text="Poszukiwacz 2021"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranPoZdjeciu.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranPoZdjeciu.xml
index 96d15dc..ebe2996 100644
--- a/Klient/Klient/Klient.Android/Resources/layout/ekranPoZdjeciu.xml
+++ b/Klient/Klient/Klient.Android/Resources/layout/ekranPoZdjeciu.xml
@@ -38,4 +38,13 @@
         android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="GoToPoLogowaniu" />
+    <TextView
+        android:text="Poszukiwacz 2021"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/text1"
+        android:textColor="#ff000000"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
 </RelativeLayout>
diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranProfil.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranProfil.xml
index 8334e3f..0349915 100644
--- a/Klient/Klient/Klient.Android/Resources/layout/ekranProfil.xml
+++ b/Klient/Klient/Klient.Android/Resources/layout/ekranProfil.xml
@@ -94,7 +94,8 @@
         android:layout_below="@id/Save"
         android:textColor="#ffd60000" />
     <TextView
-        android:text="Poszukiwacz 2020"
+        android:text="Poszukiwacz 2021"
+        android:text="Poszukiwacz 2021"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml
index c7c6527..cf066e6 100644
--- a/Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml
+++ b/Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml
@@ -132,7 +132,7 @@
         android:layout_centerHorizontal="true"
         android:onClick="SignUp" />
     <TextView
-        android:text="Poszukiwacz 2020"
+        android:text="Poszukiwacz 2021"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranStartowy.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranStartowy.xml
index 5d818ae..e32f64a 100644
--- a/Klient/Klient/Klient.Android/Resources/layout/ekranStartowy.xml
+++ b/Klient/Klient/Klient.Android/Resources/layout/ekranStartowy.xml
@@ -20,7 +20,7 @@
         android:textSize="45dp"
         android:layout_marginVertical="100dp" />
     <TextView
-        android:text="Poszukiwacz 2020"
+        android:text="Poszukiwacz 2021"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,27 +29,16 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true" />
     <Button
-        android:text="?"
+        android:text="i"
         android:layout_width="35.0dp"
         android:layout_height="35.0dp"
-        android:id="@+id/help"
+        android:id="@+id/about"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:background="#ff0b31c8"
         android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="HelpLoginScreen" />
-    <Button
-        android:text="I"
-        android:layout_width="35.0dp"
-        android:layout_height="35.0dp"
-        android:id="@+id/about"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:background="#ff0b31c8"
-        android:textColor="#fffcfcfc"
-        android:gravity="center"
-        android:onClick="AboutMainScreen" />
     <Button
         android:text="Zaloguj"
         android:layout_width="200.0dp"