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

POS_Sprint_3 #5

Merged
s426229 merged 10 commits from POS_Sprint_3 into develop 2020-12-30 17:30:24 +01:00
Conversation 0 Commits 10 Files Changed 30 +719 -663
6 changed files with 719 additions and 663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 50e664ae5a - Show all commits

2
Klient/Klient/Klient.Android/Properties/AndroidManifest.xml
View File

@ -3,5 +3,5 @@
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" /> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application android:label="Klient.Android" android:usesCleartextTraffic="true" /> <application android:label="Klient.Android" android:usesCleartextTraffic="true" android:theme="@style/Base.Theme.AppCompat.Light.DarkActionBar" />
</manifest> </manifest>

1
Klient/Klient/Klient.Android/Properties/AssemblyInfo.cs
View File

@ -15,6 +15,7 @@ using Android.App;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: Application(Theme = "@style/Base.Theme.AppCompat.Light.DarkActionBar")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //

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

File diff suppressed because it is too large Load Diff

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

@ -8,8 +8,14 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#ffbdd7f0" android:background="#ffbdd7f0"
> >
<android.support.design.widget.TextInputLayout
<android.support.design.widget.TextInputEditText android:id="@+id/LayoutLogin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Login"
>
<EditText
android:layout_width="204.0dp" android:layout_width="204.0dp"
android:layout_height="58.0dp" android:layout_height="58.0dp"
android:id="@+id/Login" android:id="@+id/Login"
@ -19,27 +25,44 @@
android:layout_centerInParent="false" android:layout_centerInParent="false"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:hint="Login" android:inputType="text"
android:gravity="center_horizontal|center_vertical"
android:textColor="#ff000000" android:textColor="#ff000000"
android:textColorHint="#ff6c6767" /> android:textColorHint="#ff6c6767" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputLayout
android:layout_width="204.0dp" android:id="@+id/LayoutPassword"
android:layout_height="58.0dp" android:layout_width="wrap_content"
android:id="@+id/Password" android:layout_height="wrap_content"
app:passwordToggleEnabled="true"
android:layout_below="@+id/LayoutLogin"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_below="@+id/Login" app:passwordToggleTint="@android:color/darker_gray"
android:hint="Hasło" android:hint="Hasło"
android:gravity="center_horizontal|center_vertical" android:gravity="left">
android:inputType="none|textPassword" <EditText
android:textColor="#ff000000" android:layout_width="204.0dp"
android:textColorHint="#ff6c6767" /> android:layout_height="58.0dp"
android:id="@+id/Password"
android:layout_centerHorizontal="true"
android:layout_below="@+id/Login"
android:inputType="none|textPassword"
android:textColor="#ff000000"
android:textColorHint="#ff6c6767" />
</android.support.design.widget.TextInputLayout>
<Button <Button
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/LayoutPassword"
android:layout_alignParentRight="false" android:layout_alignParentRight="false"
android:gravity="center" android:gravity="center"
android:onClick="SignIn" android:onClick="SignIn"
@ -79,12 +102,6 @@
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" />

142
Klient/Klient/Klient.Android/Resources/layout/ekranRejestracji.xml
View File

