Using only one view

Author: StanleyGoldman

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -102,12 +102,6 @@
     <Compile Include="Services\PullRequestSessionManager.cs" />
     <Compile Include="Margins\InlineCommentMarginProvider.cs" />
     <Compile Include="Services\PullRequestSessionService.cs" />
-    <Compile Include="Tags\ShowInlineAnnotationGlyph.xaml.cs">
-      <DependentUpon>ShowInlineAnnotationGlyph.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Tags\ShowInlineCommentAnnotationGlyph.xaml.cs">
-      <DependentUpon>ShowInlineCommentAnnotationGlyph.xaml</DependentUpon>
-    </Compile>
     <Compile Include="ViewModels\PullRequestFileMarginViewModel.cs" />
     <Compile Include="ViewModels\InlineCommentPeekViewModel.cs" />
     <Compile Include="ViewModels\PullRequestStatusViewModel.cs" />
@@ -414,14 +408,6 @@
       <SubType>Designer</SubType>
       <ContainsDesignTimeResources>true</ContainsDesignTimeResources>
     </Page>
-    <Page Include="Tags\ShowInlineAnnotationGlyph.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Tags\ShowInlineCommentAnnotationGlyph.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\PullRequestFileMarginView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

src/GitHub.InlineReviews/Tags/InlineCommentGlyphFactory.cs

@@ -59,25 +59,7 @@ static UserControl CreateGlyph(InlineCommentTag tag)
 
             if (showTag != null)
             {
-                if (showTag.Thread != null && showTag.Annotations != null)
-                {
-                    return new ShowInlineCommentAnnotationGlyph();
-                }
-
-                if (showTag.Thread != null)
-                {
-                    return new ShowInlineCommentGlyph
-                    {
-                        Opacity = showTag.Thread.IsStale ? 0.5 : 1,
-                    };
-                }
-
-                if (showTag.Annotations != null)
-                {
-                    return new ShowInlineAnnotationGlyph();
-                }
-
-                throw new ArgumentException($"{nameof(showTag)} does not have a thread or annotations");
+                return new ShowInlineCommentGlyph();
             }
 
             throw new ArgumentException($"Unknown 'InlineCommentTag' type '{tag}'");