Klient/Klient/Klient.Android/MainActivity.cs

@@ -12,29 +12,16 @@ using System.Collections.Generic;
 using System.Security;
 using System.Net;
 using System.Linq;
-
+using System.IO;
 using Newtonsoft.Json;
 using Klient.Droid.Modules;
-using Android.Provider;
-using Android.Content;
-using Android.Graphics;
 using Newtonsoft.Json.Linq;
 
-using Com.Xamarin.Formsviewgroup;
-using Android.Icu.Text;
-using System.IO;
-using Android.Media;
-using System.Threading.Tasks;
-using Java.IO;
-using System.Net.Http.Headers;
-
 namespace Klient.Droid
 {
     [Activity(Label = "Klient", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
-        Bitmap bitmap;
-        ByteArrayContent fileContent;
         public static int PickImageId = 1000;
         private static readonly HttpClient client = new HttpClient();
         public static Android.Content.Intent photo;
@@ -50,9 +37,7 @@ namespace Klient.Droid
 
             base.OnCreate(savedInstanceState);
             global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
-            StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
+            LoadApplication(new App());
-            StrictMode.SetVmPolicy(builder.Build());
-            LoadApplication(new App());
             SetContentView(Resource.Layout.ekranStartowy);
         }
 
@@ -77,7 +62,7 @@ namespace Klient.Droid
                 };
 
                 var content = new FormUrlEncodedContent(values);
-                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/User/SignIn", content);
+                var response = await client.PostAsync("http://10.0.2.2:5001/api/User/SignIn", content);
 
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
@@ -102,12 +87,6 @@ namespace Klient.Droid
             }
         }
 
-        [Java.Interop.Export("HelpLoginScreen")]
-        public void GoToAboutScreen(View v)
-        {
-            SetContentView(Resource.Layout.ekranInformacji);
-        }
-
         [Java.Interop.Export("SignUp")]
         async public void SignUp(View v)
         {
@@ -159,7 +138,7 @@ namespace Klient.Droid
 
                 var content = new FormUrlEncodedContent(values);
 
-                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/User/Register", content);
+                var response = await client.PostAsync("http://10.0.2.2:5001/api/User/Register", content);
 
                 var responseString = await response.Content.ReadAsStringAsync();
 
@@ -174,13 +153,6 @@ namespace Klient.Droid
             }
         }
 
-        [Java.Interop.Export("HelpRegisterScreen")]
-        public void GoToRegisterHelp(View v)
-        {
-            SetContentView(Resource.Layout.ekranPomocRejestracja);
-        }
-
-
         [Java.Interop.Export("GoToProfile")]
         public void GoBackToProfile(View v)
         {
@@ -204,6 +176,11 @@ namespace Klient.Droid
             SetContentView(Resource.Layout.ekranRejestracji);
         }
 
+        [Java.Interop.Export("HelpLoginScreen")]
+        public void MainScreenAbout(View v)
+        {
+           SetContentView(Resource.Layout.ekranInformacji);
+        }
         [Java.Interop.Export("GoToMainScreenFromInformation")]
         public void GoToMainScreenFromInformation(View v)
         {
@@ -218,16 +195,6 @@ namespace Klient.Droid
 
             StartActivityForResult(Android.Content.Intent.CreateChooser(Intent, "Select Picture"), PickImageId);
         }
