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 +15049 -7146
9 changed files with 15049 additions and 7146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8ded97089 - Show all commits

66
Klient/Klient.sln
View File

@ -1,33 +1,33 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio Version 16
VisualStudioVersion = 15.0.28307.1300 VisualStudioVersion = 16.0.30717.126
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Klient.Android", "Klient\Klient.Android\Klient.Android.csproj", "{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Poszukiwacz", "Klient\Klient.Android\Poszukiwacz.csproj", "{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Klient", "Klient\Klient\Klient.csproj", "{46672F33-450A-4DD4-BA9F-C15E88C20AC8}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Klient", "Klient\Klient\Klient.csproj", "{46672F33-450A-4DD4-BA9F-C15E88C20AC8}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Release|Any CPU.ActiveCfg = Release|Any CPU {8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Release|Any CPU.Build.0 = Release|Any CPU {8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Release|Any CPU.Build.0 = Release|Any CPU
{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Release|Any CPU.Deploy.0 = Release|Any CPU {8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}.Release|Any CPU.Deploy.0 = Release|Any CPU
{46672F33-450A-4DD4-BA9F-C15E88C20AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {46672F33-450A-4DD4-BA9F-C15E88C20AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46672F33-450A-4DD4-BA9F-C15E88C20AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU {46672F33-450A-4DD4-BA9F-C15E88C20AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46672F33-450A-4DD4-BA9F-C15E88C20AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU {46672F33-450A-4DD4-BA9F-C15E88C20AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46672F33-450A-4DD4-BA9F-C15E88C20AC8}.Release|Any CPU.Build.0 = Release|Any CPU {46672F33-450A-4DD4-BA9F-C15E88C20AC8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E43A77A3-DEBB-4789-BA50-56BD54CC4EA1} SolutionGuid = {E43A77A3-DEBB-4789-BA50-56BD54CC4EA1}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

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

@ -14,12 +14,12 @@ namespace Klient.Droid
{ {
protected override void OnCreate(Bundle savedInstanceState) protected override void OnCreate(Bundle savedInstanceState)
{ {
TabLayoutResource = Resource.Layout.Tabbar;
ToolbarResource = Resource.Layout.Toolbar;
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);
} }
} }
} }

215
Klient/Klient/Klient.Android/Klient.Android.csproj → Klient/Klient/Klient.Android/Poszukiwacz.csproj
View File

@ -1,102 +1,115 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}</ProjectGuid> <ProjectGuid>{8FF60786-AD97-4373-9B4D-6EF28BE7C2A2}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid> <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>Klient.Droid</RootNamespace> <RootNamespace>Klient.Droid</RootNamespace>
<AssemblyName>Klient.Android</AssemblyName> <AssemblyName>Poszukiwacz</AssemblyName>
<AndroidApplication>True</AndroidApplication> <AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass> <AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion> <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType> <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
</NuGetPackageImportStamp> </NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath> <OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants> <DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode> <AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup> <AotAssemblies>false</AotAssemblies>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <EnableLLVM>false</EnableLLVM>
<DebugSymbols>true</DebugSymbols> <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<DebugType>pdbonly</DebugType> <BundleAssemblies>false</BundleAssemblies>
<Optimize>true</Optimize> <MandroidI18n />
<OutputPath>bin\Release</OutputPath> </PropertyGroup>
<ErrorReport>prompt</ErrorReport> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<WarningLevel>4</WarningLevel> <DebugSymbols>true</DebugSymbols>
<AndroidManagedSymbols>true</AndroidManagedSymbols> <DebugType>pdbonly</DebugType>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime> <Optimize>true</Optimize>
</PropertyGroup> <OutputPath>bin\Release</OutputPath>
<ItemGroup> <ErrorReport>prompt</ErrorReport>
<Reference Include="Mono.Android" /> <WarningLevel>4</WarningLevel>
<Reference Include="System" /> <AndroidManagedSymbols>true</AndroidManagedSymbols>
<Reference Include="System.Core" /> <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<Reference Include="System.Xml.Linq" /> </PropertyGroup>
<Reference Include="System.Xml" /> <ItemGroup>
</ItemGroup> <Reference Include="Mono.Android" />
<ItemGroup> <Reference Include="System" />
<PackageReference Include="Xamarin.Forms" Version="3.4.0.1008975" /> <Reference Include="System.Core" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" /> <Reference Include="System.Xml.Linq" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" /> <Reference Include="System.Xml" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" /> </ItemGroup>
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="27.0.2.1" /> <ItemGroup>
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="27.0.2.1" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
</ItemGroup> <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<ItemGroup> <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
<Compile Include="MainActivity.cs" /> <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
<Compile Include="Resources\Resource.designer.cs" /> <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
<Compile Include="Properties\AssemblyInfo.cs" /> <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\AboutResources.txt" /> <Compile Include="MainActivity.cs" />
<None Include="Assets\AboutAssets.txt" /> <Compile Include="Resources\Resource.designer.cs" />
<None Include="Properties\AndroidManifest.xml" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidResource Include="Resources\layout\Tabbar.axml" /> <None Include="Resources\AboutResources.txt" />
<AndroidResource Include="Resources\layout\Toolbar.axml" /> <None Include="Assets\AboutAssets.txt" />
<AndroidResource Include="Resources\values\styles.xml" /> <None Include="Properties\AndroidManifest.xml" />
<AndroidResource Include="Resources\values\colors.xml" /> </ItemGroup>
<AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" /> <ItemGroup>
<AndroidResource Include="Resources\mipmap-anydpi-v26\icon_round.xml" /> <AndroidResource Include="Resources\values\styles.xml" />
<AndroidResource Include="Resources\mipmap-hdpi\icon.png" /> <AndroidResource Include="Resources\values\colors.xml" />
<AndroidResource Include="Resources\mipmap-hdpi\launcher_foreground.png" /> <AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />
<AndroidResource Include="Resources\mipmap-mdpi\icon.png" /> <AndroidResource Include="Resources\mipmap-anydpi-v26\icon_round.xml" />
<AndroidResource Include="Resources\mipmap-mdpi\launcher_foreground.png" /> <AndroidResource Include="Resources\mipmap-hdpi\icon.png" />
<AndroidResource Include="Resources\mipmap-xhdpi\icon.png" /> <AndroidResource Include="Resources\mipmap-hdpi\launcher_foreground.png" />
<AndroidResource Include="Resources\mipmap-xhdpi\launcher_foreground.png" /> <AndroidResource Include="Resources\mipmap-mdpi\icon.png" />
<AndroidResource Include="Resources\mipmap-xxhdpi\icon.png" /> <AndroidResource Include="Resources\mipmap-mdpi\launcher_foreground.png" />
<AndroidResource Include="Resources\mipmap-xxhdpi\launcher_foreground.png" /> <AndroidResource Include="Resources\mipmap-xhdpi\icon.png" />
<AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" /> <AndroidResource Include="Resources\mipmap-xhdpi\launcher_foreground.png" />
<AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" /> <AndroidResource Include="Resources\mipmap-xxhdpi\icon.png" />
</ItemGroup> <AndroidResource Include="Resources\mipmap-xxhdpi\launcher_foreground.png" />
<ItemGroup> <AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" />
<Folder Include="Modules\" /> <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
<Folder Include="Resources\drawable-hdpi\" /> </ItemGroup>
<Folder Include="Resources\drawable-xhdpi\" /> <ItemGroup>
<Folder Include="Resources\drawable-xxhdpi\" /> <Folder Include="Modules\" />
<Folder Include="Resources\drawable-xxxhdpi\" /> <Folder Include="Resources\drawable-hdpi\" />
<Folder Include="Resources\drawable\" /> <Folder Include="Resources\drawable-xhdpi\" />
</ItemGroup> <Folder Include="Resources\drawable-xxhdpi\" />
<ItemGroup> <Folder Include="Resources\drawable-xxxhdpi\" />
<ProjectReference Include="..\Klient\Klient.csproj"> <Folder Include="Resources\drawable\" />
<Project>{F2C7209F-6EDC-468F-B4B1-CCA283472898}</Project> </ItemGroup>
<Name>Klient</Name> <ItemGroup>
</ProjectReference> <ProjectReference Include="..\Klient\Klient.csproj">
</ItemGroup> <Project>{F2C7209F-6EDC-468F-B4B1-CCA283472898}</Project>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Name>Klient</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\ekranLogowania.xml">
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties TriggeredFromHotReload="False" />
</VisualStudio>
</ProjectExtensions>
</Project> </Project>

8
Klient/Klient/Klient.Android/Properties/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.Klient.Android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.Klient.Android">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" /> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<application android:label="Klient.Android"></application> <application android:label="Klient.Android"></application>
</manifest> </manifest>

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

File diff suppressed because it is too large Load Diff

11
Klient/Klient/Klient.Android/Resources/layout/Tabbar.axml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/sliding_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:tabIndicatorColor="@android:color/white"
app:tabGravity="fill"
app:tabMode="fixed" />

9
Klient/Klient/Klient.Android/Resources/layout/Toolbar.axml
View File

@ -1,9 +0,0 @@
<android.support.v7.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />

64
Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:id="@+id/Login"
android:layout_alignParentStart="false"
android:minWidth="25px"
android:minHeight="25px"
android:layout_centerInParent="false"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:hint="Login"
android:gravity="center_horizontal|center_vertical" />
<android.support.design.widget.TextInputEditText
android:layout_width="204.0dp"
android:layout_height="58.0dp"
android:id="@+id/Password"
android:layout_centerHorizontal="true"
android:layout_below="@+id/Login"
android:hint="Password"
android:gravity="center_horizontal|center_vertical" />
<Button
android:text="Log In"
android:layout_width="100.5dp"
android:layout_height="50dp"
android:id="@+id/In"
android:layout_below="@id/Password"
android:layout_alignParentRight="true"
android:gravity="center" />
<Button
android:text=" Reset \n Password"
android:layout_width="100.5dp"
android:layout_height="50dp"
android:id="@+id/button1"
android:gravity="center"
android:layout_below="@id/In"
android:layout_alignParentRight="true"
android:autoSizeTextType="uniform" />
<Button
android:text="?"
android:layout_width="35.0dp"
android:layout_height="35.0dp"
android:id="@+id/button2"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#ff0b31c8"
android:textColor="#fffcfcfc"
android:gravity="center" />
</RelativeLayout>

2
Klient/Klient/Klient/Klient.csproj
View File

@ -10,6 +10,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.4.0.1008975" /> <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
</ItemGroup> </ItemGroup>
</Project> </Project>