@ -1,72 +1,116 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#ffbdd7f0"> android:background="#ffbdd7f0">
<android.support.design.widget.TextInputLayout
<android.support.design.widget.TextInputEditText android:id="@+id/LayoutName"
android:layout_width="204.0dp" android:layout_width="wrap_content"
android:layout_height="58.0dp" android:layout_height="wrap_content"
android:minWidth="25px" android:layout_centerHorizontal="true"
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:hint="Imie"
android:gravity="center" android:layout_alignParentLeft="true">
android:inputType="none|textPersonName" /> <android.support.design.widget.TextInputEditText
<android.support.design.widget.TextInputEditText android:layout_width="204.0dp"
android:layout_width="204.0dp" android:layout_height="58.0dp"
android:layout_height="58.0dp" android:minWidth="25px"
android:minWidth="25px" android:minHeight="25px"
android:minHeight="25px" android:id="@+id/Name"
android:id="@+id/Surname" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:capitalize="words"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000"
android:inputType="none|textPersonName" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutSurname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Nazwisko" android:hint="Nazwisko"
android:textColorHint="#ff6c6767" android:layout_below="@id/LayoutName"
android:layout_below="@id/Name" android:layout_alignParentLeft="true">
android:gravity="center" <android.support.design.widget.TextInputEditText
android:textColor="#ff000000" android:layout_width="204.0dp"
android:inputType="none|textPersonName" /> android:layout_height="58.0dp"
android:minWidth="25px"
android:minHeight="25px"
android:id="@+id/Surname"
android:textColorHint="#ff6c6767"
android:layout_below="@id/Name"
android:textColor="#ff000000"
android:inputType="none|textPersonName" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutEmail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Adres email"
android:layout_below="@id/LayoutSurname"
android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:layout_width="204.0dp" android:layout_width="204.0dp"
android:layout_height="58.0dp" android:layout_height="58.0dp"
android:minWidth="25px" android:minWidth="25px"
android:minHeight="25px" android:minHeight="25px"
android:id="@+id/Email" android:id="@+id/Email"
android:layout_below="@+id/NewLogin"
android:hint="Email"
android:gravity="center"
android:textColorHint="#ff6c6767" android:textColorHint="#ff6c6767"
android:textColor="#ff000000" android:textColor="#ff000000"
android:inputType="none|textEmailAddress" /> android:inputType="none|textEmailAddress" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNewPassword1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:passwordToggleEnabled="true"
app:passwordToggleTint="@android:color/darker_gray"
android:layout_centerHorizontal="true"
android:hint="Hasło"
android:layout_below="@id/LayoutEmail"
android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:layout_width="204.0dp" android:layout_width="204.0dp"
android:layout_height="58.0dp" android:layout_height="58.0dp"
android:minWidth="25px" android:minWidth="25px"
android:minHeight="25px" android:minHeight="25px"
android:id="@+id/NewPassword" android:id="@+id/NewPassword"
android:hint="Hasło" android:inputType="none|textPassword" />
android:layout_below="@+id/Email" </android.support.design.widget.TextInputLayout>
android:gravity="center" <android.support.design.widget.TextInputLayout
android:inputType="none|textPassword" android:id="@+id/LayoutNewPassword2"
android:textColorHint="#ff6c6767" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Powtórz hasło"
app:passwordToggleEnabled="true"
app:passwordToggleTint="@android:color/darker_gray"
android:layout_below="@id/LayoutNewPassword1"
android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:layout_width="204.0dp" android:layout_width="204.0dp"
android:layout_height="58.0dp" android:layout_height="58.0dp"
android:minWidth="25px" android:minWidth="25px"
android:minHeight="25px" android:minHeight="25px"
android:id="@+id/RepeatPassword" android:id="@+id/RepeatPassword"
android:layout_below="@+id/NewPassword"
android:hint="Powtórz hasło" android:hint="Powtórz hasło"
android:inputType="none|textPassword" android:inputType="none|textPassword"
android:gravity="center"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000" /> android:textColor="#ff000000" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNewLogin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:hint="Login"
android:layout_below="@id/LayoutNewPassword2"
android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:layout_width="204.0dp" android:layout_width="204.0dp"
android:layout_height="58.0dp" android:layout_height="58.0dp"
@ -74,23 +118,9 @@
android:minHeight="25px" android:minHeight="25px"
android:id="@+id/NewLogin" android:id="@+id/NewLogin"
android:hint="Login" android:hint="Login"
android:gravity="center"
android:textColorHint="#ff6c6767"
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_below="@+id/Surname" /> android:layout_below="@+id/Surname" />
<Switch </android.support.design.widget.TextInputLayout>
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"
android:checked="false" />
<Button <Button
android:text=" Załóż \n konto" android:text=" Załóż \n konto"
android:layout_width="100.5dp" android:layout_width="100.5dp"
@ -98,19 +128,11 @@
android:id="@+id/SignUp" android:id="@+id/SignUp"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:gravity="center" android:gravity="center"
android:layout_below="@id/RepeatPassword" android:layout_below="@id/LayoutNewLogin"
android:layout_alignParentRight="false" android:layout_alignParentRight="false"
android:foregroundGravity="center" android:foregroundGravity="center"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:onClick="SignUp" /> android:onClick="SignUp" />
<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 <TextView
android:text="Poszukiwacz 2020" android:text="Poszukiwacz 2020"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"

3
Klient/Klient/Klient.Android/Resources/values/styles.xml
View File

@ -4,7 +4,7 @@
<style name="MainTheme" parent="MainTheme.Base"> <style name="MainTheme" parent="MainTheme.Base">
</style> </style>
<!-- Base theme applied no matter what API --> <!-- Base theme applied no matter what API -->
<style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="MainTheme.Base" parent="Theme.AppCompat">
<!--If you are using revision 22.1 please use just windowNoTitle. Without android:--> <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<!--We will be using the toolbar so no need to show ActionBar--> <!--We will be using the toolbar so no need to show ActionBar-->
@ -20,6 +20,7 @@
<!-- You can also set colorControlNormal, colorControlActivated <!-- You can also set colorControlNormal, colorControlActivated
colorControlHighlight and colorSwitchThumbNormal. --> colorControlHighlight and colorSwitchThumbNormal. -->
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="android:textColorHint">#ff000000</item>
<item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item> <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
</style> </style>