-
-        [Java.Interop.Export("LoadFromCamera")]
-        public void LoadFromCamera(View v)
-        { 
-            Intent intent = new Intent(MediaStore.ActionImageCapture);
-            StartActivityForResult(intent, 0);
-
-        }
-
-
         [Java.Interop.Export("GoToStart")]
         public void GoToStart(View v)
         {
@@ -242,117 +209,37 @@ namespace Klient.Droid
         protected override void OnActivityResult(int requestCode, Result resultCode, Android.Content.Intent data)
         {
             SetContentView(Resource.Layout.ekranPoZdjeciu);
-            FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = "";
+            Android.Net.Uri uri = data.Data;
-            if (requestCode == 0)
+            photo = data;
-            {
+            FindViewById<ImageView>(Resource.Id.Preview).SetImageURI(uri);
-                photo = data;
-                base.OnActivityResult(requestCode, resultCode, data);
-                if (data != null)
-                {
-                    bitmap = (Bitmap)data.Extras.Get("data");
 
-                    byte[] bitmapData;
-                    var stream = new MemoryStream();
-                    bitmap.Compress(Bitmap.CompressFormat.Png, 100, stream);
-                    bitmapData = stream.ToArray();
-                    fileContent = new ByteArrayContent(bitmapData);
-
-
-                    FindViewById<ImageView>(Resource.Id.Preview).SetImageBitmap(bitmap);
-                }
-                else SetContentView(Resource.Layout.ekranPoLogowaniu);
-
-            }
-            else if(requestCode == PickImageId)
-            {
-                if(data == null) SetContentView(Resource.Layout.ekranPoLogowaniu);
-                else
-                {
-                    Android.Net.Uri uri = data.Data;
-                    photo = data;
-                    FindViewById<ImageView>(Resource.Id.Preview).SetImageURI(uri);
-                }
-            }
-            else if(data == null)
-            {
-                SetContentView(Resource.Layout.ekranPoLogowaniu);
-            }
-                       
         }
 
-
         [Java.Interop.Export("SendPhoto")]
         async public void UploadPhoto(View v)
         {
-            if(photo.Data == null)
-            {
-                fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/octet-stream");
-                fileContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data")
-                {
-                    Name = "image",
-                    FileName = Guid.NewGuid().ToString()
-                };
-
-                string boundary = "---8d0f01e6b3b5dafaaadaad";
-                MultipartFormDataContent formDataContent = new MultipartFormDataContent(boundary);
-                formDataContent.Add(fileContent);
-
-                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/Image/Process", formDataContent);
-                if (response.StatusCode == HttpStatusCode.OK)
-                {
-                    var jsonString = await response.Content.ReadAsStringAsync();
-                    FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = "Przesłano zdjęcie!";
-                    SetContentView(Resource.Layout.ekranZLinkami);
-                    var second_response = await client.GetAsync($"https://pixblocksaddition.azurewebsites.net/api/Search/{jsonString}");
-                    if (second_response.StatusCode == HttpStatusCode.OK)
-                    {
-                        var second_jsonString = await response.Content.ReadAsStringAsync();
-
-                        List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonString);
-
-                        int end = 10;
-                        if (fullLink.Count < 10) end = fullLink.Count;
-                            for (int i = 0; i < end; i++)
-                            {
-                                FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].title + ": \n" + fullLink[i].link + "\n\n";
-                            }
-
-                    }
-                    else
-                    {
-                        FindViewById<TextView>(Resource.Id.links).Text = "Coś poszło nie tak!";
-                    }
-
-
-                }
-                else
-                {
-                    string msg = await response.Content.ReadAsStringAsync();
-                    FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = msg;
-                }
-            }
-
             using(var imageStream = ContentResolver.OpenInputStream(photo.Data))
                 using(var stramContent = new StreamContent(imageStream))
                 using(var byteArrayContent = new ByteArrayContent(await stramContent.ReadAsByteArrayAsync()))
                 using(var formDataContent = new MultipartFormDataContent())
-                {
+            {
                 formDataContent.Add(byteArrayContent, "image", Guid.NewGuid() + ".jpg");
                 foreach (var content in formDataContent)
                 {
                     content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(ContentResolver.GetType(photo.Data));
                     break;
                 }
-                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/Image/Process", formDataContent);
+                var response = await client.PostAsync("http://10.0.2.2:5001/api/Image/Process", formDataContent);
                 if(response.StatusCode == HttpStatusCode.OK)
                 {
                     var jsonString = await response.Content.ReadAsStringAsync();
                     FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = "Przesłano zdjęcie!";
                     SetContentView(Resource.Layout.ekranZLinkami);
-                    var second_response = await client.GetAsync($"https://pixblocksaddition.azurewebsites.net/api/Search/{jsonString}");
+                    var second_response = await client.GetAsync($"http://10.0.2.2:5001/api/Search/{jsonString}");
                     if(second_response.StatusCode == HttpStatusCode.OK)
                     {
                         var second_jsonString = await second_response.Content.ReadAsStringAsync();
+                        
                         List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonString);
 
                         int end = 10;
@@ -374,7 +261,7 @@ namespace Klient.Droid
                     string msg = await response.Content.ReadAsStringAsync();
                     FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = msg;
                 }
-                }
+            }
         }
 
         [Java.Interop.Export("GoToProfil")]
