s426229/Poszukiwacz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

POS_Sprint_1 #3

Merged
s426229 merged 12 commits from POS_Sprint_1 into develop 2020-12-07 19:41:00 +01:00
Conversation 0 Commits 12 Files Changed 40 +966 -587
6 changed files with 966 additions and 587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3a58620fdd - Show all commits

9
Klient/Klient/Klient.Android/MainActivity.cs
View File

@ -5,7 +5,8 @@ using Android.Content.PM;
using Android.Runtime; using Android.Runtime;
using Android.Views; using Android.Views;
using Android.Widget; using Android.Widget;
using Android.OS; using Android.OS;
using Xamarin.Essentials;
namespace Klient.Droid namespace Klient.Droid
{ {
@ -21,5 +22,11 @@ namespace Klient.Droid
LoadApplication(new App()); LoadApplication(new App());
SetContentView(Resource.Layout.ekranLogowania); SetContentView(Resource.Layout.ekranLogowania);
} }
[Java.Interop.Export("HelpLoginScreen")]
public void HelpLoginScreen(View v)
{
SetContentView(Resource.Layout.ekranRejestracji);
}
} }
} }

9
Klient/Klient/Klient.Android/Poszukiwacz.csproj
View File

@ -48,12 +48,16 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />
<Reference Include="Mono.Android.Export" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Essentials">
<Version>1.5.3.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
@ -106,6 +110,11 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
</AndroidResource> </AndroidResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranRejestracji.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>

1392
Klient/Klient/Klient.Android/Resources/Resource.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

20
Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml
View File

@ -6,7 +6,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#ffffffff" android:background="#ffbdd7f0"
> >
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
@ -22,7 +22,7 @@
android:hint="Login" android:hint="Login"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:textColor="#ff000000" android:textColor="#ff000000"
android:textColorHint="#ff000000" /> android:textColorHint="#ff6c6767" />
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:layout_width="204.0dp" android:layout_width="204.0dp"
@ -30,22 +30,22 @@
android:id="@+id/Password" android:id="@+id/Password"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_below="@+id/Login" android:layout_below="@+id/Login"
android:hint="Password" android:hint="Hasło"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:inputType="none|textPassword" android:inputType="none|textPassword"
android:textColor="#ff000000" android:textColor="#ff000000"
android:textColorHint="#ff000000" /> android:textColorHint="#ff6c6767" />
<Button <Button
android:text="Log In"
android:layout_width="100.5dp" android:layout_width="100.5dp"
android:layout_height="50dp" android:layout_height="50dp"
android:id="@+id/In" android:id="@+id/In"
android:layout_below="@id/Password" android:layout_below="@id/Password"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center" android:gravity="center"
android:onClick="LogIn"/> android:onClick="LogIn"
android:text="Zaloguj" />
<Button <Button
android:text=" Reset \n Password" android:text=" Reset \n Hasła"
android:layout_width="100.5dp" android:layout_width="100.5dp"
android:layout_height="50dp" android:layout_height="50dp"
android:id="@+id/Reset" android:id="@+id/Reset"
@ -75,6 +75,12 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/LoginPasswordSee"
android:layout_below="@id/Login"
android:layout_toRightOf="@id/Password" />

122
Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml Normal file
View File

@ -0,0 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffbdd7f0">
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/Name"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:capitalize="words"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:hint="Imie"
android:gravity="center"
android:inputType="none|textPersonName" />
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/Surname"
android:hint="Nazwisko"
android:textColorHint="#ff6c6767"
android:layout_below="@id/Name"
android:gravity="center"
android:textColor="#ff000000"
android:inputType="none|textPersonName" />
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/Email"
android:layout_below="@+id/NewLogin"
android:hint="Email"
android:gravity="center"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:inputType="none|textEmailAddress" />
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/NewPassword"
android:hint="Hasło"
android:layout_below="@+id/Email"
android:gravity="center"
android:inputType="none|textPassword"
android:textColorHint="#ff6c6767" />
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/RepeatPassword"
android:layout_below="@+id/NewPassword"
android:hint="Powtórz hasło"
android:inputType="none|textPassword"
android:gravity="center"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000" />
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/NewLogin"
android:hint="Login"
android:gravity="center"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:layout_below="@+id/Surname" />
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/PasswordSee1"
android:layout_toRightOf="@id/NewPassword"
android:layout_below="@id/Email" />
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/PasswordSee2"
android:layout_toRightOf="@id/RepeatPassword"
android:layout_below="@id/NewPassword"/>
<Button
android:text=" Załóż \n konto"
android:layout_width="100.5dp"
android:layout_height="50dp"
android:id="@+id/SignUp"
android:autoSizeTextType="uniform"
android:gravity="center"
android:layout_below="@id/RepeatPassword"
android:layout_alignParentRight="true" />
<TextView
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text2"
android:layout_below="@id/Email"
android:layout_alignParentRight="false"
android:layout_toRightOf="@id/NewPassword" />
<TextView
android:text="Poszukiwacz 2020"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/text3"
android:textColor="#ff000000"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>

1
Klient/Klient/Klient/Klient.csproj
View File

@ -10,6 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
</ItemGroup> </ItemGroup>
</Project> </Project>