Merge remote-tracking 'origbranch in/master' into aneta
This commit is contained in:
commit
8a5e443567
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -55,11 +55,17 @@
|
|||||||
<Reference Include="System.Numerics.Vectors" />
|
<Reference Include="System.Numerics.Vectors" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.ML.OnnxRuntime">
|
||||||
|
<Version>1.16.3</Version>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="SkiaSharp">
|
||||||
|
<Version>2.88.6</Version>
|
||||||
|
</PackageReference>
|
||||||
<PackageReference Include="Xam.Plugin.Media">
|
<PackageReference Include="Xam.Plugin.Media">
|
||||||
<Version>6.0.2</Version>
|
<Version>6.0.2</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2196" />
|
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
|
||||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
<PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="MainActivity.cs" />
|
<Compile Include="MainActivity.cs" />
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1 +1,5 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
0a2f9484ad74686ea145b082c4d9b07eda5fc1f03490dcd0dcf3a90e4cd33c6e
|
0a2f9484ad74686ea145b082c4d9b07eda5fc1f03490dcd0dcf3a90e4cd33c6e
|
||||||
|
=======
|
||||||
|
08a87bcd26048f1fc311d59d5ee71a34b689540134de96b81ecc74c3da9f0803
|
||||||
|
>>>>>>> origin/master
|
||||||
|
@ -13,21 +13,13 @@ C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Deb
|
|||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\TomAIto.App.Android.csproj.AssemblyReference.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\TomAIto.App.Android.csproj.AssemblyReference.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_BuildLibraryImportsCache.stamp
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_BuildLibraryImportsCache.stamp
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\res.flag
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\res.flag
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\54\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\61\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\62\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\67\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\68\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\74\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\74\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\87\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\87\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\88\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\88\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\89\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\89\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\90\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\90\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\91\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\91\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\92\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\95\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\95\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\96\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\97\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\98\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\98\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\R.txt
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\R.txt
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\R.cs.flag
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\R.cs.flag
|
||||||
@ -627,14 +619,10 @@ C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Deb
|
|||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_GenerateJavaStubs.stamp
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_GenerateJavaStubs.stamp
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_GeneratePackageManagerJava.stamp
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_GeneratePackageManagerJava.stamp
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_ResolveLibraryProjectImports.stamp
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_ResolveLibraryProjectImports.stamp
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\55\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\63\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\63\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\69\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\75\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\75\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\79\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\79\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\85\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\85\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\93\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\99\jl\files.cache
|
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\104\jl\files.cache
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\104\jl\files.cache
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Plugin.Media.dll
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Plugin.Media.dll
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Plugin.Media.pdb
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Plugin.Media.pdb
|
||||||
@ -643,6 +631,7 @@ C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Deb
|
|||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\res\drawable\picture.png
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\res\drawable\picture.png
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\res\drawable\user.png
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\res\drawable\user.png
|
||||||
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\res\drawable\tomato.jpg
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\res\drawable\tomato.jpg
|
||||||
|
<<<<<<< HEAD
|
||||||
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\bin\Debug\TomAIto.App.Android.dll
|
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\bin\Debug\TomAIto.App.Android.dll
|
||||||
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\bin\Debug\TomAIto.App.Android.pdb
|
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\bin\Debug\TomAIto.App.Android.pdb
|
||||||
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\bin\Debug\com.companyname.tomaito.app.apk
|
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\bin\Debug\com.companyname.tomaito.app.apk
|
||||||
@ -1288,3 +1277,85 @@ E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_Conv
|
|||||||
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_GenerateJavaStubs.stamp
|
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_GenerateJavaStubs.stamp
|
||||||
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_GeneratePackageManagerJava.stamp
|
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_GeneratePackageManagerJava.stamp
|
||||||
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_ResolveLibraryProjectImports.stamp
|
E:\tomAIto_git\tomAIto\TomAIto.App\TomAIto.App.Android\obj\Debug\130\stamp\_ResolveLibraryProjectImports.stamp
|
||||||
|
=======
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\64\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\73\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\76\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\77\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\78\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\82\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\83\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\84\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\101\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\102\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\106\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\107\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\108\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\109\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\110\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\111\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\112\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\114\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\115\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\116\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\117\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\118\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\lp\123\jl\files.cache
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Microsoft.ML.OnnxRuntime.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Microsoft.ML.OnnxRuntime.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\SkiaSharp.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\SkiaSharp.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\System.Memory.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Core.Core.Ktx.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Core.Core.Ktx.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Emoji2.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Emoji2.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Emoji2.ViewsHelper.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Emoji2.ViewsHelper.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Lifecycle.Process.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Lifecycle.Process.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.ProfileInstaller.ProfileInstaller.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.ProfileInstaller.ProfileInstaller.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.ResourceInspection.Annotation.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.ResourceInspection.Annotation.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Startup.StartupRuntime.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.AndroidX.Startup.StartupRuntime.pdb
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.Jetbrains.Annotations.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.Kotlin.StdLib.Common.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.Kotlin.StdLib.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.Kotlin.StdLib.Jdk7.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.Kotlin.StdLib.Jdk8.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.KotlinX.Coroutines.Android.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\assets\Xamarin.KotlinX.Coroutines.Core.Jvm.dll
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\activity\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\arch\core\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\core\ktx\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\emoji2\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\emoji2\viewsintegration\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\lifecycle\livedata\core\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\lifecycle\process\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\lifecycle\viewmodel\savedstate\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\profileinstaller\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\startup\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\androidx\tracing\R.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\BaseCellAppCompatView.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\EditorAppCompatEditText.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\EditorAppCompatRenderer.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\EntryAppCompatEditText.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\EntryAppCompatRenderer.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\EntryCellAppCompatEditText.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\EntryCellAppCompatView.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\FormsAppCompatEditText.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\FormsAppCompatEditTextBase.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\FormsAppCompatTextView.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\PickerAppCompatEditText.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\SearchBarAppCompatRenderer.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\SwitchCellAppCompatView.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc643f46942d9dd1fff9\TextCellAppCompatRenderer_TextCellAppCompatView.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc64720bb2db43a66fe9\PickerAppCompatRenderer.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc64720bb2db43a66fe9\PickerAppCompatRendererBase_1.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc64a0e0a82d0db9a07d\Connectivity_EssentialsNetworkCallback.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\crc64ee486da937c010f4\LabelAppCompatRenderer.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\src\mono\androidx\fragment\app\strictmode\FragmentStrictMode_OnViolationListenerImplementor.java
|
||||||
|
C:\Users\Bartek\source\repos\TomAIto.App\TomAIto.App\TomAIto.App.Android\obj\Debug\130\android\bin\classes2.dex
|
||||||
|
>>>>>>> origin/master
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
|||||||
Changes to this file may cause incorrect behavior and will be lost if
|
Changes to this file may cause incorrect behavior and will be lost if
|
||||||
the contents are regenerated.
|
the contents are regenerated.
|
||||||
-->
|
-->
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.companyname.tomaito.app" android:versionCode="1" android:versionName="1.0">
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.companyname.tomaito.app" android:versionCode="1" android:versionName="1.0">
|
||||||
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
|
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-feature android:name="android.hardware.camera" android:required="false" />
|
<uses-feature android:name="android.hardware.camera" android:required="false" />
|
||||||
@ -19,6 +19,8 @@
|
|||||||
<action android:name="android.media.browse.MediaBrowserService" />
|
<action android:name="android.media.browse.MediaBrowserService" />
|
||||||
</intent>
|
</intent>
|
||||||
</queries>
|
</queries>
|
||||||
|
<permission android:name="com.companyname.tomaito.app.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" android:protectionLevel="signature" />
|
||||||
|
<uses-permission android:name="com.companyname.tomaito.app.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" />
|
||||||
<application android:name="android.app.Application" android:allowBackup="true" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:debuggable="true" android:extractNativeLibs="true" android:icon="@mipmap/icon" android:label="TomAIto.App.Android" android:theme="@style/MainTheme">
|
<application android:name="android.app.Application" android:allowBackup="true" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:debuggable="true" android:extractNativeLibs="true" android:icon="@mipmap/icon" android:label="TomAIto.App.Android" android:theme="@style/MainTheme">
|
||||||
<provider android:name="androidx.core.content.FileProvider" android:authorities="com.companyname.tomaito.app.fileprovider" android:exported="false" android:grantUriPermissions="true">
|
<provider android:name="androidx.core.content.FileProvider" android:authorities="com.companyname.tomaito.app.fileprovider" android:exported="false" android:grantUriPermissions="true">
|
||||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
|
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
|
||||||
@ -41,5 +43,24 @@
|
|||||||
<activity android:name="crc64a0e0a82d0db9a07d.WebAuthenticatorIntermediateActivity" android:configChanges="orientation|screenSize" />
|
<activity android:name="crc64a0e0a82d0db9a07d.WebAuthenticatorIntermediateActivity" android:configChanges="orientation|screenSize" />
|
||||||
<receiver android:name="crc643f46942d9dd1fff9.PowerSaveModeBroadcastReceiver" android:enabled="true" android:exported="false" />
|
<receiver android:name="crc643f46942d9dd1fff9.PowerSaveModeBroadcastReceiver" android:enabled="true" android:exported="false" />
|
||||||
<provider android:name="mono.MonoRuntimeProvider" android:authorities="com.companyname.tomaito.app.mono.MonoRuntimeProvider.__mono_init__" android:exported="false" android:initOrder="1999999999" />
|
<provider android:name="mono.MonoRuntimeProvider" android:authorities="com.companyname.tomaito.app.mono.MonoRuntimeProvider.__mono_init__" android:exported="false" android:initOrder="1999999999" />
|
||||||
|
<provider android:name="androidx.startup.InitializationProvider" android:authorities="com.companyname.tomaito.app.androidx-startup" android:exported="false" tools:node="merge">
|
||||||
|
<meta-data android:name="androidx.emoji2.text.EmojiCompatInitializer" android:value="androidx.startup" />
|
||||||
|
<meta-data android:name="androidx.profileinstaller.ProfileInstallerInitializer" android:value="androidx.startup" />
|
||||||
|
<meta-data android:name="androidx.lifecycle.ProcessLifecycleInitializer" android:value="androidx.startup" />
|
||||||
|
</provider>
|
||||||
|
<receiver android:name="androidx.profileinstaller.ProfileInstallReceiver" android:directBootAware="false" android:enabled="true" android:exported="true" android:permission="android.permission.DUMP">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="androidx.profileinstaller.action.INSTALL_PROFILE" />
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="androidx.profileinstaller.action.SKIP_FILE" />
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="androidx.profileinstaller.action.SAVE_PROFILE" />
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
|
||||||
|
</intent-filter>
|
||||||
|
</receiver>
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user