@@ -415,7 +302,7 @@ namespace Klient.Droid
                     { "login", savedLogin }
                 };
                 var content = new FormUrlEncodedContent(values);
-                var response = await client.PostAsync("https://pixblocksaddition.azurewebsites.net/api/User/Update", content);
+                var response = await client.PostAsync("http://10.0.2.2:5001/api/User/Update", content);
 
             if (response.StatusCode == HttpStatusCode.OK)
             {
@@ -438,7 +325,7 @@ namespace Klient.Droid
         public async void GetUserHistory(View v)
         {
             SetContentView(Resource.Layout.ekranHistorii);
-            var response = await client.GetAsync("https://pixblocksaddition.azurewebsites.net/api/History");
+            var response = await client.GetAsync("http://10.0.2.2:5001/api/History");
             if (response.StatusCode == HttpStatusCode.OK)
             {
                 var jsonString = await response.Content.ReadAsStringAsync();
@@ -456,22 +343,8 @@ namespace Klient.Droid
             }
             else
             {
-                string msg = await response.Content.ReadAsStringAsync();
+                FindViewById<TextView>(Resource.Id.history).Text = "Coś poszło nie tak!";
-                FindViewById<TextView>(Resource.Id.HistoryError).Text = msg;
             }
         }
-
-        [Java.Interop.Export("HelpPhoto")]
-        public void GotToHelpPhoto(View v)
-        {
-            SetContentView(Resource.Layout.ekranPomocZdjecie);
-        }
-
-        [Java.Interop.Export("LogOut")]
-        public void LogOut(View v)
-        {
-            SetContentView(Resource.Layout.ekranStartowy);
-
-        }
     }
 }

Klient/Klient/Klient.Android/Poszukiwacz.csproj

@@ -36,7 +36,6 @@
     <BundleAssemblies>false</BundleAssemblies>
     <MandroidI18n />
     <Debugger>Xamarin</Debugger>
-    <AndroidSupportedAbis />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -150,6 +149,11 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResourceAnalysisConfig Include="Resources\layout\ekranPomocRejestracja.xml">
+      <SubType>Designer</SubType>
+    </AndroidResourceAnalysisConfig>
+  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\ekranPomocZdjecie.xml">
       <SubType>Designer</SubType>
@@ -170,20 +174,6 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\ekranPomocRejestracja.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\Obraz4.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\xml\file_paths.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\Obraz8.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

Klient/Klient/Klient.Android/Properties/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.Klient.Android" android:installLocation="internalOnly">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.Klient.Android" android:installLocation="preferExternal">
-	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="27" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-	<application android:label="Klient.Android" android:usesCleartextTraffic="true" android:theme="@style/Base.Theme.AppCompat.Light.DarkActionBar" />
+	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-permission android:name="android.permission.INTERNET" />
+	<application android:label="Klient.Android" android:usesCleartextTraffic="true" android:theme="@style/Base.Theme.AppCompat.Light.DarkActionBar" />
 </manifest>

Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml

@@ -7,16 +7,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#ffbdd7f0">
-    <ImageButton
+    <Button
-        android:src="@drawable/obraz4"
+        android:text="Back"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backHistory"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
-        android:onClick="GoToPoLogowaniu" />
+        android:onClick="GoToProfile" />
     <TextView
         android:text="Poszukiwacz 2021"
         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -25,7 +26,7 @@
         android:id="@+id/text3"
         android:textColor="#ff000000"
         android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"/>
+        android:layout_centerHorizontal="true" />
     <TextView
         android:text="Historia wyszukiwań"
         android:textAppearance="?android:attr/textAppearanceLarge"
