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 +10 -4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f0e62f261e - Show all commits

8
Klient/Klient/Klient.Android/MainActivity.cs
View File

@ -37,7 +37,7 @@ 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.ekranPoLogowaniu); SetContentView(Resource.Layout.ekranStartowy);
} }
[Java.Interop.Export("SignIn")] [Java.Interop.Export("SignIn")]
@ -86,6 +86,12 @@ namespace Klient.Droid
} }
} }
[Java.Interop.Export("HelpLoginScreen")]
public void GoToAboutScreen(View v)
{
SetContentView(Resource.Layout.ekranInformacji);
}
[Java.Interop.Export("SignUp")] [Java.Interop.Export("SignUp")]
async public void SignUp(View v) async public void SignUp(View v)
{ {

6
Klient/Klient/Klient.Android/Resources/layout/ekranStartowy.xml
View File

@ -29,9 +29,9 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<Button <Button
android:text="i" android:text="?"
android:layout_width="35.0dp" android:layout_width="25.0dp"
android:layout_height="35.0dp" android:layout_height="25.0dp"
android:id="@+id/about" android:id="@+id/about"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"