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 +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

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

@ -13,8 +13,7 @@
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"
@ -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"

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

@ -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>