@@ -43,27 +44,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/history"
-        android:layout_below="@+id/HistoryError"
-        android:textColor="#ff000000"
-        android:paddingBottom="35dp"
-        android:focusableInTouchMode="true"
-        android:isScrollContainer="true"
-        android:fadeScrollbars="true"
-        android:scrollbars="vertical"
-        android:verticalScrollbarPosition="right"
-        android:scrollIndicators="right"
-        android:scrollbarAlwaysDrawVerticalTrack="true"
-        android:textIsSelectable="true"
-        android:paddingTop="10dp"/>
-    <TextView
-        android:text=""
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/HistoryError"
         android:layout_below="@+id/HistoryTitle"
-        android:textColor="#ffff0000"
+        android:textColor="#ff000000" />
-        android:layout_centerInParent="true"
-        android:paddingTop="10dp" />
 
 </RelativeLayout>

Klient/Klient/Klient.Android/Resources/layout/ekranInformacji.xml

@@ -39,14 +39,15 @@
         android:textColor="#ff000000"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true" />
-    <ImageButton
+    <Button
-        android:src="@drawable/obraz4"
+        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="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="GoToMainScreenFromInformation" />
 

Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml

@@ -60,14 +60,15 @@
         android:text="Zaloguj"
         android:layout_centerHorizontal="true"
         android:foregroundGravity="center" />
-    <ImageButton
+    <Button
-        android:src="@drawable/obraz4"
+        android:text="Back"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backLogowanie"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="GoToStart"/>
     <TextView

Klient/Klient/Klient.Android/Resources/layout/ekranPoLogowaniu.xml

@@ -54,8 +54,8 @@
         android:onClick="LoadFromCamera" />
     <Button
         android:text="?"
-        android:layout_width="25.0dp"
+        android:layout_width="35.0dp"
-        android:layout_height="25.0dp"
+        android:layout_height="35.0dp"
         android:id="@+id/helpPhoto"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"

Klient/Klient/Klient.Android/Resources/layout/ekranPoZdjeciu.xml

@@ -27,14 +27,15 @@
         android:layout_centerHorizontal="true"
         android:layout_below="@id/SendPhoto"
         android:textColor="#ffd60000" />
-    <ImageButton
+    <Button
-        android:src="@drawable/obraz4"
+        android:text="Back"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backZdjecie"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="GoToPoLogowaniu" />
     <TextView

Klient/Klient/Klient.Android/Resources/layout/ekranPomocRejestracja.xml

@@ -27,17 +27,6 @@
         android:layout_below="@+id/loginTip"
         android:paddingTop="10dp"
         android:textColor="#ff000000" />
-    <TextView
-        android:text="Wszystkie pola formularza są wymagane!"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="25px"
-        android:minHeight="25px"
-        android:id="@+id/GeneralTip"
-        android:layout_below="@+id/passwordTip"
-        android:paddingTop="10dp"
-        android:textColor="#ff000000" />
     <TextView
         android:text="To jest pomoc \n w rejestracji \n co miałem  \n napisac"
         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -46,8 +35,7 @@
         android:id="@+id/textView1"
         android:textColor="#ffb1d5f8"
         android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true" />
+        android:layout_alignParentBottom="true" />
    <TextView
-    <TextView
         android:text="Poszukiwacz 2021"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
@@ -55,16 +43,14 @@
         android:id="@+id/text1"
         android:textColor="#ff000000"
         android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true" />
+        android:layout_centerHorizontal="true" />
    <Button
-    <ImageButton
+        android:text="Back"
-        android:src="@drawable/obraz4"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backRegisterHelp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
-        android:onClick="GoToRegister" />
+        android:onClick="GoToRegister" />

</RelativeLayout>
-
-</RelativeLayout>

Klient/Klient/Klient.Android/Resources/layout/ekranPomocZdjecie.xml

@@ -15,22 +15,22 @@
         android:textColor="#ff000000"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true" />
-    <ImageButton
+    <Button
-        android:src="@drawable/obraz4"
+        android:text="Back"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backPomocZdjecie"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="GoToPoLogowaniu" />
     <TextView
