Fixed background color. Changed "Imagery" card icon to match others.

DataPAL.Pro/Config.daml

@@ -1,12 +1,12 @@
 <ArcGIS defaultAssembly="DataPAL.Pro.dll" defaultNamespace="DataPAL.Pro" xmlns="http://schemas.esri.com/DADF/Registry" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
   <AddInInfo id="{310f0e16-5872-4f29-8c69-65b1eac1d4fd}" version="1.0" desktopVersion="2.2.12813">
-    <Name>DataPAL.Pro</Name>
-    <Description>DataPAL.Pro description</Description>
-    <Image>Images\AddinDesktop32.png</Image>
-    <Author>robertsonc</Author>
-    <Company>Acme</Company>
+    <Name>DataPAL Pro</Name>
+    <Description>Allows users to easily browse layers by catagory or search bar and add them to the currently desired map</Description>
+    <Image>Images\layersIcon.png</Image>
+    <Author>Chris Robertson</Author>
+    <Company>EPC</Company>
     <Date>10/9/2018 12:16:05 PM, 2018</Date>
-    <Subject>Framework</Subject>
+    <Subject>Content</Subject>
     <!-- Note subject can be one or more of these topics:
                     Content, Framework, Editing, Geodatabase, Geometry, Geoprocessing, Layouts, Map Authoring, Map Exploration -->
   </AddInInfo>
@@ -21,7 +21,7 @@
       <groups>
         <!-- comment this out if you have no controls on the Addin tab to avoid
               an empty group-->
-        <group id="DataPAL_Pro_Group1" caption="Group 1" appearsOnAddInTab="true">
+        <group id="DataPAL_Pro_Group1" caption="EPC Tools" appearsOnAddInTab="true">
           <!-- host controls within groups -->
           <button refID="DataPAL_Pro_Button1" size="large" />
         </group>

DataPAL.Pro/DataPAL.Pro.csproj

@@ -182,22 +182,16 @@
     <Resource Include="Images\Fallout.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
-    <AddInContent Include="Images\Fallout.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </AddInContent>
-    <AddInContent Include="Images\Falloutsmall.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </AddInContent>
-    <Resource Include="Images\Imagery.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <AddInContent Include="Images\layersIcon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </AddInContent>
     <Resource Include="Images\UpArrow.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\photo_library_black_48dp.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!--
   PackageAction can be:

DataPAL.Pro/UserControl1.xaml

@@ -11,8 +11,12 @@
         <ResourceDictionary Source="MergedResources.xaml"></ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid Background="{DynamicResource PrimaryHueDarkForegroundBrush}">
-
+    <Grid>
+
+        <Grid.Background>
+            <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlLightColorKey}}"/>
+        </Grid.Background>
+
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="162.5"/>
             <ColumnDefinition Width="162.5"/>
@@ -32,7 +36,7 @@
         <ComboBox x:Name="SearchBar" Grid.Row="0" Grid.ColumnSpan="2" HorizontalAlignment="Center"
                   VerticalAlignment="Top" Width="250" MaxDropDownHeight="190" Margin="0,15,0,10" FontSize="10"
                   IsEditable="True" Text=" Search" KeyDown="SearchBar_KeyDown" Loaded="SearchBar_Loaded" />
-        
+
         <materialDesign:Card x:Name="PlacesCard" Grid.Row="1" Grid.Column="0" Width="150" Padding="4,5,0,0"
                              Height="130" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="8,4,0,4"
                              MouseDown="PlacesCard_MouseDown">
@@ -50,37 +54,37 @@
                     </TextBlock>
                     <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" FontSize="8"
                                VerticalAlignment="Center" Margin="0,0,0,5">
-                        <Run Text="Data about locations or boundaries e.g. Airports, Cities, Zoning Districts, etc." />
+                        <Run Text="Data about locations or boundaries e.g. airports, cities, zoning districts." />
                     </TextBlock>
                 </StackPanel>
             </Grid>
         </materialDesign:Card>
 
         <materialDesign:Card x:Name="ImageryCard" Grid.Row="1" Grid.Column="1" Width="150" Padding="4,5,0,0"
-                             Height="130" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,0,4"
+                             Height="130" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="8,4,0,4"
                              MouseDown="ImageryCard_MouseDown">
             <Grid Margin="8,0,8,8">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Image Source="Images/Imagery.png" Height="60"/>
+                <Image Source="Images/photo_library_black_48dp.png" Height="60"/>
                 <StackPanel Grid.Row="1" Margin="8,8,8,4" >
                     <TextBlock Style="{StaticResource MaterialDesignSubheadingTextBlock}" Margin="0" FontSize="12"
                                FontWeight="Bold">
                         <Run Text="Imagery" />
                     </TextBlock>
                     <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" FontSize="8"
                                VerticalAlignment="Center" Margin="0,0,0,5">
