.

mediaexplorer74 · Feb 14, 2022 · 510b3ee · 510b3ee
1 parent c66583e
commit 510b3ee
Show file tree

Hide file tree

Showing 15 changed files with 987 additions and 431 deletions.
diff --git a/Andro2UWP.sln b/Andro2UWP.sln
@@ -13,6 +13,7 @@ Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Andro2UWP\Andro2UWP.Shared\Andro2UWP.Shared.projitems*{275b3515-3bbf-4541-a575-8674d2ece676}*SharedItemsImports = 4
 		Andro2UWP\Andro2UWP.Shared\Andro2UWP.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
+		Andro2UWP\Andro2UWP.Shared\Andro2UWP.Shared.projitems*{e92e8f8f-6bbb-4e5b-8d76-0cda640e84f3}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM

diff --git a/Andro2UWP/Andro2UWP.Droid/Andro2UWP.Droid.csproj b/Andro2UWP/Andro2UWP.Droid/Andro2UWP.Droid.csproj
@@ -73,7 +73,7 @@
       <Version>2.28.3</Version>
     </PackageReference-->
     <PackageReference Include="Microsoft.OneDriveSDK">
-      <Version>2.0.7</Version>
+      <Version>2.0.6</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.OneDriveSDK.Authentication">
       <Version>1.0.10</Version>
@@ -82,7 +82,7 @@
       <Version>9.0.1</Version>
     </PackageReference>
     <PackageReference Include="SharpSerializer">
-      <Version>3.0.1</Version>
+      <Version>3.0.2</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI" Version="3.1.12" />
     <PackageReference Include="Uno.UI.RemoteControl" Version="3.1.12" Condition="'$(Configuration)'=='Debug'" />

diff --git a/Andro2UWP/Andro2UWP.Shared/App.xaml.cs b/Andro2UWP/Andro2UWP.Shared/App.xaml.cs
diff --git a/Andro2UWP/Andro2UWP.Shared/MainPage.xaml b/Andro2UWP/Andro2UWP.Shared/MainPage.xaml
@@ -30,12 +30,19 @@
 
         <!--  Android controls -->
         <!--  win:Visibility="Collapsed" -->
-        <ToggleSwitch x:Uid="uiStartStop" OnContent="Started" OffContent="Stopped" Toggled="uiStartStop_Toggled" Name="uiStartStop" 
+        <ToggleSwitch x:Uid="uiStartStop" OnContent="Started"
+                      OffContent="Stopped" 
+                      Toggled="uiStartStop_Toggled"
+                      Name="uiStartStop" 
                       Grid.Row="2" Margin="5" 
                       win:Visibility="Collapsed"/>
 
-        <!-- UWP controls -->
-        <!--Button Content="Clear list" Click="uiClearList_Click" Visibility="Collapsed" Grid.Row="2" Name="uiClearList"/-->
+        <!-- TEMP controls -->
+        <Button x:Uid="uiTestToast"
+                Content="Send test toast" Click="uiTestToast_Click"  
+                HorizontalAlignment="Right"
+                Grid.Row="2" Margin="5" 
+                Name="uiTestToast"/>
 
         <!-- common controls -->
         <!--Button Content="Refresh" x:Uid="uiRefreshList" HorizontalAlignment="Right" Grid.Row="2" Click="uiRefreshList_Click" Name="uiRefreshList" not_win:Visibility="Collapsed" /-->
@@ -54,7 +61,8 @@
 
             <ListView.ItemTemplate>
                 <DataTemplate>
-                    <Grid Margin="0,5,0,0" BorderThickness="1" BorderBrush="Blue" DoubleTapped="uiItem_DoubleTapped">
+                    <Grid Margin="0,5,0,0" BorderThickness="1" 
+                          BorderBrush="Blue" DoubleTapped="uiItem_DoubleTapped">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
                             <ColumnDefinition />
@@ -65,8 +73,10 @@
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
 
-                        <TextBlock Grid.Column="0" Text="{Binding displaySource, Mode=OneWay }" FontWeight="Bold" />
-                        <TextBlock Grid.Column="1" Text="{Binding displayDate, Mode=OneWay }" HorizontalAlignment="Right" />
+                        <TextBlock Grid.Column="0" Text="{Binding displaySource, Mode=OneWay }" 
+                                   FontWeight="Bold" />
+                        <TextBlock Grid.Column="1" Text="{Binding displayDate, Mode=OneWay }" 
+                                   HorizontalAlignment="Right" />
                         <!--<TextBlock Grid.Column="2" Text="{Binding displayDevice, Mode=OneWay }" /> -->
 
                         <TextBlock Grid.ColumnSpan="3" Grid.Row="1" Text="{Binding sMessage, Mode=OneWay }" />
@@ -94,17 +104,17 @@
         <!--<ProgressBar x:Name="uiProgBar" Grid.Row="3" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" Visibility="Collapsed" /> -->
         <not_win:Grid Grid.Row="4" Name="uiAndroBottom" Margin="0,10,0,0">
             <StackPanel Orientation="Horizontal" >
-                <AppBarButton Icon="Refresh" x:Uid="uiRefresh" Label="Refresh list" Click="uiRefreshList_Click"/>
+                <AppBarButton Icon="Refresh" x:Uid="uiRefresh" Name="uiRefresh" Label="Refresh list" Click="uiRefreshList_Click"/>
 
                 <AppBarSeparator/>
 
-                <AppBarButton Icon="Delete" x:Uid="uiClearList" Label="Clear list" Click="uiClearList_Click"/>
+                <!--AppBarButton Icon="Delete" x:Uid="uiClearList" Label="Clear list" Click="uiClearList_Click"/>
                 
-                <AppBarSeparator/>
-                
-                <AppBarButton Icon="Setting" x:Uid="uiSettings" Label="Settings" Click="uiSettings_Click"/>
-                
-                <AppBarButton Icon="List" x:Uid="uiShowLog" Label="Show log" Click="uiShowLog_Click"/>
+                <AppBarSeparator/-->
+
+                <AppBarButton Icon="Setting" x:Uid="uiSettings" Name="uiSettings" Label="Settings" Click="uiSettings_Click"/>
+
+                <AppBarButton Icon="List" x:Uid="uiShowLog" Name="uiShowLog" Label="Show log" Click="uiShowLog_Click"/>
             </StackPanel>
 
         </not_win:Grid>
@@ -116,10 +126,10 @@
             <AppBarToggleButton Icon="Clock" x:Uid="uiAutoRefresh" Name="uiAutoRefresh" Label="Auto refresh" Click="uiAutoRefresh_Click" />
 
             <AppBarSeparator/>
-            
-            <AppBarButton Icon="Setting" x:Uid="uiSettings" Label="Settings" Click="uiSettings_Click"/>
-            
-            <AppBarButton Icon="List" x:Uid="uiShowLog" Label="Show log" Click="uiShowLog_Click"/>
+
+            <AppBarButton Icon="Setting" x:Uid="uiSettings" Name="uiSettings" Label="Settings" Click="uiSettings_Click"/>
+
+            <AppBarButton Icon="List" x:Uid="uiShowLog" Name="uiShowLog" Label="Show log" Click="uiShowLog_Click"/>
 
             <!--AppBarSeparator/>
             <AppBarButton Icon="XboxOneConsole" x:Uid="uiAuth" Label="Auth." Click="uiAuth_Click"/-->