-        android:text="W celu załadowania zdjęcia z pamięci telefonu \nwybierz ikonę folderu, w celu zrobienia zdjęcia \nwybierz ikonę aparatu i postępuj jak przy robieniu zdjęcia. \nNa następnym ekranie zostanie wyświtlony \npodgląd załadowanego zdjęcia."
+        android:text="W celu załadowania zdjęcia z pamięci telefonu \nwybierz ikonę folderu, w celu zrobnienia zdjęcia \nwybierz ikonę aparatu i postępuj jak przy robieniu zdjęcia. \nNa następnym ekranie zostanie wyświtlony \npodgląd załadowanego zdjęcia."
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/textView1"
+        android:id="@+id/textView1" />
-        android:textColor="#ff000000" />
 
 </RelativeLayout>

Klient/Klient/Klient.Android/Resources/layout/ekranProfil.xml

@@ -102,14 +102,15 @@
         android:textColor="#ff000000"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true" />
-    <ImageButton
+    <Button
-        android:src="@drawable/obraz4"
+        android:text="Back"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backProfil"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="GoToPoLogowaniu" />
     <Button
@@ -120,13 +121,4 @@
         android:layout_below="@id/Save"
         android:translationY="45dp"
         android:onClick="GetHistory" />
-    <ImageButton
-        android:src="@drawable/obraz8"
-        android:layout_width="35.0dp"
-        android:layout_height="35.0dp"
-        android:background="#ffbdd7f0"
-        android:id="@+id/LogOut"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:onClick="LogOut" />
 </RelativeLayout>

Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml

@@ -80,8 +80,6 @@
             android:layout_height="58.0dp"
             android:minWidth="25px"
             android:minHeight="25px"
-            android:textColor="#ff000000"
-            android:textColorHint="#ff6c6767"
             android:id="@+id/NewPassword"
             android:inputType="none|textPassword" />
     </android.support.design.widget.TextInputLayout>
@@ -102,8 +100,7 @@
             android:minHeight="25px"
             android:id="@+id/RepeatPassword"
             android:inputType="none|textPassword"
-            android:textColor="#ff000000"
+            android:textColor="#ff000000" />
-            android:textColorHint="#ff6c6767" />
     </android.support.design.widget.TextInputLayout>
     <android.support.design.widget.TextInputLayout
         android:id="@+id/LayoutNewLogin"
@@ -154,8 +151,8 @@
         android:layout_centerHorizontal="true" />
     <Button
         android:text="?"
-        android:layout_width="25.0dp"
+        android:layout_width="35.0dp"
-        android:layout_height="25.0dp"
+        android:layout_height="35.0dp"
         android:id="@+id/helpRegister"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
@@ -163,14 +160,15 @@
         android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="HelpRegisterScreen" />
-    <ImageButton
+    <Button
-        android:src="@drawable/obraz4"
+        android:text="Back"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backRejestracja"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="GoToStart" />
 

Klient/Klient/Klient.Android/Resources/layout/ekranStartowy.xml

@@ -29,9 +29,9 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true" />
     <Button
-        android:text="?"
+        android:text="i"
-        android:layout_width="25.0dp"
+        android:layout_width="35.0dp"
-        android:layout_height="25.0dp"
+        android:layout_height="35.0dp"
         android:id="@+id/about"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"

Klient/Klient/Klient.Android/Resources/layout/ekranZLinkami.xml

@@ -24,38 +24,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/links"
-        android:layout_below="@+id/LinkError"
+        android:layout_below="@+id/linkTitle"
         android:textColor="#ff393939"
         android:linksClickable="true"
-        android:autoLink="web"
+        android:autoLink="web" />
-        android:fadeScrollbars="true"
+    <Button
-        android:scrollbars="vertical"
+        android:text="Back"
-        android:verticalScrollbarPosition="right"
-        android:scrollIndicators="right"
-        android:paddingBottom="35dp"
-        android:scrollbarAlwaysDrawVerticalTrack="true"
-        android:isScrollContainer="true"
-        android:textIsSelectable="true"
-        android:focusableInTouchMode="true"
-        android:paddingTop="10dp" />
-    <TextView
-        android:text=""
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/linkTitle"
-        android:id="@+id/LinkError"
-        android:textColor="#ffff0000"
-        android:layout_centerInParent="true"
-        android:paddingTop="10dp" />
-    <ImageButton
-        android:src="@drawable/obraz4"
         android:layout_width="38.5dp"
         android:layout_height="35.0dp"
         android:id="@+id/backToSendPhoto"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="#ffbdd7f0"