-                        <Run Text="Aerial imagery and other raster datasets e.g. DEMs, LiDAR, etc." />
+                        <Run Text="Raster datasets e.g. aerial &amp; satellite imagery, DEMs, LiDAR, Environmental Sensitivity Index." />
                     </TextBlock>
                 </StackPanel>
             </Grid>
         </materialDesign:Card>
 
-        <materialDesign:Card x:Name="HydroCard" Grid.Column="0" Grid.Row="2" Width="150" Padding="4,5,0,0" Height="130"
-                             HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,4,0,4"
+        <materialDesign:Card x:Name="HydroCard" Grid.Column="0" Grid.Row="2" Width="150" Padding="4,5,0,0"
+                             Height="130" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="8,4,0,4"
                              MouseDown="HydroCard_MouseDown">
             <Grid Margin="8,8,8,8">
                 <Grid.RowDefinitions>
@@ -96,14 +100,14 @@
                     </TextBlock>
                     <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" FontSize="8"
                                VerticalAlignment="Center" Margin="0,0,0,5">
-                        <Run Text="Data about watersheds, basins, rivers, streams, oceans, etc." />
+                        <Run Text="Data about watersheds, basins, rivers, streams, and oceans." />
                     </TextBlock>
                 </StackPanel>
             </Grid>
         </materialDesign:Card>
 
-        <materialDesign:Card x:Name="UtilCard" Grid.Row="2" Width="150" Padding="4,5,0,0" Height="130" Grid.Column="1"
-                             HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,4"
+        <materialDesign:Card x:Name="UtilCard" Grid.Row="2" Grid.Column="1" Width="150" Padding="4,5,0,0"
+                             Height="130" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="8,4,0,4"
                              MouseDown="UtilCard_MouseDown">
             <Grid Margin="8,8,8,8">
                 <Grid.RowDefinitions>
@@ -119,14 +123,14 @@
                     </TextBlock>
                     <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" FontSize="8"
                                VerticalAlignment="Center" Margin="0,0,0,5">
-                        <Run Text="Data about utility networks, infrastructure, roads, etc." />
+                        <Run Text="Data about utility networks, infrastructure, and roads." />
                     </TextBlock>
                 </StackPanel>
             </Grid>
         </materialDesign:Card>
 
-        <materialDesign:Card x:Name="EnvCard" Grid.Row="3" Grid.Column="0" Width="150" Padding="4,5,0,0" Height="130"
-                             HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,4,0,15"
+        <materialDesign:Card x:Name="EnvCard" Grid.Row="3" Grid.Column="0" Width="150" Padding="4,5,0,0"
+                             Height="130" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="8,4,0,4"
                              MouseDown="EnvCard_MouseDown">
             <Grid Margin="8,0,0,0">
                 <Grid.RowDefinitions>
@@ -142,14 +146,14 @@
                     </TextBlock>
                     <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" FontSize="8"
                                VerticalAlignment="Center" Margin="0,0,0,5">
-                        <Run Text="Data about habitat and environmental monitoring e.g. eagles nests, wqm data, etc." />
+                        <Run Text="Data about habitats, wildlife, and environmental monitoring e.g. eagles nests, wqm data." />
                     </TextBlock>
                 </StackPanel>
             </Grid>
         </materialDesign:Card>
 
-        <materialDesign:Card x:Name="AuthCard" Grid.Row="3" Width="150" Padding="4,5,0,0" Height="130" Grid.Column="1"
-                             HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,4,0,15"
+        <materialDesign:Card x:Name="AuthCard" Grid.Row="3" Grid.Column="1" Width="150" Padding="4,5,0,0"
+                             Height="130" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="8,4,0,4"
                              MouseDown="AuthCard_MouseDown">
             <Grid Margin="8,4,0,4">
                 <Grid.RowDefinitions>
@@ -166,7 +170,7 @@
                     <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" FontSize="8"
                                VerticalAlignment="Center" Margin="0,0,0,5">
                         <Run
-                            Text="Data created and maintained by EPC e.g. conservation easements, water and air monitoring, etc." />
+                            Text="Data created and maintained by EPC e.g. conservation easements, water and air monitoring." />
                     </TextBlock>
                 </StackPanel>
             </Grid>

DataPAL.Pro/UserControl2.xaml

@@ -9,7 +9,7 @@
         <ResourceDictionary Source="MergedResources.xaml"></ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid Background="{DynamicResource PrimaryHueDarkForegroundBrush}">
+    <Grid Background="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}">
 
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -23,9 +23,6 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <Control Foreground="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                 Background="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                 BorderBrush="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
 
         <ListBox x:Name="LayerList" Grid.Row="1" Width="280" Height="215" VerticalAlignment="Center" Margin="0,5,0,0"
                  Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" FontSize="10" />