develop #10

Merged
s426229 merged 80 commits from develop into master 2021-01-27 18:32:19 +01:00
2 changed files with 23 additions and 5 deletions
Showing only changes of commit 61e3998c42 - Show all commits

View File

@ -15,14 +15,30 @@ namespace Klient.Droid
{ {
protected override void OnCreate(Bundle savedInstanceState) protected override void OnCreate(Bundle savedInstanceState)
{ {
base.OnCreate(savedInstanceState); base.OnCreate(savedInstanceState);
global::Xamarin.Forms.Forms.Init(this, savedInstanceState); global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
LoadApplication(new App()); LoadApplication(new App());
SetContentView(Resource.Layout.ekranLogowania); SetContentView(Resource.Layout.ekranLogowania);
} }
[Java.Interop.Export("In")]
async public void SignIn(View v)
{
}
[Java.Interop.Export("Reset")]
async public void ResetPassword()
{
}
[Java.Interop.Export("SignUp")]
async public void SignUp()
{
}
[Java.Interop.Export("HelpLoginScreen")] [Java.Interop.Export("HelpLoginScreen")]
public void HelpLoginScreen(View v) public void HelpLoginScreen(View v)
{ {

View File

@ -87,9 +87,10 @@
<Switch <Switch
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/PasswordSee2" android:id="@+id/PasswordSee2"
android:layout_toRightOf="@id/RepeatPassword" android:layout_toRightOf="@id/RepeatPassword"
android:layout_below="@id/NewPassword"/> 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"
@ -100,7 +101,8 @@
android:layout_below="@id/RepeatPassword" android:layout_below="@id/RepeatPassword"
android:layout_alignParentRight="false" android:layout_alignParentRight="false"
android:foregroundGravity="center" android:foregroundGravity="center"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true"
android:onClick="Register" />
<TextView <TextView
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"