+        android:background="#ff0b31c8"
+        android:textColor="#fffcfcfc"
         android:gravity="center"
         android:onClick="GoToPoLogowaniu" />
     <TextView
@@ -67,4 +48,4 @@
         android:textColor="#ff000000"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true" />
-</RelativeLayout>
+
</RelativeLayout>

Klient/Klient/Klient.Android/Resources/xml/file_paths.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-  <cache-path name="my_images"
-    path="path" />
-</paths>

Serwer/Serwer.Api/.config/dotnet-tools.json

@@ -7,12 +7,6 @@
       "commands": [
         "dotnet-ef"
       ]
-    },
-    "swashbuckle.aspnetcore.cli": {
-      "version": "5.6.3",
-      "commands": [
-        "swagger"
-      ]
     }
   }
 }

Serwer/Serwer.Api/Framework/ExceptionHandlerMiddleware.cs

@@ -32,7 +32,7 @@ namespace Serwer.Api.Framework
         {
             var statusCode = HttpStatusCode.BadRequest;
             context.Response.StatusCode = (int)statusCode;
-            return context.Response.WriteAsync($"Błąd: {exception.Message}");
+            return context.Response.WriteAsync($"Error: {exception.Message}");
         }
     }
 }

Serwer/Serwer.Api/Properties/ServiceDependencies/PixBlocksAddition - Web Deploy/apis1.arm.json

