From 2979855d56dc8528901cbe27e64aab075cf60398 Mon Sep 17 00:00:00 2001
From: Andrey Zakharov <mediaexplorer74@hotmail.com>
Date: Thu, 11 Aug 2022 08:56:22 +0300
Subject: [PATCH] .

---
 .../TeslaX.UWP/IClearCookiesImplementation.cs |  7 ++--
 TeslaX/TeslaX/App.xaml                        | 35 ++++++++++---------
 TeslaX/TeslaX/App.xaml.cs                     | 11 +++---
 TeslaX/TeslaX/IClearCookies.cs                |  2 +-
 TeslaX/TeslaX/TeslaX.csproj                   |  4 +++
 TeslaX/TeslaX/ViewModels/LoginViewModel.cs    |  2 +-
 TeslaX/TeslaX/Views/MainPage.xaml             |  9 +++--
 7 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/TeslaX/TeslaX.UWP/IClearCookiesImplementation.cs b/TeslaX/TeslaX.UWP/IClearCookiesImplementation.cs
index 3f6bf11..ab80e97 100644
--- a/TeslaX/TeslaX.UWP/IClearCookiesImplementation.cs
+++ b/TeslaX/TeslaX.UWP/IClearCookiesImplementation.cs
@@ -9,13 +9,16 @@ namespace TeslaX.UWP
 {
     public class IClearCookiesImplementation : IClearCookies
     {
+        /*
         public void Clear()
         {
-            CookieManager cookieManager = CookieManager.Instance;
-            
             //TODO
+
+            //CookieManager cookieManager = CookieManager.Instance;
+
             //cookieManager.RemoveAllCookie();
         }
+        */
     }
 
     public class CookieManager
diff --git a/TeslaX/TeslaX/App.xaml b/TeslaX/TeslaX/App.xaml
index 5935c4d..ebc4e46 100644
--- a/TeslaX/TeslaX/App.xaml
+++ b/TeslaX/TeslaX/App.xaml
@@ -1,5 +1,22 @@
-<!--?xml version="1.0" encoding="utf-8" ?>
-<Application xmlns="http://xamarin.com/schemas/2014/forms"
+<?xml version="1.0" encoding="utf-8"?>
+<Application 
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="TeslaX.App">
+    
+    <Application.Resources>
+        <ResourceDictionary>
+            <!--Global Styles-->
+            <Color x:Key="NavigationPrimary">#2196F3</Color>
+            <Style TargetType="NavigationPage">
+                <Setter Property="BarBackgroundColor" Value="{StaticResource NavigationPrimary}" />
+                <Setter Property="BarTextColor" Value="White" />
+            </Style>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
+
+<!--Application xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="TeslaX.App">
     <Application.Resources>
@@ -14,17 +31,3 @@
     </Application.Resources>
 </Application-->
 
-<?xml version="1.0" encoding="utf-8"?>
-<Application xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="TeslaRemote.App">
-    <Application.Resources>
-        <ResourceDictionary>
-            <!--Global Styles-->
-            <Color x:Key="NavigationPrimary">#2196F3</Color>
-            <Style TargetType="NavigationPage">
-                <Setter Property="BarBackgroundColor" Value="{StaticResource NavigationPrimary}" />
-                <Setter Property="BarTextColor" Value="White" />
-            </Style>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
-    
diff --git a/TeslaX/TeslaX/App.xaml.cs b/TeslaX/TeslaX/App.xaml.cs
index 90e8884..ae53e1f 100644
--- a/TeslaX/TeslaX/App.xaml.cs
+++ b/TeslaX/TeslaX/App.xaml.cs
@@ -44,10 +44,8 @@ protected override void OnResume()
 using System;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
-//using TeslaRemote.Services;
-using TeslaRemote.Views;
 
-namespace TeslaRemote
+namespace TeslaX
 {
     public partial class App : Application
     {
@@ -58,7 +56,7 @@ public App()
 
             //DependencyService.Register<MockDataStore>();
 
-            /*
+            
              if (false)//(!string.IsNullOrEmpty(Settings.SiteId))
             {
                 MainPage = new MainPage();
@@ -67,9 +65,8 @@ public App()
             {
                 MainPage = new LoginPage();
             }
-             */
-            MainPage = new MainPage();
-        }
+
+        }//App
 
         protected override void OnStart()
         {
diff --git a/TeslaX/TeslaX/IClearCookies.cs b/TeslaX/TeslaX/IClearCookies.cs
index 73271e6..d242e92 100644
--- a/TeslaX/TeslaX/IClearCookies.cs
+++ b/TeslaX/TeslaX/IClearCookies.cs
@@ -6,6 +6,6 @@ namespace TeslaX
 {
     public interface IClearCookies
     {
-        void Clear();
+        //void Clear();
     }
 }
diff --git a/TeslaX/TeslaX/TeslaX.csproj b/TeslaX/TeslaX/TeslaX.csproj
index e97bf48..ff553a0 100644
--- a/TeslaX/TeslaX/TeslaX.csproj
+++ b/TeslaX/TeslaX/TeslaX.csproj
@@ -11,6 +11,10 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="App.xaml.cs~RF64aa43.TMP" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Xam.Plugin.SimpleAudioPlayer" Version="1.4.0" />
diff --git a/TeslaX/TeslaX/ViewModels/LoginViewModel.cs b/TeslaX/TeslaX/ViewModels/LoginViewModel.cs
index cf31e54..4500cb4 100644
--- a/TeslaX/TeslaX/ViewModels/LoginViewModel.cs
+++ b/TeslaX/TeslaX/ViewModels/LoginViewModel.cs
@@ -19,7 +19,7 @@ class LoginViewModel
         public LoginViewModel()
         {
             // Clear all cookies
-            DependencyService.Get<IClearCookies>().Clear();
+            //DependencyService.Get<IClearCookies>().Clear();
         }
 
         public string LoginUrl
diff --git a/TeslaX/TeslaX/Views/MainPage.xaml b/TeslaX/TeslaX/Views/MainPage.xaml
index 1370f88..db00aca 100644
--- a/TeslaX/TeslaX/Views/MainPage.xaml
+++ b/TeslaX/TeslaX/Views/MainPage.xaml
@@ -41,9 +41,14 @@
             </Ellipse.GestureRecognizers>
         </Ellipse-->
         
-        <Label x:Name="unitsLabel" HorizontalTextAlignment="End" TextColor="White" Margin="0,5,50,0" FontSize="Medium" Text="kW"/>
+        <Label x:Name="unitsLabel" 
+               HorizontalTextAlignment="End" 
+               TextColor="White" 
+               Margin="0,5,50,0" 
+               FontSize="Medium" 
+               Text="kW"/>
 
-        <cards:CarouselView ItemAppeared="CarouselView_ItemAppeared">
+        <!--cards:CarouselView ItemAppeared="CarouselView_ItemAppeared"-->
             <ListView
             x:Name="carousel" 
             Grid.Row="1"