From 11f96f9d06412b61f9618b9447146cbb0223233d Mon Sep 17 00:00:00 2001 From: s426226 Date: Wed, 16 Dec 2020 16:26:13 +0100 Subject: [PATCH 01/10] POS-29 --- .../Framework/ExceptionHandlerMiddleware.cs | 38 +++++++++++++++++++ Serwer/Serwer.Api/Startup.cs | 5 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 Serwer/Serwer.Api/Framework/ExceptionHandlerMiddleware.cs diff --git a/Serwer/Serwer.Api/Framework/ExceptionHandlerMiddleware.cs b/Serwer/Serwer.Api/Framework/ExceptionHandlerMiddleware.cs new file mode 100644 index 0000000..a8a09af --- /dev/null +++ b/Serwer/Serwer.Api/Framework/ExceptionHandlerMiddleware.cs @@ -0,0 +1,38 @@ +using Microsoft.AspNetCore.Http; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Threading.Tasks; + +namespace Serwer.Api.Framework +{ + public class ExceptionHandlerMiddleware + { + private readonly RequestDelegate _next; + + public ExceptionHandlerMiddleware(RequestDelegate next) + { + _next = next; + } + + public async Task Invoke(HttpContext context) + { + try + { + await _next(context); + } + catch (Exception ex) + { + await HandleExceptionAsync(context, ex); + } + } + + private static Task HandleExceptionAsync(HttpContext context, Exception exception) + { + var statusCode = HttpStatusCode.BadRequest; + context.Response.StatusCode = (int)statusCode; + return context.Response.WriteAsync($"Error: {exception.Message}"); + } + } +} diff --git a/Serwer/Serwer.Api/Startup.cs b/Serwer/Serwer.Api/Startup.cs index 7eaa7ad..85f3836 100644 --- a/Serwer/Serwer.Api/Startup.cs +++ b/Serwer/Serwer.Api/Startup.cs @@ -15,6 +15,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; +using Serwer.Api.Framework; using Serwer.Core.Repositories; using Serwer.Infrastructure.Mappers; using Serwer.Infrastructure.Repositories; @@ -88,7 +89,9 @@ namespace Serwer.Api } app.UseRouting(); - app.UseAuthentication(); + app.UseMiddleware(typeof(ExceptionHandlerMiddleware)); + + app.UseAuthentication(); app.UseAuthorization(); app.UseEndpoints(endpoints => From 04ad1f02f423879fb8e754d2879e362f7d1b8474 Mon Sep 17 00:00:00 2001 From: s426226 Date: Fri, 18 Dec 2020 16:04:07 +0100 Subject: [PATCH 02/10] POS-33 --- .../Serwer.Api/Controllers/UserController.cs | 11 +++++++++- Serwer/Serwer.Api/Startup.cs | 8 +++---- Serwer/Serwer.Core/Domain/User.cs | 5 +++-- Serwer/Serwer.Infrastructure/DTO/UserDto.cs | 1 + .../Services/IUserService.cs | 2 ++ .../Services/UserService.cs | 22 ++++++++++++++++++- .../ViewModels/UpdateUserModel.cs | 18 +++++++++++++++ 7 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 Serwer/Serwer.Infrastructure/ViewModels/UpdateUserModel.cs diff --git a/Serwer/Serwer.Api/Controllers/UserController.cs b/Serwer/Serwer.Api/Controllers/UserController.cs index d2aa3b6..b6da904 100644 --- a/Serwer/Serwer.Api/Controllers/UserController.cs +++ b/Serwer/Serwer.Api/Controllers/UserController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Serwer.Infrastructure.DTO; using Serwer.Infrastructure.Services; @@ -35,6 +36,14 @@ namespace Serwer.Api.Controllers return Ok(user); } + [Authorize] + [HttpPost("Update")] + public async Task Update([FromForm]UpdateUserModel request) + { + var user = await _userService.UpdateAsync(request); + return Ok(user); + } + [HttpGet("Test")] public IActionResult Test() { diff --git a/Serwer/Serwer.Api/Startup.cs b/Serwer/Serwer.Api/Startup.cs index 85f3836..c4627ef 100644 --- a/Serwer/Serwer.Api/Startup.cs +++ b/Serwer/Serwer.Api/Startup.cs @@ -44,7 +44,7 @@ namespace Serwer.Api c.SwaggerDoc("v1", new OpenApiInfo { Title = "Serwer.Api", Version = "v1" }); }); - var hostEnviroment = new HostEnviroment { RootPath = WebRootPath}; + var hostEnviroment = new HostEnviroment { RootPath = WebRootPath }; var jwtSettings = new JwtSettings() { Issuer = "PoszukiwaczInc", @@ -77,7 +77,7 @@ namespace Serwer.Api { if (env.IsDevelopment()) { - app.UseCors(builder => + app.UseCors(builder => { builder.AllowAnyHeader(); builder.AllowAnyMethod(); @@ -90,8 +90,8 @@ namespace Serwer.Api app.UseRouting(); app.UseMiddleware(typeof(ExceptionHandlerMiddleware)); - - app.UseAuthentication(); + + app.UseAuthentication(); app.UseAuthorization(); app.UseEndpoints(endpoints => diff --git a/Serwer/Serwer.Core/Domain/User.cs b/Serwer/Serwer.Core/Domain/User.cs index 6a389f5..0d3a56b 100644 --- a/Serwer/Serwer.Core/Domain/User.cs +++ b/Serwer/Serwer.Core/Domain/User.cs @@ -18,14 +18,15 @@ namespace Serwer.Core.Domain public DateTime UpdatedAt { get; protected set; } protected User() { } - public User(string email, string name, string surname, string login, string password) + public User(Guid id, string email, string name, string surname, string login, string password) { - Id = Guid.NewGuid(); + Id = id; SetEmail(email); SetName(name); SetSurname(surname); SetLogin(login); SetPassword(password); + CreatedAt = DateTime.UtcNow; } public void SetEmail(string email) diff --git a/Serwer/Serwer.Infrastructure/DTO/UserDto.cs b/Serwer/Serwer.Infrastructure/DTO/UserDto.cs index 962ae6d..a55637d 100644 --- a/Serwer/Serwer.Infrastructure/DTO/UserDto.cs +++ b/Serwer/Serwer.Infrastructure/DTO/UserDto.cs @@ -8,6 +8,7 @@ namespace Serwer.Infrastructure.DTO { public class UserDto { + public Guid Id { get; set; } public string Email { get; set; } public string Name { get; set; } public string Surname { get; set; } diff --git a/Serwer/Serwer.Infrastructure/Services/IUserService.cs b/Serwer/Serwer.Infrastructure/Services/IUserService.cs index 256594c..b456bc2 100644 --- a/Serwer/Serwer.Infrastructure/Services/IUserService.cs +++ b/Serwer/Serwer.Infrastructure/Services/IUserService.cs @@ -1,4 +1,5 @@ using Serwer.Infrastructure.DTO; +using Serwer.Infrastructure.ViewModels; using System; using System.Collections.Generic; using System.Linq; @@ -11,5 +12,6 @@ namespace Serwer.Infrastructure.Services { Task RegisterAsync(string email, string name, string surname, string login, string password); Task SignInAsync(string login, string password); + Task UpdateAsync(UpdateUserModel userModel); } } diff --git a/Serwer/Serwer.Infrastructure/Services/UserService.cs b/Serwer/Serwer.Infrastructure/Services/UserService.cs index ce1f0b2..a5a8a4a 100644 --- a/Serwer/Serwer.Infrastructure/Services/UserService.cs +++ b/Serwer/Serwer.Infrastructure/Services/UserService.cs @@ -3,6 +3,7 @@ using Serwer.Core.Domain; using Serwer.Core.Repositories; using Serwer.Infrastructure.DTO; using Serwer.Infrastructure.Mappers; +using Serwer.Infrastructure.ViewModels; using System; using System.Collections.Generic; using System.Linq; @@ -30,7 +31,7 @@ namespace Serwer.Infrastructure.Services { throw new Exception($"User with login: {login} already exists."); } - var user = new User(email, name, surname, login, password); + var user = new User(Guid.NewGuid(), email, name, surname, login, password); await _userRepository.AddAsync(user); } @@ -54,5 +55,24 @@ namespace Serwer.Infrastructure.Services Jwt = _mapper.Map(jwt) }; } + + public async Task UpdateAsync(UpdateUserModel userModel) + { + var user = await _userRepository.GetAsync(userModel.Id); + if(user == null) + { + throw new Exception("User not found."); + } + var userLoginTaken = await _userRepository.GetAsync(userModel.Login); + if(userLoginTaken != null && userLoginTaken.Id != user.Id) + { + throw new Exception("User login taken."); + } + + var newUser = new User(user.Id, userModel.Email, userModel.Name, userModel.Surname, userModel.Login, userModel.Password); + await _userRepository.UpdateAsync(newUser); + newUser = await _userRepository.GetAsync(user.Id); + return _mapper.Map(newUser); + } } } diff --git a/Serwer/Serwer.Infrastructure/ViewModels/UpdateUserModel.cs b/Serwer/Serwer.Infrastructure/ViewModels/UpdateUserModel.cs new file mode 100644 index 0000000..40a6765 --- /dev/null +++ b/Serwer/Serwer.Infrastructure/ViewModels/UpdateUserModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Serwer.Infrastructure.ViewModels +{ + public class UpdateUserModel + { + public Guid Id { get; set; } + public string Email { get; set; } + public string Name { get; set; } + public string Surname { get; set; } + public string Login { get; set; } + public string Password { get; set; } = null; + } +} From cfb08000652dd7fbc7eed3e292162ad87cd67c3a Mon Sep 17 00:00:00 2001 From: s426226 Date: Fri, 18 Dec 2020 16:06:10 +0100 Subject: [PATCH 03/10] POS-35 --- Serwer/Serwer.Api/Startup.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Serwer/Serwer.Api/Startup.cs b/Serwer/Serwer.Api/Startup.cs index c4627ef..357811a 100644 --- a/Serwer/Serwer.Api/Startup.cs +++ b/Serwer/Serwer.Api/Startup.cs @@ -42,6 +42,27 @@ namespace Serwer.Api services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo { Title = "Serwer.Api", Version = "v1" }); + var jwtSecurityScheme = new OpenApiSecurityScheme + { + Scheme = "bearer", + BearerFormat = "JWT", + Name = "JWT Authentication", + In = ParameterLocation.Header, + Type = SecuritySchemeType.Http, + Description = "Put **_ONLY_** your JWT Bearer token on textbox below!", + + Reference = new OpenApiReference + { + Id = JwtBearerDefaults.AuthenticationScheme, + Type = ReferenceType.SecurityScheme + } + }; + + c.AddSecurityDefinition(jwtSecurityScheme.Reference.Id, jwtSecurityScheme); + c.AddSecurityRequirement(new OpenApiSecurityRequirement + { + { jwtSecurityScheme, Array.Empty() } + }); }); var hostEnviroment = new HostEnviroment { RootPath = WebRootPath }; From 362cfdcee0d616929dad46b6aa93b41507825cfa Mon Sep 17 00:00:00 2001 From: s426226 Date: Sun, 20 Dec 2020 18:03:20 +0100 Subject: [PATCH 04/10] POS-34 dodanie wyszukiwania przez google api --- .../Serwer.Api/Controllers/ImageController.cs | 4 +- .../Controllers/SearchController.cs | 28 +++++++++++ Serwer/Serwer.Api/Startup.cs | 3 +- Serwer/Serwer.Core/Domain/SearchResult.cs | 13 ++++++ .../DTO/SearchResultDto.cs | 15 ++++++ .../Services/IImageHandler.cs | 5 +- .../{IImageService.cs => ISearchService.cs} | 9 ++-- .../Services/ImageHandler.cs | 22 ++++++++- .../Services/ImageService.cs | 30 ------------ .../Services/SearchService.cs | 46 +++++++++++++++++++ .../Serwer.Infrastructure.csproj | 2 + 11 files changed, 135 insertions(+), 42 deletions(-) create mode 100644 Serwer/Serwer.Api/Controllers/SearchController.cs create mode 100644 Serwer/Serwer.Core/Domain/SearchResult.cs create mode 100644 Serwer/Serwer.Infrastructure/DTO/SearchResultDto.cs rename Serwer/Serwer.Infrastructure/Services/{IImageService.cs => ISearchService.cs} (50%) delete mode 100644 Serwer/Serwer.Infrastructure/Services/ImageService.cs create mode 100644 Serwer/Serwer.Infrastructure/Services/SearchService.cs diff --git a/Serwer/Serwer.Api/Controllers/ImageController.cs b/Serwer/Serwer.Api/Controllers/ImageController.cs index 2f62cea..11a164a 100644 --- a/Serwer/Serwer.Api/Controllers/ImageController.cs +++ b/Serwer/Serwer.Api/Controllers/ImageController.cs @@ -13,8 +13,8 @@ namespace Serwer.Api.Controllers [ApiController] public class ImageController : ControllerBase { - private readonly IImageService _imageService; - public ImageController(IImageService imageService) + private readonly IImageHandler _imageService; + public ImageController(IImageHandler imageService) { _imageService = imageService; } diff --git a/Serwer/Serwer.Api/Controllers/SearchController.cs b/Serwer/Serwer.Api/Controllers/SearchController.cs new file mode 100644 index 0000000..3300ab7 --- /dev/null +++ b/Serwer/Serwer.Api/Controllers/SearchController.cs @@ -0,0 +1,28 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Serwer.Infrastructure.Services; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Serwer.Api.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class SearchController : ControllerBase + { + private readonly ISearchService _searchService; + public SearchController(ISearchService searchService) + { + _searchService = searchService; + } + + [HttpGet("{query}")] + public async Task Search(string query) + { + var results = await _searchService.Search(query); + return Ok(results); + } + } +} diff --git a/Serwer/Serwer.Api/Startup.cs b/Serwer/Serwer.Api/Startup.cs index 357811a..67ac049 100644 --- a/Serwer/Serwer.Api/Startup.cs +++ b/Serwer/Serwer.Api/Startup.cs @@ -89,8 +89,9 @@ namespace Serwer.Api services.AddSingleton(AutoMapperConfig.Initialize()); services.AddSingleton(sp => new JwtHandler(jwtSettings)); services.AddScoped(); - services.AddScoped(); + services.AddScoped(); services.AddScoped(); + services.AddScoped(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/Serwer/Serwer.Core/Domain/SearchResult.cs b/Serwer/Serwer.Core/Domain/SearchResult.cs new file mode 100644 index 0000000..f20d95b --- /dev/null +++ b/Serwer/Serwer.Core/Domain/SearchResult.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Serwer.Core.Domain +{ + public class SearchResult + { + + } +} diff --git a/Serwer/Serwer.Infrastructure/DTO/SearchResultDto.cs b/Serwer/Serwer.Infrastructure/DTO/SearchResultDto.cs new file mode 100644 index 0000000..646d0fa --- /dev/null +++ b/Serwer/Serwer.Infrastructure/DTO/SearchResultDto.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Serwer.Infrastructure.DTO +{ + public class SearchResultDTO + { + public string Title { get; set; } + public string Link { get; set; } + public string Snippet { get; set; } + } +} diff --git a/Serwer/Serwer.Infrastructure/Services/IImageHandler.cs b/Serwer/Serwer.Infrastructure/Services/IImageHandler.cs index a7cc44f..2d71c93 100644 --- a/Serwer/Serwer.Infrastructure/Services/IImageHandler.cs +++ b/Serwer/Serwer.Infrastructure/Services/IImageHandler.cs @@ -1,4 +1,5 @@ -using System; +using Serwer.Core.Domain; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,6 +9,6 @@ namespace Serwer.Infrastructure.Services { public interface IImageHandler { - + Task Process(string name, string contentType, byte[] bytes); } } diff --git a/Serwer/Serwer.Infrastructure/Services/IImageService.cs b/Serwer/Serwer.Infrastructure/Services/ISearchService.cs similarity index 50% rename from Serwer/Serwer.Infrastructure/Services/IImageService.cs rename to Serwer/Serwer.Infrastructure/Services/ISearchService.cs index 780c155..8377694 100644 --- a/Serwer/Serwer.Infrastructure/Services/IImageService.cs +++ b/Serwer/Serwer.Infrastructure/Services/ISearchService.cs @@ -1,14 +1,13 @@ -using Serwer.Core.Domain; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; - +using Serwer.Infrastructure.DTO; namespace Serwer.Infrastructure.Services { - public interface IImageService + public interface ISearchService { - Task Process(string name, string contentType, byte[] bytes); + Task> Search(string query); } } diff --git a/Serwer/Serwer.Infrastructure/Services/ImageHandler.cs b/Serwer/Serwer.Infrastructure/Services/ImageHandler.cs index ba262e6..4dc0bf1 100644 --- a/Serwer/Serwer.Infrastructure/Services/ImageHandler.cs +++ b/Serwer/Serwer.Infrastructure/Services/ImageHandler.cs @@ -1,12 +1,30 @@ -using System; +using Serwer.Core.Domain; +using Serwer.Infrastructure.Settings; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tesseract; namespace Serwer.Infrastructure.Services { - class ImageHandler + public class ImageHandler : IImageHandler { + private readonly ISet _files = new HashSet(); + private readonly string _env; + public ImageHandler(IHostEnviroment hostEnviroment) + { + _env = hostEnviroment.RootPath; + } + public async Task Process(string name, string contentType, byte[] bytes) + { + var engine = new TesseractEngine(System.IO.Path.Combine(_env, "tessdata"),"eng+equ", EngineMode.Default); + var img = Pix.LoadFromMemory(bytes); + var res = engine.Process(img); + var txt = res.GetText(); + + return await Task.FromResult(txt); + } } } diff --git a/Serwer/Serwer.Infrastructure/Services/ImageService.cs b/Serwer/Serwer.Infrastructure/Services/ImageService.cs deleted file mode 100644 index 02d062d..0000000 --- a/Serwer/Serwer.Infrastructure/Services/ImageService.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Serwer.Core.Domain; -using Serwer.Infrastructure.Settings; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tesseract; - -namespace Serwer.Infrastructure.Services -{ - public class ImageService : IImageService - { - private readonly ISet _files = new HashSet(); - private readonly string _env; - public ImageService(IHostEnviroment hostEnviroment) - { - _env = hostEnviroment.RootPath; - } - public async Task Process(string name, string contentType, byte[] bytes) - { - var engine = new TesseractEngine(System.IO.Path.Combine(_env, "tessdata"),"eng+equ", EngineMode.Default); - var img = Pix.LoadFromMemory(bytes); - var res = engine.Process(img); - var txt = res.GetText(); - - return await Task.FromResult(txt); - } - } -} diff --git a/Serwer/Serwer.Infrastructure/Services/SearchService.cs b/Serwer/Serwer.Infrastructure/Services/SearchService.cs new file mode 100644 index 0000000..8447cd3 --- /dev/null +++ b/Serwer/Serwer.Infrastructure/Services/SearchService.cs @@ -0,0 +1,46 @@ +using Google.Apis.Customsearch.v1; +using Google.Apis.Services; +using Newtonsoft.Json; +using Serwer.Infrastructure.DTO; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Text; +using System.Text.Json.Serialization; +using System.Threading.Tasks; +namespace Serwer.Infrastructure.Services +{ + public class SearchService : ISearchService + { + private readonly IImageHandler _imageHandler; + private const string apiKey = "AIzaSyCagG6QyQyBuJNb1YDuK25qSzoC0Rrjo0c"; + private const string searchEngineId = "17b946686537c46e3"; + public SearchService(IImageHandler imageHandler) + { + _imageHandler = imageHandler; + } + public async Task> Search(string query) + { + WebRequest webRequest = WebRequest.Create($"https://www.googleapis.com/customsearch/v1?key={apiKey}&cx={searchEngineId}&q={query}"); + using (var stream = new StreamReader(webRequest.GetResponse().GetResponseStream())) + { + var response = await stream.ReadToEndAsync(); + dynamic jsonData = JsonConvert.DeserializeObject(response); + + var results = new List(); + foreach(var item in jsonData.items) + { + results.Add(new SearchResultDTO + { + Title = item.title, + Link = item.link, + Snippet = item.snippet + }); + } + return results; + } + } + } +} diff --git a/Serwer/Serwer.Infrastructure/Serwer.Infrastructure.csproj b/Serwer/Serwer.Infrastructure/Serwer.Infrastructure.csproj index 5fd4559..760f634 100644 --- a/Serwer/Serwer.Infrastructure/Serwer.Infrastructure.csproj +++ b/Serwer/Serwer.Infrastructure/Serwer.Infrastructure.csproj @@ -6,6 +6,8 @@ + + From 50e664ae5a5c5d44d7fdb03c74a2ce76e2b95ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Przyby=C5=82a?= Date: Mon, 21 Dec 2020 13:55:27 +0100 Subject: [PATCH 05/10] =?UTF-8?q?POS-31=20Mo=C5=BCliwo=C5=9B=C4=87=20wy?= =?UTF-8?q?=C5=9Bwietlenia=20has=C5=82a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Properties/AndroidManifest.xml | 2 +- .../Klient.Android/Properties/AssemblyInfo.cs | 1 + .../Resources/Resource.designer.cs | 1177 +++++++++-------- .../Resources/layout/ekranLogowania.xml | 57 +- .../Resources/layout/ekranRejestracji.xml | 142 +- .../Resources/values/styles.xml | 3 +- 6 files changed, 719 insertions(+), 663 deletions(-) diff --git a/Klient/Klient/Klient.Android/Properties/AndroidManifest.xml b/Klient/Klient/Klient.Android/Properties/AndroidManifest.xml index 6ec1baa..bafd9a1 100644 --- a/Klient/Klient/Klient.Android/Properties/AndroidManifest.xml +++ b/Klient/Klient/Klient.Android/Properties/AndroidManifest.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/Klient/Klient/Klient.Android/Properties/AssemblyInfo.cs b/Klient/Klient/Klient.Android/Properties/AssemblyInfo.cs index 58b8a02..82c9b86 100644 --- a/Klient/Klient/Klient.Android/Properties/AssemblyInfo.cs +++ b/Klient/Klient/Klient.Android/Properties/AssemblyInfo.cs @@ -15,6 +15,7 @@ using Android.App; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] +[assembly: Application(Theme = "@style/Base.Theme.AppCompat.Light.DarkActionBar")] // Version information for an assembly consists of the following four values: // diff --git a/Klient/Klient/Klient.Android/Resources/Resource.designer.cs b/Klient/Klient/Klient.Android/Resources/Resource.designer.cs index f95cb21..9217eb7 100644 --- a/Klient/Klient/Klient.Android/Resources/Resource.designer.cs +++ b/Klient/Klient/Klient.Android/Resources/Resource.designer.cs @@ -9054,839 +9054,854 @@ namespace Klient.Droid public partial class Id { - // aapt resource value: 0x7F08001A - public const int about = 2131230746; - - // aapt resource value: 0x7F08001B - public const int action0 = 2131230747; - - // aapt resource value: 0x7F08002D - public const int actions = 2131230765; - - // aapt resource value: 0x7F08001C - public const int action_bar = 2131230748; - - // aapt resource value: 0x7F08001D - public const int action_bar_activity_content = 2131230749; - - // aapt resource value: 0x7F08001E - public const int action_bar_container = 2131230750; - // aapt resource value: 0x7F08001F - public const int action_bar_root = 2131230751; + public const int about = 2131230751; // aapt resource value: 0x7F080020 - public const int action_bar_spinner = 2131230752; + public const int action0 = 2131230752; + + // aapt resource value: 0x7F080032 + public const int actions = 2131230770; // aapt resource value: 0x7F080021 - public const int action_bar_subtitle = 2131230753; + public const int action_bar = 2131230753; // aapt resource value: 0x7F080022 - public const int action_bar_title = 2131230754; + public const int action_bar_activity_content = 2131230754; // aapt resource value: 0x7F080023 - public const int action_container = 2131230755; + public const int action_bar_container = 2131230755; // aapt resource value: 0x7F080024 - public const int action_context_bar = 2131230756; + public const int action_bar_root = 2131230756; // aapt resource value: 0x7F080025 - public const int action_divider = 2131230757; + public const int action_bar_spinner = 2131230757; // aapt resource value: 0x7F080026 - public const int action_image = 2131230758; + public const int action_bar_subtitle = 2131230758; // aapt resource value: 0x7F080027 - public const int action_menu_divider = 2131230759; + public const int action_bar_title = 2131230759; // aapt resource value: 0x7F080028 - public const int action_menu_presenter = 2131230760; + public const int action_container = 2131230760; // aapt resource value: 0x7F080029 - public const int action_mode_bar = 2131230761; + public const int action_context_bar = 2131230761; // aapt resource value: 0x7F08002A - public const int action_mode_bar_stub = 2131230762; + public const int action_divider = 2131230762; // aapt resource value: 0x7F08002B - public const int action_mode_close_button = 2131230763; + public const int action_image = 2131230763; // aapt resource value: 0x7F08002C - public const int action_text = 2131230764; + public const int action_menu_divider = 2131230764; + + // aapt resource value: 0x7F08002D + public const int action_menu_presenter = 2131230765; // aapt resource value: 0x7F08002E - public const int activity_chooser_view_content = 2131230766; + public const int action_mode_bar = 2131230766; // aapt resource value: 0x7F08002F - public const int add = 2131230767; + public const int action_mode_bar_stub = 2131230767; // aapt resource value: 0x7F080030 - public const int alertTitle = 2131230768; + public const int action_mode_close_button = 2131230768; // aapt resource value: 0x7F080031 - public const int all = 2131230769; + public const int action_text = 2131230769; + + // aapt resource value: 0x7F080033 + public const int activity_chooser_view_content = 2131230771; + + // aapt resource value: 0x7F080034 + public const int add = 2131230772; + + // aapt resource value: 0x7F080035 + public const int alertTitle = 2131230773; + + // aapt resource value: 0x7F080036 + public const int all = 2131230774; // aapt resource value: 0x7F080000 public const int ALT = 2131230720; - // aapt resource value: 0x7F080032 - public const int always = 2131230770; - - // aapt resource value: 0x7F080033 - public const int async = 2131230771; - - // aapt resource value: 0x7F080034 - public const int auto = 2131230772; - - // aapt resource value: 0x7F080035 - public const int beginning = 2131230773; - - // aapt resource value: 0x7F080036 - public const int blocking = 2131230774; - // aapt resource value: 0x7F080037 - public const int bottom = 2131230775; + public const int always = 2131230775; // aapt resource value: 0x7F080038 - public const int bottomtab_navarea = 2131230776; + public const int async = 2131230776; // aapt resource value: 0x7F080039 - public const int bottomtab_tabbar = 2131230777; + public const int auto = 2131230777; // aapt resource value: 0x7F08003A - public const int browser_actions_header_text = 2131230778; - - // aapt resource value: 0x7F08003D - public const int browser_actions_menu_items = 2131230781; + public const int beginning = 2131230778; // aapt resource value: 0x7F08003B - public const int browser_actions_menu_item_icon = 2131230779; + public const int blocking = 2131230779; // aapt resource value: 0x7F08003C - public const int browser_actions_menu_item_text = 2131230780; + public const int bottom = 2131230780; + + // aapt resource value: 0x7F08003D + public const int bottomtab_navarea = 2131230781; // aapt resource value: 0x7F08003E - public const int browser_actions_menu_view = 2131230782; + public const int bottomtab_tabbar = 2131230782; // aapt resource value: 0x7F08003F - public const int buttonPanel = 2131230783; - - // aapt resource value: 0x7F080040 - public const int cancel_action = 2131230784; - - // aapt resource value: 0x7F080041 - public const int center = 2131230785; + public const int browser_actions_header_text = 2131230783; // aapt resource value: 0x7F080042 - public const int center_horizontal = 2131230786; + public const int browser_actions_menu_items = 2131230786; + + // aapt resource value: 0x7F080040 + public const int browser_actions_menu_item_icon = 2131230784; + + // aapt resource value: 0x7F080041 + public const int browser_actions_menu_item_text = 2131230785; // aapt resource value: 0x7F080043 - public const int center_vertical = 2131230787; + public const int browser_actions_menu_view = 2131230787; // aapt resource value: 0x7F080044 - public const int checkbox = 2131230788; + public const int buttonPanel = 2131230788; // aapt resource value: 0x7F080045 - public const int chronometer = 2131230789; + public const int cancel_action = 2131230789; // aapt resource value: 0x7F080046 - public const int clip_horizontal = 2131230790; + public const int center = 2131230790; // aapt resource value: 0x7F080047 - public const int clip_vertical = 2131230791; + public const int center_horizontal = 2131230791; // aapt resource value: 0x7F080048 - public const int collapseActionView = 2131230792; + public const int center_vertical = 2131230792; // aapt resource value: 0x7F080049 - public const int container = 2131230793; + public const int checkbox = 2131230793; // aapt resource value: 0x7F08004A - public const int content = 2131230794; + public const int chronometer = 2131230794; // aapt resource value: 0x7F08004B - public const int contentPanel = 2131230795; + public const int clip_horizontal = 2131230795; // aapt resource value: 0x7F08004C - public const int coordinator = 2131230796; + public const int clip_vertical = 2131230796; + + // aapt resource value: 0x7F08004D + public const int collapseActionView = 2131230797; + + // aapt resource value: 0x7F08004E + public const int container = 2131230798; + + // aapt resource value: 0x7F08004F + public const int content = 2131230799; + + // aapt resource value: 0x7F080050 + public const int contentPanel = 2131230800; + + // aapt resource value: 0x7F080051 + public const int coordinator = 2131230801; // aapt resource value: 0x7F080001 public const int CTRL = 2131230721; - // aapt resource value: 0x7F08004D - public const int custom = 2131230797; - - // aapt resource value: 0x7F08004E - public const int customPanel = 2131230798; - - // aapt resource value: 0x7F08004F - public const int decor_content_parent = 2131230799; - - // aapt resource value: 0x7F080050 - public const int default_activity_button = 2131230800; - - // aapt resource value: 0x7F080051 - public const int design_bottom_sheet = 2131230801; - // aapt resource value: 0x7F080052 - public const int design_menu_item_action_area = 2131230802; + public const int custom = 2131230802; // aapt resource value: 0x7F080053 - public const int design_menu_item_action_area_stub = 2131230803; + public const int customPanel = 2131230803; // aapt resource value: 0x7F080054 - public const int design_menu_item_text = 2131230804; + public const int decor_content_parent = 2131230804; // aapt resource value: 0x7F080055 - public const int design_navigation_view = 2131230805; + public const int default_activity_button = 2131230805; // aapt resource value: 0x7F080056 - public const int disableHome = 2131230806; + public const int design_bottom_sheet = 2131230806; // aapt resource value: 0x7F080057 - public const int edit_query = 2131230807; + public const int design_menu_item_action_area = 2131230807; + + // aapt resource value: 0x7F080058 + public const int design_menu_item_action_area_stub = 2131230808; + + // aapt resource value: 0x7F080059 + public const int design_menu_item_text = 2131230809; + + // aapt resource value: 0x7F08005A + public const int design_navigation_view = 2131230810; + + // aapt resource value: 0x7F08005B + public const int disableHome = 2131230811; + + // aapt resource value: 0x7F08005C + public const int edit_query = 2131230812; // aapt resource value: 0x7F080002 public const int Email = 2131230722; - // aapt resource value: 0x7F080058 - public const int end = 2131230808; - - // aapt resource value: 0x7F080059 - public const int end_padder = 2131230809; - - // aapt resource value: 0x7F08005A - public const int enterAlways = 2131230810; - - // aapt resource value: 0x7F08005B - public const int enterAlwaysCollapsed = 2131230811; - - // aapt resource value: 0x7F08005C - public const int exitUntilCollapsed = 2131230812; + // aapt resource value: 0x7F08005D + public const int end = 2131230813; // aapt resource value: 0x7F08005E - public const int expanded_menu = 2131230814; - - // aapt resource value: 0x7F08005D - public const int expand_activities_button = 2131230813; + public const int end_padder = 2131230814; // aapt resource value: 0x7F08005F - public const int fill = 2131230815; - - // aapt resource value: 0x7F080062 - public const int filled = 2131230818; + public const int enterAlways = 2131230815; // aapt resource value: 0x7F080060 - public const int fill_horizontal = 2131230816; + public const int enterAlwaysCollapsed = 2131230816; // aapt resource value: 0x7F080061 - public const int fill_vertical = 2131230817; + public const int exitUntilCollapsed = 2131230817; // aapt resource value: 0x7F080063 - public const int @fixed = 2131230819; + public const int expanded_menu = 2131230819; + + // aapt resource value: 0x7F080062 + public const int expand_activities_button = 2131230818; // aapt resource value: 0x7F080064 - public const int flyoutcontent_appbar = 2131230820; + public const int fill = 2131230820; + + // aapt resource value: 0x7F080067 + public const int filled = 2131230823; // aapt resource value: 0x7F080065 - public const int flyoutcontent_recycler = 2131230821; + public const int fill_horizontal = 2131230821; // aapt resource value: 0x7F080066 - public const int forever = 2131230822; + public const int fill_vertical = 2131230822; + + // aapt resource value: 0x7F080068 + public const int @fixed = 2131230824; + + // aapt resource value: 0x7F080069 + public const int flyoutcontent_appbar = 2131230825; + + // aapt resource value: 0x7F08006A + public const int flyoutcontent_recycler = 2131230826; + + // aapt resource value: 0x7F08006B + public const int forever = 2131230827; // aapt resource value: 0x7F080003 public const int FUNCTION = 2131230723; - // aapt resource value: 0x7F080067 - public const int ghost_view = 2131230823; - - // aapt resource value: 0x7F080068 - public const int group_divider = 2131230824; - - // aapt resource value: 0x7F080069 - public const int help = 2131230825; - - // aapt resource value: 0x7F08006A - public const int home = 2131230826; - - // aapt resource value: 0x7F08006B - public const int homeAsUp = 2131230827; - // aapt resource value: 0x7F08006C - public const int icon = 2131230828; + public const int ghost_view = 2131230828; // aapt resource value: 0x7F08006D - public const int icon_group = 2131230829; + public const int group_divider = 2131230829; // aapt resource value: 0x7F08006E - public const int ifRoom = 2131230830; + public const int help = 2131230830; // aapt resource value: 0x7F08006F - public const int image = 2131230831; + public const int home = 2131230831; + + // aapt resource value: 0x7F080070 + public const int homeAsUp = 2131230832; + + // aapt resource value: 0x7F080071 + public const int icon = 2131230833; + + // aapt resource value: 0x7F080072 + public const int icon_group = 2131230834; + + // aapt resource value: 0x7F080073 + public const int ifRoom = 2131230835; + + // aapt resource value: 0x7F080074 + public const int image = 2131230836; // aapt resource value: 0x7F080004 public const int In = 2131230724; - // aapt resource value: 0x7F080070 - public const int info = 2131230832; - - // aapt resource value: 0x7F080071 - public const int italic = 2131230833; - - // aapt resource value: 0x7F080072 - public const int item_touch_helper_previous_elevation = 2131230834; - - // aapt resource value: 0x7F080073 - public const int labeled = 2131230835; - - // aapt resource value: 0x7F080074 - public const int largeLabel = 2131230836; - // aapt resource value: 0x7F080075 - public const int left = 2131230837; + public const int info = 2131230837; // aapt resource value: 0x7F080076 - public const int line1 = 2131230838; + public const int italic = 2131230838; // aapt resource value: 0x7F080077 - public const int line3 = 2131230839; + public const int item_touch_helper_previous_elevation = 2131230839; // aapt resource value: 0x7F080078 - public const int listMode = 2131230840; + public const int labeled = 2131230840; // aapt resource value: 0x7F080079 - public const int list_item = 2131230841; + public const int largeLabel = 2131230841; // aapt resource value: 0x7F080005 - public const int LoadFromCamera = 2131230725; + public const int LayoutEmail = 2131230725; // aapt resource value: 0x7F080006 - public const int LoadFromFolder = 2131230726; + public const int LayoutLogin = 2131230726; // aapt resource value: 0x7F080007 - public const int Login = 2131230727; + public const int LayoutName = 2131230727; // aapt resource value: 0x7F080008 - public const int LoginPasswordSee = 2131230728; - - // aapt resource value: 0x7F08007A - public const int main_appbar = 2131230842; - - // aapt resource value: 0x7F08007B - public const int main_tablayout = 2131230843; - - // aapt resource value: 0x7F08007C - public const int main_toolbar = 2131230844; - - // aapt resource value: 0x7F08007D - public const int main_viewpager = 2131230845; - - // aapt resource value: 0x7F08007E - public const int masked = 2131230846; - - // aapt resource value: 0x7F08007F - public const int media_actions = 2131230847; - - // aapt resource value: 0x7F080080 - public const int message = 2131230848; + public const int LayoutNewLogin = 2131230728; // aapt resource value: 0x7F080009 - public const int META = 2131230729; - - // aapt resource value: 0x7F080081 - public const int middle = 2131230849; - - // aapt resource value: 0x7F080082 - public const int mini = 2131230850; - - // aapt resource value: 0x7F080083 - public const int mr_art = 2131230851; - - // aapt resource value: 0x7F080084 - public const int mr_cast_checkbox = 2131230852; - - // aapt resource value: 0x7F080085 - public const int mr_cast_close_button = 2131230853; - - // aapt resource value: 0x7F080086 - public const int mr_cast_group_icon = 2131230854; - - // aapt resource value: 0x7F080087 - public const int mr_cast_group_name = 2131230855; - - // aapt resource value: 0x7F080088 - public const int mr_cast_list = 2131230856; - - // aapt resource value: 0x7F080089 - public const int mr_cast_meta = 2131230857; - - // aapt resource value: 0x7F08008A - public const int mr_cast_meta_art = 2131230858; - - // aapt resource value: 0x7F08008B - public const int mr_cast_meta_subtitle = 2131230859; - - // aapt resource value: 0x7F08008C - public const int mr_cast_meta_title = 2131230860; - - // aapt resource value: 0x7F08008D - public const int mr_cast_route_icon = 2131230861; - - // aapt resource value: 0x7F08008E - public const int mr_cast_route_name = 2131230862; - - // aapt resource value: 0x7F08008F - public const int mr_cast_stop_button = 2131230863; - - // aapt resource value: 0x7F080090 - public const int mr_cast_volume_layout = 2131230864; - - // aapt resource value: 0x7F080091 - public const int mr_cast_volume_slider = 2131230865; - - // aapt resource value: 0x7F080092 - public const int mr_chooser_list = 2131230866; - - // aapt resource value: 0x7F080093 - public const int mr_chooser_route_desc = 2131230867; - - // aapt resource value: 0x7F080094 - public const int mr_chooser_route_icon = 2131230868; - - // aapt resource value: 0x7F080095 - public const int mr_chooser_route_name = 2131230869; - - // aapt resource value: 0x7F080096 - public const int mr_chooser_title = 2131230870; - - // aapt resource value: 0x7F080097 - public const int mr_close = 2131230871; - - // aapt resource value: 0x7F080098 - public const int mr_control_divider = 2131230872; - - // aapt resource value: 0x7F080099 - public const int mr_control_playback_ctrl = 2131230873; - - // aapt resource value: 0x7F08009A - public const int mr_control_subtitle = 2131230874; - - // aapt resource value: 0x7F08009B - public const int mr_control_title = 2131230875; - - // aapt resource value: 0x7F08009C - public const int mr_control_title_container = 2131230876; - - // aapt resource value: 0x7F08009D - public const int mr_custom_control = 2131230877; - - // aapt resource value: 0x7F08009E - public const int mr_default_control = 2131230878; - - // aapt resource value: 0x7F08009F - public const int mr_dialog_area = 2131230879; - - // aapt resource value: 0x7F0800A0 - public const int mr_dialog_header_name = 2131230880; - - // aapt resource value: 0x7F0800A1 - public const int mr_expandable_area = 2131230881; - - // aapt resource value: 0x7F0800A2 - public const int mr_group_expand_collapse = 2131230882; - - // aapt resource value: 0x7F0800A3 - public const int mr_group_volume_route_name = 2131230883; - - // aapt resource value: 0x7F0800A4 - public const int mr_group_volume_slider = 2131230884; - - // aapt resource value: 0x7F0800A5 - public const int mr_media_main_control = 2131230885; - - // aapt resource value: 0x7F0800A6 - public const int mr_name = 2131230886; - - // aapt resource value: 0x7F0800A7 - public const int mr_picker_close_button = 2131230887; - - // aapt resource value: 0x7F0800A8 - public const int mr_picker_list = 2131230888; - - // aapt resource value: 0x7F0800A9 - public const int mr_picker_route_icon = 2131230889; - - // aapt resource value: 0x7F0800AA - public const int mr_picker_route_name = 2131230890; - - // aapt resource value: 0x7F0800AB - public const int mr_playback_control = 2131230891; - - // aapt resource value: 0x7F0800AC - public const int mr_title_bar = 2131230892; - - // aapt resource value: 0x7F0800AD - public const int mr_volume_control = 2131230893; - - // aapt resource value: 0x7F0800AE - public const int mr_volume_group_list = 2131230894; - - // aapt resource value: 0x7F0800AF - public const int mr_volume_item_icon = 2131230895; - - // aapt resource value: 0x7F0800B0 - public const int mr_volume_slider = 2131230896; - - // aapt resource value: 0x7F0800B1 - public const int mtrl_child_content_container = 2131230897; - - // aapt resource value: 0x7F0800B2 - public const int mtrl_internal_children_alpha_tag = 2131230898; - - // aapt resource value: 0x7F0800B3 - public const int multiply = 2131230899; + public const int LayoutNewPassword1 = 2131230729; // aapt resource value: 0x7F08000A - public const int Name = 2131230730; - - // aapt resource value: 0x7F0800B4 - public const int navigation_header_container = 2131230900; - - // aapt resource value: 0x7F0800B5 - public const int never = 2131230901; + public const int LayoutNewPassword2 = 2131230730; // aapt resource value: 0x7F08000B - public const int NewLogin = 2131230731; + public const int LayoutPassword = 2131230731; // aapt resource value: 0x7F08000C - public const int NewPassword = 2131230732; + public const int LayoutSurname = 2131230732; - // aapt resource value: 0x7F0800B6 - public const int none = 2131230902; + // aapt resource value: 0x7F08007A + public const int left = 2131230842; - // aapt resource value: 0x7F0800B7 - public const int normal = 2131230903; + // aapt resource value: 0x7F08007B + public const int line1 = 2131230843; - // aapt resource value: 0x7F0800B8 - public const int notification_background = 2131230904; + // aapt resource value: 0x7F08007C + public const int line3 = 2131230844; - // aapt resource value: 0x7F0800B9 - public const int notification_main_column = 2131230905; + // aapt resource value: 0x7F08007D + public const int listMode = 2131230845; - // aapt resource value: 0x7F0800BA - public const int notification_main_column_container = 2131230906; - - // aapt resource value: 0x7F0800BB - public const int outline = 2131230907; - - // aapt resource value: 0x7F0800BC - public const int parallax = 2131230908; - - // aapt resource value: 0x7F0800BD - public const int parentPanel = 2131230909; - - // aapt resource value: 0x7F0800BE - public const int parent_matrix = 2131230910; + // aapt resource value: 0x7F08007E + public const int list_item = 2131230846; // aapt resource value: 0x7F08000D - public const int Password = 2131230733; + public const int LoadFromCamera = 2131230733; // aapt resource value: 0x7F08000E - public const int PasswordSee1 = 2131230734; + public const int LoadFromFolder = 2131230734; // aapt resource value: 0x7F08000F - public const int PasswordSee2 = 2131230735; + public const int Login = 2131230735; - // aapt resource value: 0x7F0800BF - public const int pin = 2131230911; + // aapt resource value: 0x7F08007F + public const int main_appbar = 2131230847; + + // aapt resource value: 0x7F080080 + public const int main_tablayout = 2131230848; + + // aapt resource value: 0x7F080081 + public const int main_toolbar = 2131230849; + + // aapt resource value: 0x7F080082 + public const int main_viewpager = 2131230850; + + // aapt resource value: 0x7F080083 + public const int masked = 2131230851; + + // aapt resource value: 0x7F080084 + public const int media_actions = 2131230852; + + // aapt resource value: 0x7F080085 + public const int message = 2131230853; // aapt resource value: 0x7F080010 - public const int Preview = 2131230736; + public const int META = 2131230736; - // aapt resource value: 0x7F0800C0 - public const int progress_circular = 2131230912; + // aapt resource value: 0x7F080086 + public const int middle = 2131230854; - // aapt resource value: 0x7F0800C1 - public const int progress_horizontal = 2131230913; + // aapt resource value: 0x7F080087 + public const int mini = 2131230855; - // aapt resource value: 0x7F0800C2 - public const int radio = 2131230914; + // aapt resource value: 0x7F080088 + public const int mr_art = 2131230856; + + // aapt resource value: 0x7F080089 + public const int mr_cast_checkbox = 2131230857; + + // aapt resource value: 0x7F08008A + public const int mr_cast_close_button = 2131230858; + + // aapt resource value: 0x7F08008B + public const int mr_cast_group_icon = 2131230859; + + // aapt resource value: 0x7F08008C + public const int mr_cast_group_name = 2131230860; + + // aapt resource value: 0x7F08008D + public const int mr_cast_list = 2131230861; + + // aapt resource value: 0x7F08008E + public const int mr_cast_meta = 2131230862; + + // aapt resource value: 0x7F08008F + public const int mr_cast_meta_art = 2131230863; + + // aapt resource value: 0x7F080090 + public const int mr_cast_meta_subtitle = 2131230864; + + // aapt resource value: 0x7F080091 + public const int mr_cast_meta_title = 2131230865; + + // aapt resource value: 0x7F080092 + public const int mr_cast_route_icon = 2131230866; + + // aapt resource value: 0x7F080093 + public const int mr_cast_route_name = 2131230867; + + // aapt resource value: 0x7F080094 + public const int mr_cast_stop_button = 2131230868; + + // aapt resource value: 0x7F080095 + public const int mr_cast_volume_layout = 2131230869; + + // aapt resource value: 0x7F080096 + public const int mr_cast_volume_slider = 2131230870; + + // aapt resource value: 0x7F080097 + public const int mr_chooser_list = 2131230871; + + // aapt resource value: 0x7F080098 + public const int mr_chooser_route_desc = 2131230872; + + // aapt resource value: 0x7F080099 + public const int mr_chooser_route_icon = 2131230873; + + // aapt resource value: 0x7F08009A + public const int mr_chooser_route_name = 2131230874; + + // aapt resource value: 0x7F08009B + public const int mr_chooser_title = 2131230875; + + // aapt resource value: 0x7F08009C + public const int mr_close = 2131230876; + + // aapt resource value: 0x7F08009D + public const int mr_control_divider = 2131230877; + + // aapt resource value: 0x7F08009E + public const int mr_control_playback_ctrl = 2131230878; + + // aapt resource value: 0x7F08009F + public const int mr_control_subtitle = 2131230879; + + // aapt resource value: 0x7F0800A0 + public const int mr_control_title = 2131230880; + + // aapt resource value: 0x7F0800A1 + public const int mr_control_title_container = 2131230881; + + // aapt resource value: 0x7F0800A2 + public const int mr_custom_control = 2131230882; + + // aapt resource value: 0x7F0800A3 + public const int mr_default_control = 2131230883; + + // aapt resource value: 0x7F0800A4 + public const int mr_dialog_area = 2131230884; + + // aapt resource value: 0x7F0800A5 + public const int mr_dialog_header_name = 2131230885; + + // aapt resource value: 0x7F0800A6 + public const int mr_expandable_area = 2131230886; + + // aapt resource value: 0x7F0800A7 + public const int mr_group_expand_collapse = 2131230887; + + // aapt resource value: 0x7F0800A8 + public const int mr_group_volume_route_name = 2131230888; + + // aapt resource value: 0x7F0800A9 + public const int mr_group_volume_slider = 2131230889; + + // aapt resource value: 0x7F0800AA + public const int mr_media_main_control = 2131230890; + + // aapt resource value: 0x7F0800AB + public const int mr_name = 2131230891; + + // aapt resource value: 0x7F0800AC + public const int mr_picker_close_button = 2131230892; + + // aapt resource value: 0x7F0800AD + public const int mr_picker_list = 2131230893; + + // aapt resource value: 0x7F0800AE + public const int mr_picker_route_icon = 2131230894; + + // aapt resource value: 0x7F0800AF + public const int mr_picker_route_name = 2131230895; + + // aapt resource value: 0x7F0800B0 + public const int mr_playback_control = 2131230896; + + // aapt resource value: 0x7F0800B1 + public const int mr_title_bar = 2131230897; + + // aapt resource value: 0x7F0800B2 + public const int mr_volume_control = 2131230898; + + // aapt resource value: 0x7F0800B3 + public const int mr_volume_group_list = 2131230899; + + // aapt resource value: 0x7F0800B4 + public const int mr_volume_item_icon = 2131230900; + + // aapt resource value: 0x7F0800B5 + public const int mr_volume_slider = 2131230901; + + // aapt resource value: 0x7F0800B6 + public const int mtrl_child_content_container = 2131230902; + + // aapt resource value: 0x7F0800B7 + public const int mtrl_internal_children_alpha_tag = 2131230903; + + // aapt resource value: 0x7F0800B8 + public const int multiply = 2131230904; // aapt resource value: 0x7F080011 - public const int RepeatPassword = 2131230737; + public const int Name = 2131230737; + + // aapt resource value: 0x7F0800B9 + public const int navigation_header_container = 2131230905; + + // aapt resource value: 0x7F0800BA + public const int never = 2131230906; // aapt resource value: 0x7F080012 - public const int Reset = 2131230738; - - // aapt resource value: 0x7F0800C3 - public const int right = 2131230915; - - // aapt resource value: 0x7F0800C4 - public const int right_icon = 2131230916; - - // aapt resource value: 0x7F0800C5 - public const int right_side = 2131230917; - - // aapt resource value: 0x7F0800C6 - public const int save_image_matrix = 2131230918; - - // aapt resource value: 0x7F0800C7 - public const int save_non_transition_alpha = 2131230919; - - // aapt resource value: 0x7F0800C8 - public const int save_scale_type = 2131230920; - - // aapt resource value: 0x7F0800C9 - public const int screen = 2131230921; - - // aapt resource value: 0x7F0800CA - public const int scroll = 2131230922; - - // aapt resource value: 0x7F0800CE - public const int scrollable = 2131230926; - - // aapt resource value: 0x7F0800CB - public const int scrollIndicatorDown = 2131230923; - - // aapt resource value: 0x7F0800CC - public const int scrollIndicatorUp = 2131230924; - - // aapt resource value: 0x7F0800CD - public const int scrollView = 2131230925; - - // aapt resource value: 0x7F0800CF - public const int search_badge = 2131230927; - - // aapt resource value: 0x7F0800D0 - public const int search_bar = 2131230928; - - // aapt resource value: 0x7F0800D1 - public const int search_button = 2131230929; - - // aapt resource value: 0x7F0800D2 - public const int search_close_btn = 2131230930; - - // aapt resource value: 0x7F0800D3 - public const int search_edit_frame = 2131230931; - - // aapt resource value: 0x7F0800D4 - public const int search_go_btn = 2131230932; - - // aapt resource value: 0x7F0800D5 - public const int search_mag_icon = 2131230933; - - // aapt resource value: 0x7F0800D6 - public const int search_plate = 2131230934; - - // aapt resource value: 0x7F0800D7 - public const int search_src_text = 2131230935; - - // aapt resource value: 0x7F0800D8 - public const int search_voice_btn = 2131230936; - - // aapt resource value: 0x7F0800DA - public const int selected = 2131230938; - - // aapt resource value: 0x7F0800D9 - public const int select_dialog_listview = 2131230937; - - // aapt resource value: 0x7F080015 - public const int SendPhoto = 2131230741; - - // aapt resource value: 0x7F0800DB - public const int shellcontent_appbar = 2131230939; - - // aapt resource value: 0x7F0800DC - public const int shellcontent_toolbar = 2131230940; + public const int NewLogin = 2131230738; // aapt resource value: 0x7F080013 - public const int SHIFT = 2131230739; + public const int NewPassword = 2131230739; - // aapt resource value: 0x7F0800DD - public const int shortcut = 2131230941; + // aapt resource value: 0x7F0800BB + public const int none = 2131230907; - // aapt resource value: 0x7F0800DE - public const int showCustom = 2131230942; + // aapt resource value: 0x7F0800BC + public const int normal = 2131230908; - // aapt resource value: 0x7F0800DF - public const int showHome = 2131230943; + // aapt resource value: 0x7F0800BD + public const int notification_background = 2131230909; - // aapt resource value: 0x7F0800E0 - public const int showTitle = 2131230944; + // aapt resource value: 0x7F0800BE + public const int notification_main_column = 2131230910; - // aapt resource value: 0x7F080016 - public const int SignInMainScreen = 2131230742; + // aapt resource value: 0x7F0800BF + public const int notification_main_column_container = 2131230911; - // aapt resource value: 0x7F080017 - public const int SignUp = 2131230743; + // aapt resource value: 0x7F0800C0 + public const int outline = 2131230912; - // aapt resource value: 0x7F080018 - public const int SignUpMainScreen = 2131230744; + // aapt resource value: 0x7F0800C1 + public const int parallax = 2131230913; - // aapt resource value: 0x7F0800E1 - public const int smallLabel = 2131230945; + // aapt resource value: 0x7F0800C2 + public const int parentPanel = 2131230914; - // aapt resource value: 0x7F0800E2 - public const int snackbar_action = 2131230946; - - // aapt resource value: 0x7F0800E3 - public const int snackbar_text = 2131230947; - - // aapt resource value: 0x7F0800E4 - public const int snap = 2131230948; - - // aapt resource value: 0x7F0800E5 - public const int snapMargins = 2131230949; - - // aapt resource value: 0x7F0800E6 - public const int spacer = 2131230950; - - // aapt resource value: 0x7F0800E7 - public const int split_action_bar = 2131230951; - - // aapt resource value: 0x7F0800E8 - public const int src_atop = 2131230952; - - // aapt resource value: 0x7F0800E9 - public const int src_in = 2131230953; - - // aapt resource value: 0x7F0800EA - public const int src_over = 2131230954; - - // aapt resource value: 0x7F0800EB - public const int start = 2131230955; - - // aapt resource value: 0x7F0800EC - public const int status_bar_latest_event_content = 2131230956; - - // aapt resource value: 0x7F0800ED - public const int stretch = 2131230957; - - // aapt resource value: 0x7F0800EE - public const int submenuarrow = 2131230958; - - // aapt resource value: 0x7F0800EF - public const int submit_area = 2131230959; - - // aapt resource value: 0x7F080019 - public const int Surname = 2131230745; + // aapt resource value: 0x7F0800C3 + public const int parent_matrix = 2131230915; // aapt resource value: 0x7F080014 - public const int SYM = 2131230740; + public const int Password = 2131230740; + + // aapt resource value: 0x7F0800C4 + public const int pin = 2131230916; + + // aapt resource value: 0x7F080015 + public const int Preview = 2131230741; + + // aapt resource value: 0x7F0800C5 + public const int progress_circular = 2131230917; + + // aapt resource value: 0x7F0800C6 + public const int progress_horizontal = 2131230918; + + // aapt resource value: 0x7F0800C7 + public const int radio = 2131230919; + + // aapt resource value: 0x7F080016 + public const int RepeatPassword = 2131230742; + + // aapt resource value: 0x7F080017 + public const int Reset = 2131230743; + + // aapt resource value: 0x7F0800C8 + public const int right = 2131230920; + + // aapt resource value: 0x7F0800C9 + public const int right_icon = 2131230921; + + // aapt resource value: 0x7F0800CA + public const int right_side = 2131230922; + + // aapt resource value: 0x7F0800CB + public const int save_image_matrix = 2131230923; + + // aapt resource value: 0x7F0800CC + public const int save_non_transition_alpha = 2131230924; + + // aapt resource value: 0x7F0800CD + public const int save_scale_type = 2131230925; + + // aapt resource value: 0x7F0800CE + public const int screen = 2131230926; + + // aapt resource value: 0x7F0800CF + public const int scroll = 2131230927; + + // aapt resource value: 0x7F0800D3 + public const int scrollable = 2131230931; + + // aapt resource value: 0x7F0800D0 + public const int scrollIndicatorDown = 2131230928; + + // aapt resource value: 0x7F0800D1 + public const int scrollIndicatorUp = 2131230929; + + // aapt resource value: 0x7F0800D2 + public const int scrollView = 2131230930; + + // aapt resource value: 0x7F0800D4 + public const int search_badge = 2131230932; + + // aapt resource value: 0x7F0800D5 + public const int search_bar = 2131230933; + + // aapt resource value: 0x7F0800D6 + public const int search_button = 2131230934; + + // aapt resource value: 0x7F0800D7 + public const int search_close_btn = 2131230935; + + // aapt resource value: 0x7F0800D8 + public const int search_edit_frame = 2131230936; + + // aapt resource value: 0x7F0800D9 + public const int search_go_btn = 2131230937; + + // aapt resource value: 0x7F0800DA + public const int search_mag_icon = 2131230938; + + // aapt resource value: 0x7F0800DB + public const int search_plate = 2131230939; + + // aapt resource value: 0x7F0800DC + public const int search_src_text = 2131230940; + + // aapt resource value: 0x7F0800DD + public const int search_voice_btn = 2131230941; + + // aapt resource value: 0x7F0800DF + public const int selected = 2131230943; + + // aapt resource value: 0x7F0800DE + public const int select_dialog_listview = 2131230942; + + // aapt resource value: 0x7F08001A + public const int SendPhoto = 2131230746; + + // aapt resource value: 0x7F0800E0 + public const int shellcontent_appbar = 2131230944; + + // aapt resource value: 0x7F0800E1 + public const int shellcontent_toolbar = 2131230945; + + // aapt resource value: 0x7F080018 + public const int SHIFT = 2131230744; + + // aapt resource value: 0x7F0800E2 + public const int shortcut = 2131230946; + + // aapt resource value: 0x7F0800E3 + public const int showCustom = 2131230947; + + // aapt resource value: 0x7F0800E4 + public const int showHome = 2131230948; + + // aapt resource value: 0x7F0800E5 + public const int showTitle = 2131230949; + + // aapt resource value: 0x7F08001B + public const int SignInMainScreen = 2131230747; + + // aapt resource value: 0x7F08001C + public const int SignUp = 2131230748; + + // aapt resource value: 0x7F08001D + public const int SignUpMainScreen = 2131230749; + + // aapt resource value: 0x7F0800E6 + public const int smallLabel = 2131230950; + + // aapt resource value: 0x7F0800E7 + public const int snackbar_action = 2131230951; + + // aapt resource value: 0x7F0800E8 + public const int snackbar_text = 2131230952; + + // aapt resource value: 0x7F0800E9 + public const int snap = 2131230953; + + // aapt resource value: 0x7F0800EA + public const int snapMargins = 2131230954; + + // aapt resource value: 0x7F0800EB + public const int spacer = 2131230955; + + // aapt resource value: 0x7F0800EC + public const int split_action_bar = 2131230956; + + // aapt resource value: 0x7F0800ED + public const int src_atop = 2131230957; + + // aapt resource value: 0x7F0800EE + public const int src_in = 2131230958; + + // aapt resource value: 0x7F0800EF + public const int src_over = 2131230959; // aapt resource value: 0x7F0800F0 - public const int tabMode = 2131230960; + public const int start = 2131230960; // aapt resource value: 0x7F0800F1 - public const int tag_transition_group = 2131230961; + public const int status_bar_latest_event_content = 2131230961; // aapt resource value: 0x7F0800F2 - public const int tag_unhandled_key_event_manager = 2131230962; + public const int stretch = 2131230962; // aapt resource value: 0x7F0800F3 - public const int tag_unhandled_key_listeners = 2131230963; + public const int submenuarrow = 2131230963; // aapt resource value: 0x7F0800F4 - public const int text = 2131230964; + public const int submit_area = 2131230964; + + // aapt resource value: 0x7F08001E + public const int Surname = 2131230750; + + // aapt resource value: 0x7F080019 + public const int SYM = 2131230745; // aapt resource value: 0x7F0800F5 - public const int text1 = 2131230965; + public const int tabMode = 2131230965; // aapt resource value: 0x7F0800F6 - public const int text2 = 2131230966; + public const int tag_transition_group = 2131230966; // aapt resource value: 0x7F0800F7 - public const int text3 = 2131230967; + public const int tag_unhandled_key_event_manager = 2131230967; // aapt resource value: 0x7F0800F8 - public const int text4 = 2131230968; + public const int tag_unhandled_key_listeners = 2131230968; // aapt resource value: 0x7F0800F9 - public const int text5 = 2131230969; - - // aapt resource value: 0x7F0800FE - public const int textinput_counter = 2131230974; - - // aapt resource value: 0x7F0800FF - public const int textinput_error = 2131230975; - - // aapt resource value: 0x7F080100 - public const int textinput_helper_text = 2131230976; + public const int text = 2131230969; // aapt resource value: 0x7F0800FA - public const int textSpacerNoButtons = 2131230970; + public const int text1 = 2131230970; // aapt resource value: 0x7F0800FB - public const int textSpacerNoTitle = 2131230971; + public const int text2 = 2131230971; // aapt resource value: 0x7F0800FC - public const int textStart = 2131230972; + public const int text3 = 2131230972; // aapt resource value: 0x7F0800FD - public const int text_input_password_toggle = 2131230973; + public const int text4 = 2131230973; - // aapt resource value: 0x7F080101 - public const int time = 2131230977; - - // aapt resource value: 0x7F080102 - public const int title = 2131230978; + // aapt resource value: 0x7F0800FE + public const int text5 = 2131230974; // aapt resource value: 0x7F080103 - public const int titleDividerNoCustom = 2131230979; + public const int textinput_counter = 2131230979; // aapt resource value: 0x7F080104 - public const int title_template = 2131230980; + public const int textinput_error = 2131230980; // aapt resource value: 0x7F080105 - public const int top = 2131230981; + public const int textinput_helper_text = 2131230981; + + // aapt resource value: 0x7F0800FF + public const int textSpacerNoButtons = 2131230975; + + // aapt resource value: 0x7F080100 + public const int textSpacerNoTitle = 2131230976; + + // aapt resource value: 0x7F080101 + public const int textStart = 2131230977; + + // aapt resource value: 0x7F080102 + public const int text_input_password_toggle = 2131230978; // aapt resource value: 0x7F080106 - public const int topPanel = 2131230982; + public const int time = 2131230982; // aapt resource value: 0x7F080107 - public const int touch_outside = 2131230983; + public const int title = 2131230983; // aapt resource value: 0x7F080108 - public const int transition_current_scene = 2131230984; + public const int titleDividerNoCustom = 2131230984; // aapt resource value: 0x7F080109 - public const int transition_layout_save = 2131230985; + public const int title_template = 2131230985; // aapt resource value: 0x7F08010A - public const int transition_position = 2131230986; + public const int top = 2131230986; // aapt resource value: 0x7F08010B - public const int transition_scene_layoutid_cache = 2131230987; + public const int topPanel = 2131230987; // aapt resource value: 0x7F08010C - public const int transition_transform = 2131230988; + public const int touch_outside = 2131230988; // aapt resource value: 0x7F08010D - public const int uniform = 2131230989; + public const int transition_current_scene = 2131230989; // aapt resource value: 0x7F08010E - public const int unlabeled = 2131230990; + public const int transition_layout_save = 2131230990; // aapt resource value: 0x7F08010F - public const int up = 2131230991; + public const int transition_position = 2131230991; // aapt resource value: 0x7F080110 - public const int useLogo = 2131230992; + public const int transition_scene_layoutid_cache = 2131230992; // aapt resource value: 0x7F080111 - public const int view_offset_helper = 2131230993; + public const int transition_transform = 2131230993; // aapt resource value: 0x7F080112 - public const int visible = 2131230994; + public const int uniform = 2131230994; // aapt resource value: 0x7F080113 - public const int volume_item_container = 2131230995; + public const int unlabeled = 2131230995; // aapt resource value: 0x7F080114 - public const int withText = 2131230996; + public const int up = 2131230996; // aapt resource value: 0x7F080115 - public const int wrap_content = 2131230997; + public const int useLogo = 2131230997; + + // aapt resource value: 0x7F080116 + public const int view_offset_helper = 2131230998; + + // aapt resource value: 0x7F080117 + public const int visible = 2131230999; + + // aapt resource value: 0x7F080118 + public const int volume_item_container = 2131231000; + + // aapt resource value: 0x7F080119 + public const int withText = 2131231001; + + // aapt resource value: 0x7F08011A + public const int wrap_content = 2131231002; static Id() { diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml index 89a45d4..ca78f57 100644 --- a/Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml +++ b/Klient/Klient/Klient.Android/Resources/layout/ekranLogowania.xml @@ -8,8 +8,14 @@ android:layout_height="match_parent" android:background="#ffbdd7f0" > - - + + - + android:gravity="left"> + + + + + + + + + +