@@ -1,80 +0,0 @@
-{
-  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "resourceGroupName": {
-      "type": "string",
-      "defaultValue": "PixBlocksAdditionResourceGroup",
-      "metadata": {
-        "_parameterType": "resourceGroup",
-        "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking."
-      }
-    },
-    "resourceGroupLocation": {
-      "type": "string",
-      "defaultValue": "centralus",
-      "metadata": {
-        "_parameterType": "location",
-        "description": "Location of the resource group. Resource groups could have different location than resources."
-      }
-    },
-    "resourceLocation": {
-      "type": "string",
-      "defaultValue": "[parameters('resourceGroupLocation')]",
-      "metadata": {
-        "_parameterType": "location",
-        "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there."
-      }
-    }
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Resources/resourceGroups",
-      "name": "[parameters('resourceGroupName')]",
-      "location": "[parameters('resourceGroupLocation')]",
-      "apiVersion": "2019-10-01"
-    },
-    {
-      "type": "Microsoft.Resources/deployments",
-      "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat('SerwerApi', subscription().subscriptionId)))]",
-      "resourceGroup": "[parameters('resourceGroupName')]",
-      "apiVersion": "2019-10-01",
-      "dependsOn": [
-        "[parameters('resourceGroupName')]"
-      ],
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": [
-            {
-              "name": "SerwerApiapi",
-              "type": "Microsoft.ApiManagement/service",
-              "location": "[parameters('resourceLocation')]",
-              "properties": {},
-              "sku": {
-                "name": "Consumption",
-                "capacity": 0
-              },
-              "identity": null,
-              "apiVersion": "2019-12-01"
-            },
-            {
-              "type": "Microsoft.ApiManagement/service/apis",
-              "name": "SerwerApiapi/SerwerApi",
-              "properties": {},
-              "apiVersion": "2019-12-01",
-              "dependsOn": [
-                "SerwerApiapi"
-              ]
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "metadata": {
-    "_dependencyType": "apis.azure"
-  }
-}

Serwer/Serwer.Api/Properties/serviceDependencies.PixBlocksAddition - Web Deploy.json

@@ -1,8 +0,0 @@
-{
-  "dependencies": {
-    "apis1": {
-      "resourceId": "/subscriptions/[parameters('subscriptionId')]/resourceGroups/[parameters('resourceGroupName')]/providers/Microsoft.ApiManagement/service/SerwerApiapi/apis/SerwerApi",
-      "type": "apis.azure"
-    }
-  }
-}

Serwer/Serwer.Api/Properties/serviceDependencies.json

@@ -1,7 +0,0 @@
-{
-  "dependencies": {
-    "apis1": {
-      "type": "apis"
-    }
-  }
-}

Serwer/Serwer.Api/Startup.cs

@@ -98,19 +98,18 @@ namespace Serwer.Api
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
+        {
-            app.UseCors(builder =>
-            {
-                builder.AllowAnyHeader();
-                builder.AllowAnyMethod();
-                builder.AllowAnyOrigin();
-            });
             if (env.IsDevelopment())
             {
-               
+                app.UseCors(builder =>
+                    {
+                        builder.AllowAnyHeader();
+                        builder.AllowAnyMethod();
+                        builder.AllowAnyOrigin();
+                    });
                 app.UseDeveloperExceptionPage();
-                //app.UseSwagger();
+                app.UseSwagger();
-                //app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Serwer.Api v1"));
+                app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Serwer.Api v1"));
             }
             app.UseRouting();
 

Serwer/Serwer.sln

@@ -1,44 +1,50 @@
-
+
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 16
-VisualStudioVersion = 16.0.30717.126
+VisualStudioVersion = 16.0.30717.126
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Core", "Serwer.Core\Serwer.Core.csproj", "{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Tests", "Serwer.Tests\Serwer.Tests.csproj", "{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}"
-EndProject
+EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Infrastructure", "Serwer.Infrastructure\Serwer.Infrastructure.csproj", "{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Core", "Serwer.Core\Serwer.Core.csproj", "{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}"
-	ProjectSection(ProjectDependencies) = postProject
+EndProject
-		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} = {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Infrastructure", "Serwer.Infrastructure\Serwer.Infrastructure.csproj", "{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}"
-	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
-EndProject
+		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} = {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Api", "Serwer.Api\Serwer.Api.csproj", "{335159FF-5AB8-48E5-A04C-778A46058204}"
+	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
+EndProject
-		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} = {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serwer.Api", "Serwer.Api\Serwer.Api.csproj", "{335159FF-5AB8-48E5-A04C-778A46058204}"
-		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C} = {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}
+	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
+		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82} = {115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}
-EndProject
+		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C} = {523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}
-Global
+	EndProjectSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+EndProject
-		Debug|Any CPU = Debug|Any CPU
+Global
-		Release|Any CPU = Release|Any CPU
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-	EndGlobalSection
+		Debug|Any CPU = Debug|Any CPU
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		Release|Any CPU = Release|Any CPU
-		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+	EndGlobalSection
-		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4169F6FD-E08D-4329-BF87-A1411A9F1EF4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{335159FF-5AB8-48E5-A04C-778A46058204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{335159FF-5AB8-48E5-A04C-778A46058204}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{115E0BB1-FCC1-4E45-92B0-D3B6B4A3DA82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{335159FF-5AB8-48E5-A04C-778A46058204}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{335159FF-5AB8-48E5-A04C-778A46058204}.Release|Any CPU.Build.0 = Release|Any CPU
+		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
+		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-	GlobalSection(SolutionProperties) = preSolution
+		{523E9EE6-B8D9-4E08-A9A0-50D7F872C79C}.Release|Any CPU.Build.0 = Release|Any CPU
-		HideSolutionNode = FALSE
+		{335159FF-5AB8-48E5-A04C-778A46058204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-	EndGlobalSection
+		{335159FF-5AB8-48E5-A04C-778A46058204}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	GlobalSection(ExtensibilityGlobals) = postSolution
+		{335159FF-5AB8-48E5-A04C-778A46058204}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		SolutionGuid = {30A333CB-6AC2-4EAD-B05B-926DB9690CED}
+		{335159FF-5AB8-48E5-A04C-778A46058204}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
+	EndGlobalSection
-EndGlobal
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {30A333CB-6AC2-4EAD-B05B-926DB9690CED}
+	EndGlobalSection
+EndGlobal