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

Merge branch 'POS_Sprint_6' of https://git.wmi.amu.edu.pl/s426229/Poszukiwacz into POS_Sprint_6

Browse Source
This commit is contained in:
s426226 2021-01-16 18:50:51 +01:00
commit f2f98bb92d
14 changed files with 850 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
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.ekranStartowy); SetContentView(Resource.Layout.ekranStartowy);
} }
@ -87,6 +87,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)
{ {
@ -153,6 +159,13 @@ namespace Klient.Droid
} }
} }
[Java.Interop.Export("HelpRegisterScreen")]
public void GoToRegisterHelp(View v)
{
SetContentView(Resource.Layout.ekranPomocRejestracja);
}
[Java.Interop.Export("GoToProfile")] [Java.Interop.Export("GoToProfile")]
public void GoBackToProfile(View v) public void GoBackToProfile(View v)
{ {
@ -176,11 +189,6 @@ namespace Klient.Droid
SetContentView(Resource.Layout.ekranRejestracji); SetContentView(Resource.Layout.ekranRejestracji);
} }
[Java.Interop.Export("HelpLoginScreen")]
public void MainScreenAbout(View v)
{
SetContentView(Resource.Layout.ekranInformacji);
}
[Java.Interop.Export("GoToMainScreenFromInformation")] [Java.Interop.Export("GoToMainScreenFromInformation")]
public void GoToMainScreenFromInformation(View v) public void GoToMainScreenFromInformation(View v)
{ {
@ -343,8 +351,15 @@ namespace Klient.Droid
} }
else else
{ {
FindViewById<TextView>(Resource.Id.history).Text = "Coś poszło nie tak!"; string msg = await response.Content.ReadAsStringAsync();
FindViewById<TextView>(Resource.Id.HistoryError).Text = msg;
} }
} }
[Java.Interop.Export("HelpPhoto")]
public void GotToHelpPhoto(View v)
{
SetContentView(Resource.Layout.ekranPomocZdjecie);
}
} }
} }

13
Klient/Klient/Klient.Android/Poszukiwacz.csproj
View File

@ -149,11 +149,6 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
</AndroidResource> </AndroidResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResourceAnalysisConfig Include="Resources\layout\ekranPomocRejestracja.xml">
<SubType>Designer</SubType>
</AndroidResourceAnalysisConfig>
</ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\layout\ekranPomocZdjecie.xml"> <AndroidResource Include="Resources\layout\ekranPomocZdjecie.xml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
@ -174,6 +169,14 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
</AndroidResource> </AndroidResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranPomocRejestracja.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\Obraz4.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>

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

File diff suppressed because it is too large Load Diff

BIN
Klient/Klient/Klient.Android/Resources/drawable/Obraz4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

31
Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml
View File

@ -7,15 +7,14 @@
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">
<Button <ImageButton
android:text="Back" android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
android:id="@+id/backHistory" android:id="@+id/backHistory"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#ff0b31c8" android:background="#ffbdd7f0"
android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToProfile" /> android:onClick="GoToProfile" />
<TextView <TextView
@ -26,7 +25,7 @@
android:id="@+id/text3" android:id="@+id/text3"
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true"/>
<TextView <TextView
android:text="Historia wyszukiwań" android:text="Historia wyszukiwań"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
@ -44,7 +43,27 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/history" android:id="@+id/history"
android:layout_below="@+id/HistoryError"
android:textColor="#ff000000"
android:paddingBottom="35dp"
android:focusableInTouchMode="true"
android:isScrollContainer="true"
android:fadeScrollbars="true"
android:scrollbars="vertical"
android:verticalScrollbarPosition="right"
android:scrollIndicators="right"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:textIsSelectable="true"
android:paddingTop="10dp"/>
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/HistoryError"
android:layout_below="@+id/HistoryTitle" android:layout_below="@+id/HistoryTitle"
android:textColor="#ff000000" /> android:textColor="#ffff0000"
android:layout_centerInParent="true"
android:paddingTop="10dp" />
</RelativeLayout> </RelativeLayout>

7
Klient/Klient/Klient.Android/Resources/layout/ekranInformacji.xml
View File

@ -39,15 +39,14 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<Button <ImageButton
android:text="Back" android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
android:id="@+id/backInformation" android:id="@+id/backInformation"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#ff0b31c8" android:background="#ffbdd7f0"
android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToMainScreenFromInformation" /> android:onClick="GoToMainScreenFromInformation" />

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

@ -60,15 +60,14 @@
android:text="Zaloguj" android:text="Zaloguj"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:foregroundGravity="center" /> android:foregroundGravity="center" />
<Button <ImageButton
android:text="Back" android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
android:id="@+id/backLogowanie" android:id="@+id/backLogowanie"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#ff0b31c8" android:background="#ffbdd7f0"
android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToStart"/> android:onClick="GoToStart"/>
<TextView <TextView

7
Klient/Klient/Klient.Android/Resources/layout/ekranPoZdjeciu.xml
View File

