develop #10

Merged
s426229 merged 80 commits from develop into master 2021-01-27 18:32:19 +01:00
3 changed files with 473 additions and 444 deletions
Showing only changes of commit c322233ae8 - Show all commits

View File

@ -34,7 +34,8 @@ namespace Klient.Droid
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.ekranStartowy); //SetContentView(Resource.Layout.ekranStartowy);
SetContentView(Resource.Layout.ekranPoLogowaniu);
} }
[Java.Interop.Export("SignIn")] [Java.Interop.Export("SignIn")]
@ -174,6 +175,10 @@ namespace Klient.Droid
public void GoToProfile(View v) public void GoToProfile(View v)
{ {
SetContentView(Resource.Layout.ekranProfil); SetContentView(Resource.Layout.ekranProfil);
FindViewById<EditText>(Resource.Id.ChangeName).Text = savedName;
FindViewById<EditText>(Resource.Id.ChangeSurname).Text = savedSurname;
FindViewById<EditText>(Resource.Id.ChangeEmail).Text = savedEmail;
FindViewById<TextView>(Resource.Id.ProfilPageLogin).Text = savedLogin;
} }
[Java.Interop.Export("Save")] [Java.Interop.Export("Save")]
@ -208,8 +213,10 @@ namespace Klient.Droid
var responseString = await response.Content.ReadAsStringAsync(); var responseString = await response.Content.ReadAsStringAsync();
if (response.StatusCode == HttpStatusCode.OK) FindViewById<TextView>(Resource.Id.NullValueProfile).Text = "Zapisano!"; if (response.StatusCode == HttpStatusCode.OK)
{
FindViewById<TextView>(Resource.Id.NullValueProfile).Text = "Zapisano!";
}
} }
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -7,11 +7,21 @@
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">
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/ProfilPageLogin"
android:layout_centerHorizontal="true"
android:textStyle="bold"
android:textSize="30dp" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/LayoutNameC" android:id="@+id/LayoutNameC"
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:layout_below="@id/ProfilPageLogin"
android:hint="Imie" android:hint="Imie"
android:layout_alignParentLeft="true"> android:layout_alignParentLeft="true">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
@ -83,5 +93,14 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_below="@id/Save" android:layout_below="@id/Save"
android:textColor="#ffd60000" /> android:textColor="#ffd60000" />
<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> </RelativeLayout>