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

develop #10

Merged
s426229 merged 80 commits from develop into master 2021-01-27 18:32:19 +01:00
Conversation 0 Commits 80 Files Changed 87 +475 -491
3 changed files with 475 additions and 491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 48a742651a - Show all commits

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

File diff suppressed because it is too large Load Diff

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

@ -13,21 +13,20 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:hint="Login" android:hint="Login">
> <EditText
<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" android:layout_alignParentStart="false"
android:layout_alignParentStart="false" android:minWidth="25px"
android:minWidth="25px" android:minHeight="25px"
android:minHeight="25px" 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:inputType="text"
android:inputType="text" android:textColor="#ff000000"
android:textColor="#ff000000" android:textColorHint="#ff6c6767" />
android:textColorHint="#ff6c6767" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
@ -50,14 +49,6 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:textColorHint="#ff6c6767" /> android:textColorHint="#ff6c6767" />
</android.support.design.widget.TextInputLayout> </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"
@ -69,19 +60,6 @@
android:text="Zaloguj" android:text="Zaloguj"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:foregroundGravity="center" /> android:foregroundGravity="center" />
<Button
android:text=" Reset \n Hasła"
android:layout_width="100.5dp"
android:layout_height="50dp"
android:id="@+id/Reset"
android:gravity="center"
android:layout_below="@id/In"
android:layout_alignParentRight="false"
android:autoSizeTextType="uniform"
android:onClick="ResetPassword"
android:textColor="#ff790000"
android:layout_centerHorizontal="true"
android:foregroundGravity="center" />
<Button <Button
android:text="?" android:text="?"
android:layout_width="35.0dp" android:layout_width="35.0dp"

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

@ -55,15 +55,15 @@
android:hint="Adres email" android:hint="Adres email"
android:layout_below="@id/LayoutSurname" android:layout_below="@id/LayoutSurname"
android:layout_alignParentLeft="true"> 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: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.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNewPassword1" android:id="@+id/LayoutNewPassword1"
@ -75,13 +75,13 @@
android:hint="Hasło" android:hint="Hasło"
android:layout_below="@id/LayoutEmail" android:layout_below="@id/LayoutEmail"
android:layout_alignParentLeft="true"> 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:inputType="none|textPassword" /> android:inputType="none|textPassword" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNewPassword2" android:id="@+id/LayoutNewPassword2"
@ -93,17 +93,17 @@
app:passwordToggleTint="@android:color/darker_gray" app:passwordToggleTint="@android:color/darker_gray"
android:layout_below="@id/LayoutNewPassword1" android:layout_below="@id/LayoutNewPassword1"
android:layout_alignParentLeft="true"> 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:hint="Powtórz hasło" android:hint="Powtórz hasło"
android:inputType="none|textPassword" android:inputType="none|textPassword"
android:textColor="#ff000000" /> android:textColor="#ff000000" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNewLogin" android:id="@+id/LayoutNewLogin"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -111,15 +111,15 @@
android:hint="Login" android:hint="Login"
android:layout_below="@id/LayoutNewPassword2" android:layout_below="@id/LayoutNewPassword2"
android:layout_alignParentLeft="true"> 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/NewLogin" android:id="@+id/NewLogin"
android:hint="Login" android:hint="Login"
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_below="@+id/Surname" /> android:layout_below="@+id/Surname" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<Button <Button
android:text=" Załóż \n konto" android:text=" Załóż \n konto"
@ -142,7 +142,16 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<Button
android:text="?"
android:layout_width="35.0dp"
android:layout_height="35.0dp"
android:id="@+id/help"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#ff0b31c8"
android:textColor="#fffcfcfc"
android:gravity="center"
android:onClick="HelpLoginScreen" />
</RelativeLayout> </RelativeLayout>