@ -27,15 +27,14 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_below="@id/SendPhoto" android:layout_below="@id/SendPhoto"
android:textColor="#ffd60000" /> android:textColor="#ffd60000" />
<Button <ImageButton
android:text="Back" android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
android:id="@+id/backZdjecie" android:id="@+id/backZdjecie"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#ff0b31c8" android:background="#ffbdd7f0"
android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToPoLogowaniu" /> android:onClick="GoToPoLogowaniu" />
<TextView <TextView

10
Klient/Klient/Klient.Android/Resources/layout/ekranPomocRejestracja.xml
View File

@ -35,7 +35,8 @@
android:id="@+id/textView1" android:id="@+id/textView1"
android:textColor="#ffb1d5f8" android:textColor="#ffb1d5f8"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" /> <TextView android:layout_alignParentBottom="true" />
<TextView
android:text="Poszukiwacz 2021" android:text="Poszukiwacz 2021"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -43,7 +44,8 @@
android:id="@+id/text1" android:id="@+id/text1"
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> <Button android:layout_centerHorizontal="true" />
<Button
android:text="Back" android:text="Back"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
@ -53,4 +55,6 @@
android:background="#ff0b31c8" android:background="#ff0b31c8"
android:textColor="#fffcfcfc" android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToRegister" /> </RelativeLayout> android:onClick="GoToRegister" />
</RelativeLayout>

10
Klient/Klient/Klient.Android/Resources/layout/ekranPomocZdjecie.xml
View File

@ -15,15 +15,14 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<Button <ImageButton
android:text="Back" android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
android:id="@+id/backPomocZdjecie" android:id="@+id/backPomocZdjecie"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#ff0b31c8" android:background="#ffbdd7f0"
android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToPoLogowaniu" /> android:onClick="GoToPoLogowaniu" />
<TextView <TextView
@ -31,6 +30,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/textView1" /> android:id="@+id/textView1"
android:textColor="#ff000000" />
</RelativeLayout> </RelativeLayout>

7
Klient/Klient/Klient.Android/Resources/layout/ekranProfil.xml
View File

@ -102,15 +102,14 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
<Button <ImageButton
android:text="Back" android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
android:id="@+id/backProfil" android:id="@+id/backProfil"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#ff0b31c8" android:background="#ffbdd7f0"
android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToPoLogowaniu" /> android:onClick="GoToPoLogowaniu" />
<Button <Button

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

@ -80,6 +80,8 @@
android:layout_height="58.0dp" android:layout_height="58.0dp"
android:minWidth="25px" android:minWidth="25px"
android:minHeight="25px" android:minHeight="25px"
android:textColor="#ff000000"
android:textColorHint="#ff6c6767"
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>
@ -100,7 +102,8 @@
android:minHeight="25px" android:minHeight="25px"
android:id="@+id/RepeatPassword" android:id="@+id/RepeatPassword"
android:inputType="none|textPassword" android:inputType="none|textPassword"
android:textColor="#ff000000" /> android:textColor="#ff000000"
android:textColorHint="#ff6c6767" />
</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"
@ -160,15 +163,14 @@
android:textColor="#fffcfcfc" android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="HelpRegisterScreen" /> android:onClick="HelpRegisterScreen" />
<Button <ImageButton
android:text="Back" android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
android:id="@+id/backRejestracja" android:id="@+id/backRejestracja"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#ff0b31c8" android:background="#ffbdd7f0"
android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToStart" /> android:onClick="GoToStart" />

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"

33
Klient/Klient/Klient.Android/Resources/layout/ekranZLinkami.xml
View File

@ -24,19 +24,38 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/links" android:id="@+id/links"
android:layout_below="@+id/linkTitle" android:layout_below="@+id/LinkError"
android:textColor="#ff393939" android:textColor="#ff393939"
android:linksClickable="true" android:linksClickable="true"
android:autoLink="web" /> android:autoLink="web"
<Button android:fadeScrollbars="true"
android:text="Back" android:scrollbars="vertical"
android:verticalScrollbarPosition="right"
android:scrollIndicators="right"
android:paddingBottom="35dp"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:isScrollContainer="true"
android:textIsSelectable="true"
android:focusableInTouchMode="true"
android:paddingTop="10dp" />
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/linkTitle"
android:id="@+id/LinkError"
android:textColor="#ffff0000"
android:layout_centerInParent="true"
android:paddingTop="10dp" />
<ImageButton
android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"
android:layout_height="35.0dp" android:layout_height="35.0dp"
android:id="@+id/backToSendPhoto" android:id="@+id/backToSendPhoto"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="#ff0b31c8" android:background="#ffbdd7f0"
android:textColor="#fffcfcfc"
android:gravity="center" android:gravity="center"
android:onClick="GoToPoLogowaniu" /> android:onClick="GoToPoLogowaniu" />
<TextView <TextView
@ -48,4 +67,4 @@
android:textColor="#ff000000" android:textColor="#ff000000"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
</RelativeLayout> </RelativeLayout>